summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-07-22 09:48:04 +0200
committerDavid Lönnhager <david.l@mullvad.net>2025-07-23 09:41:54 +0200
commita85fce736f19feb9e4e9c446dc95f099dc9bd255 (patch)
tree0bd6d275cfc69c4b932929fde398f92981e4ccbc /android
parentd3cae0e103010bb620340068e7337606fd78a9ee (diff)
downloadmullvadvpn-a85fce736f19feb9e4e9c446dc95f099dc9bd255.tar.xz
mullvadvpn-a85fce736f19feb9e4e9c446dc95f099dc9bd255.zip
Update tests on Android
Diffstat (limited to 'android')
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt2
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt2
-rw-r--r--android/lib/daemon-grpc/src/test/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparatorTest.kt20
3 files changed, 24 insertions, 0 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt
index 8e4024a4d5..27b5951cea 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt
@@ -22,6 +22,7 @@ private val DUMMY_RELAY_1 =
provider = ProviderId("PROVIDER RENTED"),
ownership = Ownership.Rented,
daita = false,
+ quic = false,
)
private val DUMMY_RELAY_2 =
RelayItem.Location.Relay(
@@ -34,6 +35,7 @@ private val DUMMY_RELAY_2 =
provider = ProviderId("PROVIDER OWNED"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
private val DUMMY_RELAY_CITY_1 =
RelayItem.Location.City(
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt
index 9b31f8bf24..a3257f04d9 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt
@@ -364,6 +364,7 @@ class CustomListLocationsViewModelTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
),
)
@@ -381,6 +382,7 @@ class CustomListLocationsViewModelTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
}
}
diff --git a/android/lib/daemon-grpc/src/test/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparatorTest.kt b/android/lib/daemon-grpc/src/test/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparatorTest.kt
index df710649c5..e45c8087fd 100644
--- a/android/lib/daemon-grpc/src/test/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparatorTest.kt
+++ b/android/lib/daemon-grpc/src/test/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparatorTest.kt
@@ -26,6 +26,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay10 =
RelayItem.Location.Relay(
@@ -34,6 +35,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
relay9 assertOrderBothDirection relay10
@@ -48,6 +50,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay9b =
RelayItem.Location.Relay(
@@ -56,6 +59,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
assertTrue(RelayNameComparator.compare(relay9a, relay9b) == 0)
@@ -71,6 +75,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay1 =
RelayItem.Location.Relay(
@@ -79,6 +84,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay3 =
RelayItem.Location.Relay(
@@ -87,6 +93,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay100 =
RelayItem.Location.Relay(
@@ -95,6 +102,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
relay001 assertOrderBothDirection relay1
@@ -112,6 +120,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay9b =
RelayItem.Location.Relay(
@@ -120,6 +129,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
assertTrue(RelayNameComparator.compare(relay9a, relay9b) == 0)
@@ -135,6 +145,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay005 =
RelayItem.Location.Relay(
@@ -143,6 +154,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
relay001 assertOrderBothDirection relay005
@@ -157,6 +169,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relayAr8 =
RelayItem.Location.Relay(
@@ -165,6 +178,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relaySe5 =
RelayItem.Location.Relay(
@@ -173,6 +187,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relaySe10 =
RelayItem.Location.Relay(
@@ -181,6 +196,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
relayAr2 assertOrderBothDirection relayAr8
@@ -197,6 +213,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay2w =
RelayItem.Location.Relay(
@@ -205,6 +222,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
relay2c assertOrderBothDirection relay2w
@@ -219,6 +237,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
val relay22b =
RelayItem.Location.Relay(
@@ -227,6 +246,7 @@ class RelayNameComparatorTest {
provider = ProviderId("Provider"),
ownership = Ownership.MullvadOwned,
daita = false,
+ quic = false,
)
relay22a assertOrderBothDirection relay22b