Merge pull request d4rken-org#1291 from d4rken-org/additional-tests

Additional tests for segment matching
Workdoodler · Jul 8, 2024 · a9013de · a9013de
2 parents c331687 + 695d243
commit a9013de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app-common-io/src/test/java/eu/darken/sdmse/common/files/SegmentsExtensionTest.kt b/app-common-io/src/test/java/eu/darken/sdmse/common/files/SegmentsExtensionTest.kt
@@ -118,6 +118,12 @@ class SegmentsExtensionTest : BaseTest() {
         segs("ABc", "def").startsWith(segs("ab")) shouldBe false
         segs("ABc", "def").startsWith(segs("ab"), ignoreCase = true, allowPartial = false) shouldBe false
         segs("ABc", "def").startsWith(segs("ab"), ignoreCase = true, allowPartial = true) shouldBe true
+
+        segs("abc", "def", "").startsWith(segs("abc", "def"), ignoreCase = true, allowPartial = false) shouldBe true
+        segs("abc", "def", "").startsWith(segs("abc", "def"), ignoreCase = true, allowPartial = true) shouldBe true
+
+        segs("abc", "def", "ghi").startsWith(segs("abc", "def", ""), allowPartial = false) shouldBe false
+        segs("abc", "def", "ghi").startsWith(segs("abc", "def", ""), allowPartial = true) shouldBe true
     }
 
     @Test fun `segment endsWith`() {

diff --git a/app/src/main/java/eu/darken/sdmse/appcleaner/core/forensics/sieves/json/JsonBasedSieve.kt b/app/src/main/java/eu/darken/sdmse/appcleaner/core/forensics/sieves/json/JsonBasedSieve.kt
@@ -23,13 +23,10 @@ import okio.buffer
 class JsonBasedSieve @AssistedInject constructor(
     @Assisted private val assetPath: String,
     @ApplicationContext private val context: Context,
-    private val baseMoshi: Moshi
+    private val moshi: Moshi
 ) {
 
     private val filterDb: SieveJsonDb = run {
-        val moshi = baseMoshi.newBuilder().apply {
-//            add(RegexAdapter(caseInsensitive = true))
-        }.build()
         val source: BufferedSource = context.openAsset(assetPath).buffer()
         moshi.adapter<SieveJsonDb>().fromJson(source)!!
     }

diff --git a/app/src/test/java/eu/darken/sdmse/appcleaner/core/forensics/BaseFilterTest.kt b/app/src/test/java/eu/darken/sdmse/appcleaner/core/forensics/BaseFilterTest.kt
@@ -387,7 +387,7 @@ abstract class BaseFilterTest : BaseTest() {
             return JsonBasedSieve(
                 context = context,
                 assetPath = assetPath,
-                baseMoshi = SerializationAppModule().moshi(),
+                moshi = SerializationAppModule().moshi(),
             )
         }
     }