Merge branch 'master' into feature/jplagoptions-ro

# Conflicts:
#	jplag.endtoend-testing/src/test/java/de/jplag/endtoend/EndToEndSuiteTest.java

jplag.cli/pom.xml

@@ -70,11 +70,6 @@
             <groupId>de.jplag</groupId>
             <artifactId>emf-metamodel-dynamic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>de.jplag</groupId>
-            <artifactId>endToEndTesting</artifactId>
-        </dependency>
-
         <!-- CLI -->
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>

jplag.endToEndTesting/pom.xml → jplag.endtoend-testing/pom.xml

@@ -6,7 +6,7 @@
         <artifactId>aggregator</artifactId>
         <version>${revision}</version>
     </parent>
-    <artifactId>endToEndTesting</artifactId>
+    <artifactId>endtoend-testing</artifactId>
 
     <dependencies>
         <dependency>

jplag.endToEndTesting/src/main/java/de/jplag/end_to_end_testing/constants/TestDirectoryConstants.java → jplag.endtoend-testing/src/main/java/de/jplag/endtoend/constants/TestDirectoryConstants.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing.constants;
+package de.jplag.endtoend.constants;
 
 import java.nio.file.Path;
 

jplag.endToEndTesting/src/main/java/de/jplag/end_to_end_testing/helper/FileHelper.java → jplag.endtoend-testing/src/main/java/de/jplag/endtoend/helper/FileHelper.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing.helper;
+package de.jplag.endtoend.helper;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import de.jplag.end_to_end_testing.constants.TestDirectoryConstants;
+import de.jplag.endtoend.constants.TestDirectoryConstants;
 
 /**
  * Helper class to perform all necessary operations or functions on files or folders.

jplag.endToEndTesting/src/main/java/de/jplag/end_to_end_testing/helper/JsonHelper.java → jplag.endtoend-testing/src/main/java/de/jplag/endtoend/helper/JsonHelper.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing.helper;
+package de.jplag.endtoend.helper;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -9,8 +9,8 @@ import java.util.List;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-import de.jplag.end_to_end_testing.constants.TestDirectoryConstants;
-import de.jplag.end_to_end_testing.model.ResultDescription;
+import de.jplag.endtoend.constants.TestDirectoryConstants;
+import de.jplag.endtoend.model.ResultDescription;
 
 public class JsonHelper {
     /**

jplag.endToEndTesting/src/main/java/de/jplag/end_to_end_testing/helper/TestSuiteHelper.java → jplag.endtoend-testing/src/main/java/de/jplag/endtoend/helper/TestSuiteHelper.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing.helper;
+package de.jplag.endtoend.helper;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 
 import de.jplag.JPlagComparison;
 import de.jplag.Submission;
-import de.jplag.end_to_end_testing.constants.TestDirectoryConstants;
+import de.jplag.endtoend.constants.TestDirectoryConstants;
 
 public class TestSuiteHelper {
 

jplag.endToEndTesting/src/main/java/de/jplag/end_to_end_testing/model/ExpectedResult.java → jplag.endtoend-testing/src/main/java/de/jplag/endtoend/model/ExpectedResult.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing.model;
+package de.jplag.endtoend.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

jplag.endToEndTesting/src/main/java/de/jplag/end_to_end_testing/model/Options.java → jplag.endtoend-testing/src/main/java/de/jplag/endtoend/model/Options.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing.model;
+package de.jplag.endtoend.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

jplag.endToEndTesting/src/main/java/de/jplag/end_to_end_testing/model/ResultDescription.java → jplag.endtoend-testing/src/main/java/de/jplag/endtoend/model/ResultDescription.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing.model;
+package de.jplag.endtoend.model;
 
 import java.util.Map;
 

jplag.endToEndTesting/src/test/java/de/jplag/end_to_end_testing/EndToEndSuiteTest.java → jplag.endtoend-testing/src/test/java/de/jplag/endtoend/EndToEndSuiteTest.java

@@ -1,4 +1,4 @@
-package de.jplag.end_to_end_testing;
+package de.jplag.endtoend;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -23,10 +23,10 @@ import de.jplag.JPlag;
 import de.jplag.JPlagComparison;
 import de.jplag.JPlagResult;
 import de.jplag.LanguageLoader;
-import de.jplag.end_to_end_testing.helper.FileHelper;
-import de.jplag.end_to_end_testing.helper.JsonHelper;
-import de.jplag.end_to_end_testing.helper.TestSuiteHelper;
-import de.jplag.end_to_end_testing.model.*;
+import de.jplag.endtoend.helper.FileHelper;
+import de.jplag.endtoend.helper.JsonHelper;
+import de.jplag.endtoend.helper.TestSuiteHelper;
+import de.jplag.endtoend.model.*;
 import de.jplag.exceptions.ExitException;
 import de.jplag.options.JPlagOptions;
 
@@ -144,9 +144,8 @@ public class EndToEndSuiteTest {
         String[] submissionPath = FileHelper.createNewTestCaseDirectory(testFiles);
 
         var language = LanguageLoader.getLanguage(languageIdentifier).orElseThrow();
-        JPlagOptions jplagOptions = new JPlagOptions(language, Arrays.asList(submissionPath), List.of())
+        JPlagOptions jplagOptions = new JPlagOptions(language, Arrays.asList(submissionPath), new ArrayList<>())
                 .withMinimumTokenMatch(options.minimumTokenMatch());
-
         JPlagResult jplagResult = new JPlag(jplagOptions).run();
 
         List<JPlagComparison> currentJPlagComparison = jplagResult.getAllComparisons();

pom.xml

@@ -207,7 +207,7 @@
             </dependency>
             <dependency>
                 <groupId>de.jplag</groupId>
-                <artifactId>endToEndTesting</artifactId>
+                <artifactId>endtoend-testing</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
@@ -487,7 +487,7 @@
                 <module>jplag.frontend.text</module>
                 <module>jplag.frontend.emf-metamodel</module>
                 <module>jplag.frontend.emf-metamodel-dynamic</module>
-                <module>jplag.endToEndTesting</module>
+                <module>jplag.endtoend-testing</module>
                 <module>jplag</module>
                 <module>jplag.cli</module>
             </modules>