refactor: the example is now done as a normal configuration to avoid …

…redundant code
STAMP-project · May 28, 2019 · cc4efca · cc4efca
1 parent e05ea09
commit cc4efca
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 28 deletions.
diff --git a/dspot-maven/src/main/java/eu/stamp_project/DSpotMojo.java b/dspot-maven/src/main/java/eu/stamp_project/DSpotMojo.java
@@ -317,9 +317,6 @@ public void execute() {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        // global report handling
-        Main.GLOBAL_REPORT.output();
-        Main.GLOBAL_REPORT.reset();
     }
 
     // visible for testing...

diff --git a/dspot/src/main/java/eu/stamp_project/Main.java b/dspot/src/main/java/eu/stamp_project/Main.java
@@ -37,12 +37,8 @@ public static void main(String[] args) {
 		} catch (Exception ignored) {
 
 		}
-		final boolean shouldRunExample = JSAPOptions.parse(args);
-		if (shouldRunExample) {
-			Main.runExample();
-		} else {
-			run();
-		}
+		JSAPOptions.parse(args);
+		run();x
 		// global report handling
 		Main.GLOBAL_REPORT.output();
 		Main.GLOBAL_REPORT.reset();
@@ -83,18 +79,4 @@ public static void createOutputDirectories() {
 		}
 	}
 
-	static void runExample() {
-		try {
-			InputConfiguration.get().initialize("src/test/resources/test-projects/test-projects.properties");
-			DSpot dSpot = new DSpot(1,
-					Collections.singletonList(new TestDataMutator()),
-					new JacocoCoverageSelector(),
-					BudgetizerEnum.RandomBudgetizer
-			);
-			dSpot.amplifyTestClassesTestMethods(Collections.singletonList("example.TestSuiteExample"), Collections.emptyList());
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 }
diff --git a/dspot/src/main/java/eu/stamp_project/utils/options/Configuration.java b/dspot/src/main/java/eu/stamp_project/utils/options/Configuration.java
@@ -1,5 +1,7 @@
 package eu.stamp_project.utils.options;
 
+import eu.stamp_project.dspot.amplifier.TestDataMutator;
+import eu.stamp_project.dspot.selector.JacocoCoverageSelector;
 import eu.stamp_project.dspot.selector.PitMutantScoreSelector;
 import eu.stamp_project.dspot.selector.TestSelector;
 import eu.stamp_project.utils.options.check.Checker;
@@ -9,6 +11,7 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
@@ -21,6 +24,21 @@ public class Configuration {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Configuration.class);
 
+    static void configureExample() {
+        try {
+
+            InputConfiguration.get().initialize("src/test/resources/test-projects/test-projects.properties");
+            InputConfiguration.get().setNbIteration(1);
+            InputConfiguration.get().setAmplifiers(Collections.singletonList(new TestDataMutator()));
+            InputConfiguration.get().setSelector(new JacocoCoverageSelector());
+            InputConfiguration.get().setBudgetizer(BudgetizerEnum.RandomBudgetizer);
+            InputConfiguration.get().setTestClasses(Collections.singletonList("example.TestSuiteExample"));
+            InputConfiguration.get().setTestClasses(Collections.emptyList());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static void configure(final String pathToPropertiesFile,
                                  final List<String> amplifiers,
                                  final String selector,

diff --git a/dspot/src/main/java/eu/stamp_project/utils/options/JSAPOptions.java b/dspot/src/main/java/eu/stamp_project/utils/options/JSAPOptions.java
@@ -36,10 +36,9 @@ public class JSAPOptions {
      * parse the command line argument
      *
      * @param args command line arguments. Refer to the README on the github page or use --help command line option to display all the accepted arguments.
-     * @return true if --example is pass through the command line. It will run DSpot with a small example to make a demonstration of the usage of DSpot.
      * Otherwise, it returns false and DSpot will run normally, using the properties and the command line options.
      */
-    public static boolean parse(String[] args) {
+    public static void parse(String[] args) {
         JSAPResult jsapConfig = options.parse(args);
         if (!jsapConfig.success() || jsapConfig.getBoolean("help")) {
             System.err.println();
@@ -48,7 +47,8 @@ public static boolean parse(String[] args) {
             }
             showUsage();
         } else if (jsapConfig.getBoolean("example")) {
-            return true;
+            Configuration.configureExample();
+            return;
         }
 
         // getting first all the values of the command line.
@@ -109,8 +109,6 @@ public static boolean parse(String[] args) {
                 testClasses,
                 testCases
         );
-
-        return false;
     }
 
     private static String helpForEnums(Class<?> enumClass) {