More tests for #126.

Author: khatchad

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI10/in/A.java

@@ -0,0 +1,18 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+	static void m(Stream<Object> s) {
+		s.sorted().distinct().count();
+	}
+
+	@EntryPoint
+	public static void main(String[] args) {
+		m(new HashSet<Object>().stream());
+	}
+}

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI8/in/A.java

@@ -0,0 +1,19 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+	static Stream<Object> m() {
+		Stream<Object> stream = new HashSet<>().stream();
+		return stream;
+	}
+
+	@EntryPoint
+	public static void main(String[] args) {
+		m().sorted().distinct().count();
+	}
+}

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI9/in/A.java

@@ -0,0 +1,18 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+	static Stream<Object> m() {
+		return new HashSet<>().stream().sorted();
+	}
+
+	@EntryPoint
+	public static void main(String[] args) {
+		m().distinct().count();
+	}
+}

edu.cuny.hunter.streamrefactoring.tests/test cases/edu/cuny/hunter/streamrefactoring/ui/tests/ConvertStreamToParallelRefactoringTest.java

@@ -509,7 +509,8 @@ public void testNonInternalAPI6() throws Exception {
 	}
 
 	/**
-	 * This is a control to testNonInternalAPI4.
+	 * This is a control to testNonInternalAPI4. It's the intraprocedural version.
+	 * Related to #126.
 	 */
 	public void testNonInternalAPI7() throws Exception {
 		helper(new StreamAnalysisExpectedResult("new HashSet<>().stream()",
@@ -519,6 +520,43 @@ public void testNonInternalAPI7() throws Exception {
 				Collections.emptySet()));
 	}
 
+	/**
+	 * Related to #126 and based on testNonInternalAPI4. Try calling the
+	 * transitioning method in the entry point method, which is where the terminal
+	 * operation is called.
+	 */
+	public void testNonInternalAPI8() throws Exception {
+		helper(new StreamAnalysisExpectedResult("new HashSet<>().stream()",
+				Collections.singleton(ExecutionMode.SEQUENTIAL), EnumSet.of(Ordering.ORDERED), false, true, false,
+				EnumSet.of(TransformationAction.UNORDER, TransformationAction.CONVERT_TO_PARALLEL),
+				PreconditionSuccess.P3, Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL, RefactoringStatus.OK,
+				Collections.emptySet()));
+	}
+
+	/**
+	 * Related to #126. Like testNonInternalAPI4 but with no local variable.
+	 */
+	public void testNonInternalAPI9() throws Exception {
+		HashSet<Ordering> orderings = new HashSet<>();
+		orderings.add(Ordering.UNORDERED);
+		orderings.add(Ordering.ORDERED);
+
+		helper(new StreamAnalysisExpectedResult("new HashSet<>().stream()",
+				Collections.singleton(ExecutionMode.SEQUENTIAL), orderings, false, true, false, null, null, null,
+				RefactoringStatus.ERROR, EnumSet.of(PreconditionFailure.INCONSISTENT_POSSIBLE_ORDERINGS)));
+	}
+
+	/**
+	 * Related to #126. Suggested by @mbagherz.
+	 */
+	public void testNonInternalAPI10() throws Exception {
+		helper(new StreamAnalysisExpectedResult("new HashSet<Object>().stream()",
+				Collections.singleton(ExecutionMode.SEQUENTIAL), EnumSet.of(Ordering.ORDERED), false, true, false,
+				EnumSet.of(TransformationAction.UNORDER, TransformationAction.CONVERT_TO_PARALLEL),
+				PreconditionSuccess.P3, Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL, RefactoringStatus.OK,
+				Collections.emptySet()));
+	}
+
 	public void testCollectionFromParameter() throws Exception {
 		helper(new StreamAnalysisExpectedResult("h.parallelStream()", Collections.singleton(ExecutionMode.PARALLEL),
 				Collections.singleton(Ordering.UNORDERED), false, true, false, null, null, null,