fix: fix open image files issues

archguard · Mar 24, 2022 · fb31740 · fb31740
1 parent e198995
commit fb31740
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/scan_git/src/main/kotlin/com/thoughtworks/archguard/git/scanner/LanguageService.kt b/scan_git/src/main/kotlin/com/thoughtworks/archguard/git/scanner/LanguageService.kt
@@ -39,9 +39,9 @@ class LanguageService {
             return langs[0]
         }
 
-        var primaryLanguage = langs[0]
+        var primaryLanguage = ""
         langs.forEach {
-            if (languageMap[it]!!.keywords.isNullOrEmpty()) {
+            if (languageMap[it]?.keywords.isNullOrEmpty()) {
                 primaryLanguage = it
             }
         }
@@ -50,7 +50,7 @@ class LanguageService {
     }
 
     fun detectLanguages(name: String): List<String> {
-        var language: List<String> = listOf()
+        val language: MutableList<String> = mutableListOf()
 
         val dotCount = name.count { it == '.' }
 
@@ -65,7 +65,7 @@ class LanguageService {
             }
 
             // make others file a shebang
-            language = listOf(SHE_BANG)
+            language += SHE_BANG
         }
 
         // Lookup in case the full name matches

diff --git a/scan_git/src/test/kotlin/com/thoughtworks/archguard/git/scanner/LanguageServiceTest.kt b/scan_git/src/test/kotlin/com/thoughtworks/archguard/git/scanner/LanguageServiceTest.kt
@@ -35,4 +35,16 @@ internal class LanguageServiceTest {
         val lang = LanguageService()
         assertEquals("d.ts", lang.getExtension("types.d.ts"))
     }
+
+    @Test
+    fun should_return_json_for_file() {
+        val lang = LanguageService()
+        assertEquals("JSON", lang.determineLanguage("api.json"))
+    }
+
+    @Test
+    fun should_return_empty_for_not_a_language_file() {
+        val lang = LanguageService()
+        assertEquals("", lang.determineLanguage("logo.png"))
+    }
 }