Fix tests

duckduckgo · Jan 31, 2025 · d297727 · d297727
1 parent a6e7450
commit d297727
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/webview/MaliciousSiteBlockedWarningLayout.kt b/app/src/main/java/com/duckduckgo/app/browser/webview/MaliciousSiteBlockedWarningLayout.kt
@@ -36,10 +36,10 @@ import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.view.text.DaxTextView
 import com.duckduckgo.common.ui.viewbinding.viewBinding
+import com.duckduckgo.common.utils.extensions.html
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.MALWARE
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.PHISHING
-import com.duckduckgo.common.utils.extensions.html
 
 class MaliciousSiteBlockedWarningLayout @JvmOverloads constructor(
     context: Context,

diff --git a/...otlin/com/duckduckgo/malicioussiteprotection/impl/data/RealMaliciousSiteRepositoryTest.kt b/...otlin/com/duckduckgo/malicioussiteprotection/impl/data/RealMaliciousSiteRepositoryTest.kt
@@ -1,5 +1,6 @@
 package com.duckduckgo.malicioussiteprotection.impl.data
 
+import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.PHISHING
 import com.duckduckgo.malicioussiteprotection.impl.data.db.FilterEntity
 import com.duckduckgo.malicioussiteprotection.impl.data.db.HashPrefixEntity
 import com.duckduckgo.malicioussiteprotection.impl.data.db.MaliciousSiteDao
@@ -10,7 +11,6 @@ import com.duckduckgo.malicioussiteprotection.impl.data.network.MaliciousSiteSer
 import com.duckduckgo.malicioussiteprotection.impl.data.network.MatchResponse
 import com.duckduckgo.malicioussiteprotection.impl.data.network.MatchesResponse
 import com.duckduckgo.malicioussiteprotection.impl.data.network.RevisionResponse
-import com.duckduckgo.malicioussiteprotection.impl.models.Feed.PHISHING
 import com.duckduckgo.malicioussiteprotection.impl.models.Filter
 import com.duckduckgo.malicioussiteprotection.impl.models.FilterSet
 import com.duckduckgo.malicioussiteprotection.impl.models.FilterSetWithRevision.PhishingFilterSetWithRevision

diff --git a/...c/test/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/db/MaliciousSiteDaoTest.kt b/...c/test/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/db/MaliciousSiteDaoTest.kt
@@ -19,7 +19,7 @@ package com.duckduckgo.malicioussiteprotection.impl.data.db
 import androidx.room.Room
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.duckduckgo.malicioussiteprotection.impl.models.Feed
+import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed
 import com.duckduckgo.malicioussiteprotection.impl.models.Filter
 import com.duckduckgo.malicioussiteprotection.impl.models.FilterSetWithRevision.PhishingFilterSetWithRevision
 import com.duckduckgo.malicioussiteprotection.impl.models.HashPrefixesWithRevision.PhishingHashPrefixesWithRevision

diff --git a/...lin/com/duckduckgo/malicioussiteprotection/impl/domain/RealMaliciousSiteProtectionTest.kt b/...lin/com/duckduckgo/malicioussiteprotection/impl/domain/RealMaliciousSiteProtectionTest.kt
@@ -20,11 +20,12 @@ import android.net.Uri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection
-import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.MaliciousStatus.Phishing
+import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.Feed.PHISHING
+import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.IsMaliciousResult.ConfirmedResult
+import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.MaliciousStatus.Malicious
 import com.duckduckgo.malicioussiteprotection.api.MaliciousSiteProtection.MaliciousStatus.Safe
 import com.duckduckgo.malicioussiteprotection.impl.MaliciousSiteProtectionRCFeature
 import com.duckduckgo.malicioussiteprotection.impl.data.MaliciousSiteRepository
-import com.duckduckgo.malicioussiteprotection.impl.models.Feed.PHISHING
 import com.duckduckgo.malicioussiteprotection.impl.models.Filter
 import com.duckduckgo.malicioussiteprotection.impl.models.FilterSet
 import com.duckduckgo.malicioussiteprotection.impl.models.Match
@@ -73,7 +74,7 @@ class RealMaliciousSiteProtectionTest {
 
         val result = realMaliciousSiteProtection.isMalicious(url) {}
 
-        assertEquals(MaliciousSiteProtection.IsMaliciousResult.ConfirmedResult(Safe), result)
+        assertEquals(ConfirmedResult(Safe), result)
     }
 
     @Test
@@ -85,11 +86,18 @@ class RealMaliciousSiteProtectionTest {
         val filter = Filter(hash, ".*malicious.*")
 
         whenever(maliciousSiteRepository.containsHashPrefix(hashPrefix)).thenReturn(true)
-        whenever(maliciousSiteRepository.getFilters(hash)).thenReturn(listOf(FilterSet(listOf(filter), PHISHING)))
+        whenever(maliciousSiteRepository.getFilters(hash)).thenReturn(
+            listOf(
+                FilterSet(
+                    listOf(filter),
+                    PHISHING,
+                ),
+            ),
+        )
 
         val result = realMaliciousSiteProtection.isMalicious(url) {}
 
-        assertEquals(MaliciousSiteProtection.IsMaliciousResult.ConfirmedResult(Phishing), result)
+        assertEquals(ConfirmedResult(Malicious(PHISHING)), result)
     }
 
     @Test
@@ -106,7 +114,7 @@ class RealMaliciousSiteProtectionTest {
 
         val result = realMaliciousSiteProtection.isMalicious(url) {}
 
-        assertEquals(MaliciousSiteProtection.IsMaliciousResult.ConfirmedResult(Safe), result)
+        assertEquals(ConfirmedResult(Safe), result)
     }
 
     @Test