Merge branch 'develop' into feature/endToEndTests-Rework

jplag · Oct 4, 2023 · 4190ccc · 4190ccc
2 parents 3a496fe + 23a12dc
commit 4190ccc
Show file tree

Hide file tree

Showing 72 changed files with 1,801 additions and 1,325 deletions.
diff --git a/.github/workflows/report-viewer-build-test.yml b/.github/workflows/report-viewer-build-test.yml
@@ -30,7 +30,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Set version of Report Viewer
         shell: bash

diff --git a/.github/workflows/report-viewer-dev.yml b/.github/workflows/report-viewer-dev.yml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Set version of Report Viewer
         shell: bash

diff --git a/.github/workflows/report-viewer-e2e.yml b/.github/workflows/report-viewer-e2e.yml
@@ -30,7 +30,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Install and Test 🧪
         working-directory: report-viewer

diff --git a/.github/workflows/report-viewer-lint.yml b/.github/workflows/report-viewer-lint.yml
@@ -4,7 +4,7 @@ name: Report Viewer ESLint Workflow # Checks linting of report viewer
 on:
   workflow_dispatch:
   push:
-    path:
+    paths:
       - ".github/workflows/report-viewer-lint.yml"
       - "report-viewer/**"
   pull_request:
@@ -35,7 +35,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Install and Lint 🎨
         working-directory: report-viewer

diff --git a/.github/workflows/report-viewer-prettier.yml b/.github/workflows/report-viewer-prettier.yml
@@ -35,7 +35,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Install and Check 🎨
         working-directory: report-viewer

diff --git a/.github/workflows/report-viewer-unit.yml b/.github/workflows/report-viewer-unit.yml
@@ -30,7 +30,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Install and Test 🧪
         working-directory: report-viewer

diff --git a/.github/workflows/report-viewer.yml b/.github/workflows/report-viewer.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
       - name: Set version of Report Viewer
         shell: bash

diff --git a/cli/src/main/java/de/jplag/cli/CliOptions.java b/cli/src/main/java/de/jplag/cli/CliOptions.java
@@ -53,7 +53,7 @@ public class CliOptions implements Runnable {
             "--result-directory"}, description = "Name of the directory in which the comparison results will be stored (default: result)%n")
     public String resultFolder = "results";
 
-    @ArgGroup(heading = "Advanced%n")
+    @ArgGroup(heading = "Advanced%n", exclusive = false)
     public Advanced advanced = new Advanced();
 
     @ArgGroup(validate = false, heading = "Clustering%n")

diff --git a/cli/src/test/java/de/jplag/cli/AdvancedGroupTest.java b/cli/src/test/java/de/jplag/cli/AdvancedGroupTest.java
@@ -0,0 +1,23 @@
+package de.jplag.cli;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+class AdvancedGroupTest extends CommandLineInterfaceTest {
+    private static final String SUFFIXES = ".sc,.scala";
+
+    private static final double SIMILARITY_THRESHOLD = 0.5;
+
+    /**
+     * Verify that it is possible to set multiple options in the "advanced" options group.
+     */
+    @Test
+    void testNotExclusive() throws CliException {
+        buildOptionsFromCLI(defaultArguments().suffixes(SUFFIXES).similarityThreshold(SIMILARITY_THRESHOLD));
+        assertEquals(Arrays.stream(SUFFIXES.split(",")).toList(), options.fileSuffixes());
+        assertEquals(0.5, options.similarityThreshold());
+    }
+}