#3745 add Unit Tests

MaibornWolff · Oct 1, 2024 · aff1fa6 · aff1fa6
1 parent e0855e0
commit aff1fa6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/.../MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilter.kt b/.../MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilter.kt
@@ -108,14 +108,16 @@ class MergeFilter(
             }
         }
 
-        if (!hasTopLevelOverlap(rootChildrenNodes)) {
-            printOverlapError(rootChildrenNodes)
+        if (!mergeModules) {
+            if (!hasTopLevelOverlap(rootChildrenNodes)) {
+                printOverlapError(rootChildrenNodes)
 
-            val continueMerge = ParserDialog.askForceMerge()
+                val continueMerge = ParserDialog.askForceMerge()
 
-            if (!continueMerge) {
-                Logger.info { "Merge cancelled by the user." }
-                return null
+                if (!continueMerge) {
+                    Logger.info { "Merge cancelled by the user." }
+                    return null
+                }
             }
         }
 

diff --git a/...geFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilterTest.kt b/...geFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilterTest.kt
@@ -170,4 +170,24 @@ class MergeFilterTest {
 
         assertThat(errContent.toString()).contains("Input invalid files/folders for MergeFilter, stopping execution...")
     }
+
+    @Test
+    fun `should log error when no cc json files found in the folder`() {
+        System.setErr(PrintStream(errContent))
+
+        CommandLine(MergeFilter()).execute("src/test/resources/noCCJsonFiles")
+
+        System.setErr(originalErr)
+        assertThat(errContent.toString()).contains("Input invalid files/folders for MergeFilter, stopping execution...")
+    }
+
+    @Test
+    fun `should log error when folder path is invalid`() {
+        System.setErr(PrintStream(errContent))
+
+        CommandLine(MergeFilter()).execute("invalid/path/to/folder")
+
+        System.setErr(originalErr)
+        assertThat(errContent.toString()).contains("Input invalid files/folders for MergeFilter, stopping execution...")
+    }
 }