Add option for using implicit test entrypoints.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/refactorings/ConvertToParallelStreamRefactoringProcessor.java

@@ -138,23 +138,26 @@ public static void setLoggingLevel(int level) {
 
 	private boolean useImplicitEntrypoints = true;
 
+	private boolean useImplicitTestEntrypoints = false;
+
 	public ConvertToParallelStreamRefactoringProcessor() throws JavaModelException {
-		this(null, null, false, true, Optional.empty());
+		this(null, null, false, true, false, Optional.empty());
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(final CodeGenerationSettings settings,
 			Optional<IProgressMonitor> monitor) throws JavaModelException {
-		this(null, settings, false, true, monitor);
+		this(null, settings, false, true, false, monitor);
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
 			final CodeGenerationSettings settings, boolean layer, boolean useImplicitEntrypoints,
-			Optional<IProgressMonitor> monitor) throws JavaModelException {
+			boolean useImplicitTestEntrypoints, Optional<IProgressMonitor> monitor) throws JavaModelException {
 		try {
 			this.javaProjects = javaProjects;
 			this.settings = settings;
 			this.layer = layer;
 			this.useImplicitEntrypoints = useImplicitEntrypoints;
+			this.useImplicitTestEntrypoints = useImplicitTestEntrypoints;
 		} finally {
 			monitor.ifPresent(IProgressMonitor::done);
 		}
@@ -163,16 +166,16 @@ public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
 	public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
 			final CodeGenerationSettings settings, boolean useImplicitJoinpoints, Optional<IProgressMonitor> monitor)
 			throws JavaModelException {
-		this(javaProjects, settings, false, useImplicitJoinpoints, monitor);
+		this(javaProjects, settings, false, useImplicitJoinpoints, false, monitor);
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(IJavaProject[] javaProjects,
 			final CodeGenerationSettings settings, Optional<IProgressMonitor> monitor) throws JavaModelException {
-		this(javaProjects, settings, false, true, monitor);
+		this(javaProjects, settings, false, true, false, monitor);
 	}
 
 	public ConvertToParallelStreamRefactoringProcessor(Optional<IProgressMonitor> monitor) throws JavaModelException {
-		this(null, null, false, true, monitor);
+		this(null, null, false, true, false, monitor);
 	}
 
 	private RefactoringStatus checkExistence(IMember member, PreconditionFailure failure) {
@@ -189,7 +192,8 @@ public RefactoringStatus checkFinalConditions(final IProgressMonitor monitor, fi
 			SubMonitor subMonitor = SubMonitor.convert(monitor, Messages.CheckingPreconditions,
 					this.getJavaProjects().length * 1000);
 			final RefactoringStatus status = new RefactoringStatus();
-			StreamAnalyzer analyzer = new StreamAnalyzer(false, this.getUseImplicitEntrypoints());
+			StreamAnalyzer analyzer = new StreamAnalyzer(false, this.getUseImplicitEntrypoints(),
+					this.getUseImplicitTestEntrypoints());
 			this.setStreamSet(analyzer.getStreamSet());
 
 			for (IJavaProject jproj : this.getJavaProjects()) {
@@ -449,6 +453,10 @@ private boolean getUseImplicitEntrypoints() {
 		return this.useImplicitEntrypoints;
 	}
 
+	private boolean getUseImplicitTestEntrypoints() {
+		return this.useImplicitTestEntrypoints;
+	}
+
 	@Override
 	public boolean isApplicable() throws CoreException {
 		// return

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

@@ -52,11 +52,11 @@ public static ConvertToParallelStreamRefactoringProcessor createConvertToParalle
 	}
 
 	public static ConvertToParallelStreamRefactoringProcessor createConvertToParallelStreamRefactoringProcessor(
-			IJavaProject[] projects, boolean useImplicitJoinpoints, Optional<IProgressMonitor> monitor)
-			throws JavaModelException {
+			IJavaProject[] projects, boolean useImplicitEntrypoints, boolean useImplicitTestEntrypoints,
+			Optional<IProgressMonitor> monitor) throws JavaModelException {
 		CodeGenerationSettings settings = JavaPreferencesSettings.getCodeGenerationSettings(projects[0]);
 		ConvertToParallelStreamRefactoringProcessor processor = new ConvertToParallelStreamRefactoringProcessor(
-				projects, settings, useImplicitJoinpoints, monitor);
+				projects, settings, false, useImplicitEntrypoints, useImplicitTestEntrypoints, monitor);
 		return processor;
 	}
 

edu.cuny.hunter.streamrefactoring.eval/src/edu/cuny/hunter/streamrefactoring/eval/handlers/EvaluateConvertToParallelStreamRefactoringHandler.java

@@ -74,6 +74,8 @@
 public class EvaluateConvertToParallelStreamRefactoringHandler extends AbstractHandler {
 
 	private static final boolean BUILD_WORKSPACE = false;
+	private static final boolean FIND_IMPLICIT_TEST_ENTRYPOINTS_DEFAULT = false;
+	private static final String FIND_IMPLICIT_TEST_ENTRYPOINTS_PROPERTY_KEY = "edu.cuny.hunter.streamrefactoring.eval.findImplicitTestEntrypoints";
 	private static final boolean FIND_IMPLICIT_ENTRYPOINTS_DEFAULT = true;
 	private static final String FIND_IMPLICIT_ENTRYPOINTS_PROPERTY_KEY = "edu.cuny.hunter.streamrefactoring.eval.findImplicitEntrypoints";
 	private static final int LOGGING_LEVEL = IStatus.INFO;
@@ -242,7 +244,8 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 					resultsTimeCollector.start();
 					processor = createConvertToParallelStreamRefactoringProcessor(new IJavaProject[] { javaProject },
-							this.shouldFindImplicitEntrypoints(), Optional.of(monitor));
+							this.shouldFindImplicitEntrypoints(), this.shouldFindImplicitTestEntrypoints(),
+							Optional.of(monitor));
 					resultsTimeCollector.stop();
 					ConvertToParallelStreamRefactoringProcessor.setLoggingLevel(LOGGING_LEVEL);
 
@@ -479,6 +482,15 @@ private boolean shouldFindImplicitEntrypoints() {
 			return Boolean.valueOf(findImplicitEntrypoits);
 	}
 
+	private boolean shouldFindImplicitTestEntrypoints() {
+		String findImplicitTestEntrypoints = System.getenv(FIND_IMPLICIT_TEST_ENTRYPOINTS_PROPERTY_KEY);
+
+		if (findImplicitTestEntrypoints == null)
+			return FIND_IMPLICIT_TEST_ENTRYPOINTS_DEFAULT;
+		else
+			return Boolean.valueOf(findImplicitTestEntrypoints);
+	}
+
 	private boolean shouldPerformChange() {
 		String performChangePropertyValue = System.getenv(PERFORM_CHANGE_PROPERTY_KEY);