Skip to content

Commit d639256

Browse files
albin-mullvadalbin-mullvad
committed
Fix test
1 parent d470b22 commit d639256

File tree

2 files changed

+43
-21
lines changed

2 files changed

+43
-21
lines changed

‎android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ private val DUMMY_RELAY_1 =
2424
Provider(
2525
providerId = ProviderId("PROVIDER RENTED"),
2626
ownership = Ownership.Rented,
27-
)
27+
),
28+
daita = false
2829
)
2930
private val DUMMY_RELAY_2 =
3031
RelayItem.Location.Relay(
@@ -35,7 +36,8 @@ private val DUMMY_RELAY_2 =
3536
),
3637
active = true,
3738
provider =
38-
Provider(providerId = ProviderId("PROVIDER OWNED"), ownership = Ownership.MullvadOwned)
39+
Provider(providerId = ProviderId("PROVIDER OWNED"), ownership = Ownership.MullvadOwned),
40+
daita = false
3941
)
4042
private val DUMMY_RELAY_CITY_1 =
4143
RelayItem.Location.City(

‎android/lib/daemon-grpc/src/test/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparatorTest.kt

+39-19
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class RelayNameComparatorTest {
2929
providerId = ProviderId("Provider"),
3030
ownership = Ownership.MullvadOwned
3131
),
32+
daita = false
3233
)
3334
val relay10 =
3435
RelayItem.Location.Relay(
@@ -38,7 +39,8 @@ class RelayNameComparatorTest {
3839
Provider(
3940
providerId = ProviderId("Provider"),
4041
ownership = Ownership.MullvadOwned
41-
)
42+
),
43+
daita = false
4244
)
4345

4446
relay9 assertOrderBothDirection relay10
@@ -54,7 +56,8 @@ class RelayNameComparatorTest {
5456
Provider(
5557
providerId = ProviderId("Provider"),
5658
ownership = Ownership.MullvadOwned
57-
)
59+
),
60+
daita = false
5861
)
5962
val relay9b =
6063
RelayItem.Location.Relay(
@@ -64,7 +67,8 @@ class RelayNameComparatorTest {
6467
Provider(
6568
providerId = ProviderId("Provider"),
6669
ownership = Ownership.MullvadOwned
67-
)
70+
),
71+
daita = false
6872
)
6973

7074
assertTrue(RelayNameComparator.compare(relay9a, relay9b) == 0)
@@ -81,7 +85,8 @@ class RelayNameComparatorTest {
8185
Provider(
8286
providerId = ProviderId("Provider"),
8387
ownership = Ownership.MullvadOwned
84-
)
88+
),
89+
daita = false
8590
)
8691
val relay1 =
8792
RelayItem.Location.Relay(
@@ -91,7 +96,8 @@ class RelayNameComparatorTest {
9196
Provider(
9297
providerId = ProviderId("Provider"),
9398
ownership = Ownership.MullvadOwned
94-
)
99+
),
100+
daita = false
95101
)
96102
val relay3 =
97103
RelayItem.Location.Relay(
@@ -101,7 +107,8 @@ class RelayNameComparatorTest {
101107
Provider(
102108
providerId = ProviderId("Provider"),
103109
ownership = Ownership.MullvadOwned
104-
)
110+
),
111+
daita = false
105112
)
106113
val relay100 =
107114
RelayItem.Location.Relay(
@@ -111,7 +118,8 @@ class RelayNameComparatorTest {
111118
Provider(
112119
providerId = ProviderId("Provider"),
113120
ownership = Ownership.MullvadOwned
114-
)
121+
),
122+
daita = false
115123
)
116124

117125
relay001 assertOrderBothDirection relay1
@@ -130,7 +138,8 @@ class RelayNameComparatorTest {
130138
Provider(
131139
providerId = ProviderId("Provider"),
132140
ownership = Ownership.MullvadOwned
133-
)
141+
),
142+
daita = false
134143
)
135144
val relay9b =
136145
RelayItem.Location.Relay(
@@ -140,7 +149,8 @@ class RelayNameComparatorTest {
140149
Provider(
141150
providerId = ProviderId("Provider"),
142151
ownership = Ownership.MullvadOwned
143-
)
152+
),
153+
daita = false
144154
)
145155

146156
assertTrue(RelayNameComparator.compare(relay9a, relay9b) == 0)
@@ -157,7 +167,8 @@ class RelayNameComparatorTest {
157167
Provider(
158168
providerId = ProviderId("Provider"),
159169
ownership = Ownership.MullvadOwned
160-
)
170+
),
171+
daita = false
161172
)
162173
val relay005 =
163174
RelayItem.Location.Relay(
@@ -167,7 +178,8 @@ class RelayNameComparatorTest {
167178
Provider(
168179
providerId = ProviderId("Provider"),
169180
ownership = Ownership.MullvadOwned
170-
)
181+
),
182+
daita = false
171183
)
172184

173185
relay001 assertOrderBothDirection relay005
@@ -183,7 +195,8 @@ class RelayNameComparatorTest {
183195
Provider(
184196
providerId = ProviderId("Provider"),
185197
ownership = Ownership.MullvadOwned
186-
)
198+
),
199+
daita = false
187200
)
188201
val relayAr8 =
189202
RelayItem.Location.Relay(
@@ -193,7 +206,8 @@ class RelayNameComparatorTest {
193206
Provider(
194207
providerId = ProviderId("Provider"),
195208
ownership = Ownership.MullvadOwned
196-
)
209+
),
210+
daita = false
197211
)
198212
val relaySe5 =
199213
RelayItem.Location.Relay(
@@ -203,7 +217,8 @@ class RelayNameComparatorTest {
203217
Provider(
204218
providerId = ProviderId("Provider"),
205219
ownership = Ownership.MullvadOwned
206-
)
220+
),
221+
daita = false
207222
)
208223
val relaySe10 =
209224
RelayItem.Location.Relay(
@@ -213,7 +228,8 @@ class RelayNameComparatorTest {
213228
Provider(
214229
providerId = ProviderId("Provider"),
215230
ownership = Ownership.MullvadOwned
216-
)
231+
),
232+
daita = false
217233
)
218234

219235
relayAr2 assertOrderBothDirection relayAr8
@@ -231,7 +247,8 @@ class RelayNameComparatorTest {
231247
Provider(
232248
providerId = ProviderId("Provider"),
233249
ownership = Ownership.MullvadOwned
234-
)
250+
),
251+
daita = false
235252
)
236253
val relay2w =
237254
RelayItem.Location.Relay(
@@ -241,7 +258,8 @@ class RelayNameComparatorTest {
241258
Provider(
242259
providerId = ProviderId("Provider"),
243260
ownership = Ownership.MullvadOwned
244-
)
261+
),
262+
daita = false
245263
)
246264

247265
relay2c assertOrderBothDirection relay2w
@@ -257,7 +275,8 @@ class RelayNameComparatorTest {
257275
Provider(
258276
providerId = ProviderId("Provider"),
259277
ownership = Ownership.MullvadOwned
260-
)
278+
),
279+
daita = false
261280
)
262281
val relay22b =
263282
RelayItem.Location.Relay(
@@ -267,7 +286,8 @@ class RelayNameComparatorTest {
267286
Provider(
268287
providerId = ProviderId("Provider"),
269288
ownership = Ownership.MullvadOwned
270-
)
289+
),
290+
daita = false
271291
)
272292

273293
relay22a assertOrderBothDirection relay22b

0 commit comments

Comments
 (0)