Adjust testing infrastructure for #178.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamAnalyzer.java

@@ -87,6 +87,11 @@ public StreamAnalyzer(boolean visitDocTags) {
 		super(visitDocTags);
 	}
 
+	public StreamAnalyzer(boolean visitDocTags, int nForStreams) {
+		super(visitDocTags);
+		this.nForStreams = nForStreams;
+	}
+
 	public StreamAnalyzer(boolean visitDocTags, boolean findImplicitEntryPoints) {
 		this(visitDocTags);
 		this.findImplicitEntryPoints = findImplicitEntryPoints;

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

@@ -0,0 +1,12 @@
+package p;
+
+import java.util.Arrays;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+	@EntryPoint
+	void m() {
+		Arrays.stream(new Object[1]).count();
+	}
+}

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

@@ -77,6 +77,8 @@ public class ConvertStreamToParallelRefactoringTest extends RefactoringTest {
 
 	private static final String ENTRY_POINT_FILE = "entry_points.txt";
 
+	private static final int N_TO_USE_FOR_STREAMS_DEFAULT = 2;
+
 	static {
 		LOGGER.setLevel(Level.FINER);
 	}
@@ -327,6 +329,15 @@ public String getRefactoringPath() {
 	 * Runs a single analysis test.
 	 */
 	private void helper(StreamAnalysisExpectedResult... expectedResults) throws Exception {
+		helper(N_TO_USE_FOR_STREAMS_DEFAULT, expectedResults);
+	}
+
+	/**
+	 * Runs a single analysis test.
+	 */
+	private void helper(int nToUseForStreams, StreamAnalysisExpectedResult... expectedResults) throws Exception {
+		LOGGER.info("Using N = " + nToUseForStreams);
+
 		// compute the actual results.
 		ICompilationUnit cu = createCUfromTestFile(getPackageP(), "A");
 
@@ -336,7 +347,7 @@ private void helper(StreamAnalysisExpectedResult... expectedResults) throws Exce
 
 		ASTNode ast = parser.createAST(new NullProgressMonitor());
 
-		StreamAnalyzer analyzer = new StreamAnalyzer(false);
+		StreamAnalyzer analyzer = new StreamAnalyzer(false, nToUseForStreams);
 		ast.accept(analyzer);
 
 		analyzer.analyze();
@@ -472,6 +483,16 @@ public void testArraysStream() throws Exception {
 				EnumSet.of(PreconditionFailure.NO_APPLICATION_CODE_IN_CALL_STRINGS)));
 	}
 
+	/**
+	 * Test #80. We need to increase N here to 3.
+	 */
+	public void testArraysStream2() throws Exception {
+		helper(3, new StreamAnalysisExpectedResult("Arrays.stream(new Object[1])",
+				Collections.singleton(ExecutionMode.SEQUENTIAL), EnumSet.of(Ordering.ORDERED), false, false, false,
+				EnumSet.of(TransformationAction.CONVERT_TO_PARALLEL), PreconditionSuccess.P2,
+				Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL, RefactoringStatus.OK, Collections.emptySet()));
+	}
+
 	public void testConstructor() throws Exception {
 		helper(new StreamAnalysisExpectedResult("new ArrayList().stream()",
 				Collections.singleton(ExecutionMode.SEQUENTIAL), EnumSet.of(Ordering.ORDERED), false, false, false,
@@ -728,12 +749,14 @@ public void testStaticInitializer() throws Exception {
 				null, null, null, RefactoringStatus.ERROR, EnumSet.of(PreconditionFailure.CURRENTLY_NOT_HANDLED)));
 	}
 
+	// N needs to be 3 here.
 	public void testIntermediateOperations() throws Exception {
-		helper(new StreamAnalysisExpectedResult("set.stream()", Collections.singleton(ExecutionMode.SEQUENTIAL),
-				Collections.singleton(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()));
+		helper(3,
+				new StreamAnalysisExpectedResult("set.stream()", Collections.singleton(ExecutionMode.SEQUENTIAL),
+						Collections.singleton(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 testTypeResolution() throws Exception {