Upgrade testrunner and iDFlakies versions (#22)

* Upgrading testrunner to 1.2 and using upgraded iDFlakies 1.1.0

* Updating documentation and scripts concerning testrunner version 1.2

Author: august782

README.md

@@ -39,7 +39,7 @@ in [Automatically setting up the pom.xml for iFixFlakies](#automatically-setting
         <plugin>
             <groupId>edu.illinois.cs</groupId>
             <artifactId>testrunner-maven-plugin</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
             <dependencies>
                 <dependency>
                     <groupId>edu.illinois.cs</groupId>

pom-modify/PomFile.java

@@ -205,7 +205,7 @@ private void addPlugin(Node plugins, Document doc) {
             }
             {
                 Node version = doc.createElement("version");
-                version.setTextContent("1.0");
+                version.setTextContent("1.2");
                 plugin.appendChild(version);
             }
             {

pom.xml

@@ -70,15 +70,20 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>edu.illinois.cs</groupId>
+            <artifactId>testrunner-core-plugin</artifactId>
+            <version>1.2</version>
+        </dependency>
         <dependency>
             <groupId>edu.illinois.cs</groupId>
             <artifactId>testrunner-maven-plugin</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs</groupId>
             <artifactId>idflakies</artifactId>
-            <version>1.0.1</version>
+            <version>1.1.0</version>
         </dependency>
 
         <dependency>

src/main/java/edu/illinois/cs/dt/tools/fixer/CleanerFixerPlugin.java

@@ -29,6 +29,7 @@
 import edu.illinois.cs.dt.tools.utility.OperationTime;
 import edu.illinois.cs.testrunner.configuration.Configuration;
 import edu.illinois.cs.testrunner.data.results.Result;
+import edu.illinois.cs.testrunner.mavenplugin.MavenProjectWrapper;
 import edu.illinois.cs.testrunner.mavenplugin.TestPlugin;
 import edu.illinois.cs.testrunner.mavenplugin.TestPluginPlugin;
 import edu.illinois.cs.testrunner.runner.Runner;
@@ -65,6 +66,7 @@ public class CleanerFixerPlugin extends TestPlugin {
     public static final String PATCH_LINE_SEP = "==========================";
 
     private MavenProject project;
+    private MavenProjectWrapper projectWrapper;
     private InstrumentingSmartRunner runner;
 
     private List<Patch> patches;
@@ -106,9 +108,10 @@ private URLClassLoader projectClassLoader() throws DependencyResolutionRequiredE
     @Override
     public void execute(final MavenProject project) {
         this.project = project;
+        this.projectWrapper = new MavenProjectWrapper(project, TestPluginPlugin.mojo().getLog());
 
         final Option<Runner> runnerOption = RunnerFactory.from(project);
-        final ErrorLogger logger = new ErrorLogger(project);
+        final ErrorLogger logger = new ErrorLogger(projectWrapper);
 
         this.patches = new ArrayList<>();
 
@@ -122,7 +125,7 @@ public void execute(final MavenProject project) {
                 this.runner = InstrumentingSmartRunner.fromRunner(runnerOption.get());
 
                 if (!Files.exists(DetectorPathManager.originalOrderPath()) && MinimizerPlugin.ORIGINAL_ORDER == null) {
-                    Files.write(DetectorPathManager.originalOrderPath(), DetectorPlugin.getOriginalOrder(project));
+                    Files.write(DetectorPathManager.originalOrderPath(), DetectorPlugin.getOriginalOrder(projectWrapper, this.runner.framework()));
                 }
 
                 startTime = System.currentTimeMillis();
@@ -170,7 +173,7 @@ public void execute(final MavenProject project) {
     private Stream<MinimizeTestsResult> detect() throws Exception {
         if (!Files.exists(DetectorPathManager.detectionFile())) {
             if (Configuration.config().getProperty("diagnosis.run_detection", true)) {
-                new DetectorPlugin(DetectorPathManager.detectionResults(), runner).execute(project);
+                new DetectorPlugin(DetectorPathManager.detectionResults(), runner).execute(projectWrapper);
             } else if (MinimizerPlugin.FLAKY_LIST == null) {
                 throw new NoSuchFileException("File " + DetectorPathManager.detectionFile() + " does not exist and diagnosis.run_detection is set to false");
             }

src/main/java/edu/illinois/cs/dt/tools/minimizer/MinimizerPlugin.java

@@ -12,6 +12,7 @@
 import edu.illinois.cs.dt.tools.utility.ErrorLogger;
 import edu.illinois.cs.testrunner.configuration.Configuration;
 import edu.illinois.cs.testrunner.data.results.Result;
+import edu.illinois.cs.testrunner.mavenplugin.MavenProjectWrapper;
 import edu.illinois.cs.testrunner.mavenplugin.TestPlugin;
 import edu.illinois.cs.testrunner.mavenplugin.TestPluginPlugin;
 import edu.illinois.cs.testrunner.runner.Runner;
@@ -52,6 +53,7 @@ public MinimizerPlugin(final InstrumentingSmartRunner runner) {
     }
 
     private Stream<TestMinimizer> fromDtList(Path path, MavenProject project) {
+        MavenProjectWrapper projectWrapper = new MavenProjectWrapper(project, TestPluginPlugin.mojo().getLog());
         if (FLAKY_LIST != null) {
             path = Paths.get(FLAKY_LIST);
             TestPluginPlugin.info("dt.minimizer.flaky.list argument specified: " + FLAKY_LIST);
@@ -101,7 +103,7 @@ private Stream<TestMinimizer> fromDtList(Path path, MavenProject project) {
             if (!Files.exists(originalOrderPath) || originalOrder.isEmpty()) {
                 TestPluginPlugin.info("Original order file not found or is empty. Creating original-order file now at: "
                                       + originalOrderPath);
-                originalOrder = DetectorPlugin.getOriginalOrder(project, true);
+                originalOrder = DetectorPlugin.getOriginalOrder(projectWrapper, this.runner.framework(), true);
                 Files.write(originalOrderPath, originalOrder);
             }
 
@@ -113,7 +115,7 @@ private Stream<TestMinimizer> fromDtList(Path path, MavenProject project) {
             } else if (dependentTestList == null) {
                 // Run random class method a few times to see if test would be OD
                 Detector detector = new RandomDetector("random", runner,
-                                                       DetectorPlugin.moduleRounds(new ErrorLogger(project).coordinates()),
+                                                       DetectorPlugin.moduleRounds(new ErrorLogger(projectWrapper).coordinates()),
                                                        originalOrder);
                 dependentTestList = new DependentTestList(detector.detect());
             }