summaryrefslogtreecommitdiffhomepage
path: root/android/test
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson90@gmail.com>2023-10-02 08:25:15 +0200
committerDavid Göransson <david.goransson90@gmail.com>2023-10-02 16:06:03 +0200
commit23517aa5dda6ba8360a6fa9ce408aa63ae5751ce (patch)
tree7bccfc5398403de5cc4f4fdf02fc12cb7fef5a5b /android/test
parent469e0efbec57ce256973d1329f5a616e2234e742 (diff)
downloadmullvadvpn-23517aa5dda6ba8360a6fa9ce408aa63ae5751ce.tar.xz
mullvadvpn-23517aa5dda6ba8360a6fa9ce408aa63ae5751ce.zip
Fix data class issues
Diffstat (limited to 'android/test')
-rw-r--r--android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTests.kt15
-rw-r--r--android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt3
2 files changed, 11 insertions, 7 deletions
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTests.kt
index 248eef5a10..3fd5eff979 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTests.kt
@@ -1,17 +1,18 @@
package net.mullvad.mullvadvpn.test.arch.classes
import com.lemonappdev.konsist.api.ext.list.modifierprovider.withDataModifier
-import com.lemonappdev.konsist.api.verify.assert
+import com.lemonappdev.konsist.api.ext.list.properties
+import com.lemonappdev.konsist.api.verify.assertNot
import net.mullvad.mullvadvpn.test.arch.extensions.projectScope
-import org.junit.Ignore
import org.junit.Test
class DataClasses {
- @Ignore("Code needs clean up")
@Test
- fun `data classes use only immutable parameters`() {
- projectScope().classes(includeNested = true).withDataModifier().assert {
- it.properties(includeNested = true).all { property -> property.hasValModifier }
- }
+ fun `data classes use only immutable declarations`() {
+ projectScope()
+ .classes(includeNested = true)
+ .withDataModifier()
+ .properties(includeNested = false, includeLocal = false)
+ .assertNot { it.hasVarModifier }
}
}
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
index 06f7164034..6a604bb09f 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
@@ -8,7 +8,10 @@ import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_ACCESS_TOKEN
import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_DEVICE_NAME
import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_ID
import net.mullvad.mullvadvpn.test.mockapi.constant.LOG_TAG
+import net.mullvad.mullvadvpn.test.mockapi.util.accessTokenJsonResponse
+import net.mullvad.mullvadvpn.test.mockapi.util.accountInfoJson
import net.mullvad.mullvadvpn.test.mockapi.util.currentUtcTimeWithOffsetZero
+import net.mullvad.mullvadvpn.test.mockapi.util.deviceJson
import okhttp3.mockwebserver.Dispatcher
import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.RecordedRequest