Browse Source

code cleanup

Jan Wittler 4 years ago
parent
commit
96df313a29

+ 0 - 8
core/src/main/java/de/jplag/strategy/ParallelComparisonStrategy.java

@@ -2,10 +2,6 @@ package de.jplag.strategy;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
-import java.util.concurrent.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 import de.jplag.*;
 import de.jplag.*;
 import de.jplag.options.JPlagOptions;
 import de.jplag.options.JPlagOptions;
@@ -15,10 +11,6 @@ import de.jplag.options.JPlagOptions;
  * @author Timur Saglam
  * @author Timur Saglam
  */
  */
 public class ParallelComparisonStrategy extends AbstractComparisonStrategy {
 public class ParallelComparisonStrategy extends AbstractComparisonStrategy {
-    private static final Logger logger = LoggerFactory.getLogger("JPlag");
-
-    private static final int TIMEOUT_IN_SECONDS = 5;
-
     public ParallelComparisonStrategy(JPlagOptions options, GreedyStringTiling greedyStringTiling) {
     public ParallelComparisonStrategy(JPlagOptions options, GreedyStringTiling greedyStringTiling) {
         super(options, greedyStringTiling);
         super(options, greedyStringTiling);
     }
     }

+ 3 - 3
core/src/test/java/de/jplag/ParallelComparisonTest.java

@@ -116,7 +116,7 @@ public class ParallelComparisonTest extends TestBase {
     }
     }
 
 
     @Test
     @Test
-    public void testMultiRootDirBasecodeInSubmissionDir() throws ExitException {
+    void testMultiRootDirBasecodeInSubmissionDir() throws ExitException {
         String basecodePath = getBasePath("basecode", "base");
         String basecodePath = getBasePath("basecode", "base");
         List<String> paths = List.of(getBasePath("basecode"), getBasePath("SimpleDuplicate")); // 2 + 2 submissions.
         List<String> paths = List.of(getBasePath("basecode"), getBasePath("SimpleDuplicate")); // 2 + 2 submissions.
         JPlagResult result = runJPlag(paths, it -> it.withBaseCodeSubmissionName(basecodePath));
         JPlagResult result = runJPlag(paths, it -> it.withBaseCodeSubmissionName(basecodePath));
@@ -124,14 +124,14 @@ public class ParallelComparisonTest extends TestBase {
     }
     }
 
 
     @Test
     @Test
-    public void testMultiRootDirBasecodeName() {
+    void testMultiRootDirBasecodeName() {
         List<String> paths = List.of(getBasePath("basecode"), getBasePath("SimpleDuplicate"));
         List<String> paths = List.of(getBasePath("basecode"), getBasePath("SimpleDuplicate"));
         String basecodePath = "base"; // Should *not* find basecode/base
         String basecodePath = "base"; // Should *not* find basecode/base
         assertThrows(BasecodeException.class, () -> runJPlag(paths, it -> it.withBaseCodeSubmissionName(basecodePath)));
         assertThrows(BasecodeException.class, () -> runJPlag(paths, it -> it.withBaseCodeSubmissionName(basecodePath)));
     }
     }
 
 
     @Test
     @Test
-    public void testDisjunctNewAndOldRootDirectories() throws ExitException {
+    void testDisjunctNewAndOldRootDirectories() throws ExitException {
         List<String> newDirectories = List.of(getBasePath("SimpleDuplicate")); // 2 submissions
         List<String> newDirectories = List.of(getBasePath("SimpleDuplicate")); // 2 submissions
         List<String> oldDirectories = List.of(getBasePath("basecode")); // 3 submissions
         List<String> oldDirectories = List.of(getBasePath("basecode")); // 3 submissions
         JPlagResult result = runJPlag(newDirectories, oldDirectories, it -> it);
         JPlagResult result = runJPlag(newDirectories, oldDirectories, it -> it);