Merge pull request #121 from ponder-lab/issue_120

Issue 120

Author: khatchad

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

@@ -640,11 +640,8 @@ protected CGNode getEnclosingMethodNode() throws IOException, CoreException, NoE
 
 		if (nodes.isEmpty())
 			throw new NoEnclosingMethodNodeFoundException(methodReference);
-		else if (nodes.size() == 1 || nodes.size() > 1 && allFake(nodes, this.getAnalysisEngine().getCallGraph()))
-			return nodes.iterator().next(); // just return the first.
 		else
-			throw new IllegalStateException("Unexpected number of nodes: " + nodes.size());
-
+			return nodes.iterator().next(); // just return the first.
 	}
 
 	/**

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

@@ -414,7 +414,7 @@ public static JDTIdentityMapper getJDTIdentifyMapper(ASTNode node) {
 	 * check whether the annotation is "EntryPoint"
 	 */
 	private static boolean isEntryPointClass(TypeName typeName) {
-		return (AnalysisUtils.walaTypeNameToJavaName(typeName).equals(ENTRYPOINT));
+		return AnalysisUtils.walaTypeNameToJavaName(typeName).equals(ENTRYPOINT);
 	}
 
 	/**

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

@@ -0,0 +1,17 @@
+package p;
+
+import java.util.stream.DoubleStream;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+public class A {
+	@EntryPoint
+	void n() {
+		m();
+		m();
+	}
+
+	void m() {
+		DoubleStream.of(1.111).count();
+	}
+}

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

@@ -427,6 +427,13 @@ public void testDoubleStreamOf() throws Exception {
 
 	}
 
+	public void testMultipleCallsToEnclosingMethod() throws Exception {
+		helper(new StreamAnalysisExpectedResult("DoubleStream.of(1.111)",
+				Collections.singleton(ExecutionMode.SEQUENTIAL), Collections.singleton(Ordering.ORDERED), false, false,
+				false, Collections.singleton(TransformationAction.CONVERT_TO_PARALLEL), PreconditionSuccess.P2,
+				Refactoring.CONVERT_SEQUENTIAL_STREAM_TO_PARALLEL, RefactoringStatus.OK, Collections.emptySet()));
+	}
+
 	public void testHashSetParallelStream() throws Exception {
 		helper(new StreamAnalysisExpectedResult("new HashSet<>().parallelStream()",
 				Collections.singleton(ExecutionMode.PARALLEL), Collections.singleton(Ordering.UNORDERED), false, false,