Fix rebase issues

Signed-off-by: André Silva <[email protected]>
eclipse-repairnator · Feb 14, 2021 · 7c661b6 · 7c661b6
1 parent 37ae942
commit 7c661b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/src/repairnator-pipeline/pom.xml b/src/repairnator-pipeline/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>repairnator-root</artifactId>
         <groupId>fr.inria.repairnator</groupId>
@@ -14,7 +15,10 @@
             <id>tdurieux-maven-repository-snapshot</id>
             <name>tdurieux.github.io maven-repository</name>
             <url>https://tdurieux.github.io/maven-repository/snapshots/</url>
-            <snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
 
         </repository>
         <repository>
@@ -128,6 +132,8 @@
             <groupId>exceptionparser</groupId>
             <artifactId>exceptionparser</artifactId>
             <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>fr.inria.gforge.spirals</groupId>
             <artifactId>npefix</artifactId>
             <version>0.7</version>

diff --git a/...main/java/fr/inria/spirals/repairnator/process/step/gatherinfo/GatherTestInformation.java b/...main/java/fr/inria/spirals/repairnator/process/step/gatherinfo/GatherTestInformation.java
@@ -177,10 +177,7 @@ public FileVisitResult preVisitDirectory(Path file, BasicFileAttributes attrs) t
 
                                     try {
                                         // Descend stack trace
-<<<<<<< HEAD
-=======
                                         this.getLogger().info(testCase.getFailureDetail());
->>>>>>> ea3eab47 (Split errors and failures. Add source classes information to errors.)
                                         StackTrace stackTrace = StackTraceParser.parse(testCase.getFailureDetail());
                                         StackTrace causedBy = stackTrace.getCausedBy();
                                         while (causedBy != null) {
@@ -206,17 +203,6 @@ >>>>>>> ea3eab47 (Split errors and failures. Add source classes information to e
                                                 File file = new File(sourcedir.getAbsolutePath() + "/" + path);
                                                 File packageFile = new File(sourcedir.getAbsolutePath() + "/" + packagePath);
                                                 if (file.exists()) {
-<<<<<<< HEAD
-                                                    if (!onePass) {
-                                                        this.getLogger().debug("classFiles: " + file.getAbsolutePath());
-                                                        classFiles.add(file);
-                                                    }
-                                                    this.getLogger().debug("stackFiles: " + file.getAbsolutePath());
-                                                    stackFiles.add(file);
-                                                }
-                                                if (packageFile.exists()) {
-                                                    this.getLogger().debug("packageFiles: " + packageFile.getAbsolutePath());
-=======
                                                     this.getLogger().info("Added file : " + file.getAbsolutePath());
                                                     if (!onePass) {
                                                         classFiles.add(file);
@@ -225,7 +211,6 @@ >>>>>>> ea3eab47 (Split errors and failures. Add source classes information to e
                                                 }
                                                 if (packageFile.exists()) {
                                                     this.getLogger().info("Added file : " + packageFile.getAbsolutePath());
->>>>>>> ea3eab47 (Split errors and failures. Add source classes information to errors.)
                                                     packageFiles.add(packageFile);
                                                 }
                                                 if (file.exists() || packageFile.exists())
@@ -240,11 +225,6 @@ >>>>>>> ea3eab47 (Split errors and failures. Add source classes information to e
                                     } catch (StackTraceParser.ParseException e) {
                                         this.addStepError("Error while parsing stack trace.", e);
                                     }
-<<<<<<< HEAD
-
-=======
-
->>>>>>> ea3eab47 (Split errors and failures. Add source classes information to errors.)
                                     failureLocation.addErroringMethod(testCase.getName(), typeTof);
                                 } else {
                                     FailureType typeTof = new FailureType(failureType, testCase.getFailureDetail());