Skip to content

Commit 52cc2c0

Browse files
PururunPururun
committed
Update screen tests for new relay item
1 parent ad4d635 commit 52cc2c0

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

‎android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt

+33-33
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class ConnectScreenTest {
7878
uiState =
7979
ConnectUiState(
8080
location = null,
81-
relayLocation = null,
81+
selectedRelayItem = null,
8282
tunnelUiState = TunnelState.Connecting(null, null),
8383
tunnelRealState = TunnelState.Connecting(null, null),
8484
inAddress = null,
@@ -112,7 +112,7 @@ class ConnectScreenTest {
112112
uiState =
113113
ConnectUiState(
114114
location = null,
115-
relayLocation = null,
115+
selectedRelayItem = null,
116116
tunnelUiState =
117117
TunnelState.Connecting(endpoint = mockTunnelEndpoint, null),
118118
tunnelRealState =
@@ -147,7 +147,7 @@ class ConnectScreenTest {
147147
uiState =
148148
ConnectUiState(
149149
location = null,
150-
relayLocation = null,
150+
selectedRelayItem = null,
151151
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
152152
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
153153
inAddress = null,
@@ -179,7 +179,7 @@ class ConnectScreenTest {
179179
uiState =
180180
ConnectUiState(
181181
location = null,
182-
relayLocation = null,
182+
selectedRelayItem = null,
183183
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
184184
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
185185
inAddress = null,
@@ -204,15 +204,15 @@ class ConnectScreenTest {
204204
fun testDisconnectingState() {
205205
composeExtension.use {
206206
// Arrange
207-
val mockRelayLocation: RelayItem = mockk(relaxed = true)
207+
val mockSelectedLocation: RelayItem = mockk(relaxed = true)
208208
val mockLocationName = "Home"
209-
every { mockRelayLocation.locationName } returns mockLocationName
209+
every { mockSelectedLocation.locationName } returns mockLocationName
210210
setContentWithTheme {
211211
ConnectScreen(
212212
uiState =
213213
ConnectUiState(
214214
location = null,
215-
relayLocation = mockRelayLocation,
215+
selectedRelayItem = mockSelectedLocation,
216216
tunnelUiState =
217217
TunnelState.Disconnecting(ActionAfterDisconnect.Nothing),
218218
tunnelRealState =
@@ -239,15 +239,15 @@ class ConnectScreenTest {
239239
fun testDisconnectedState() {
240240
composeExtension.use {
241241
// Arrange
242-
val mockRelayLocation: RelayItem = mockk(relaxed = true)
242+
val mockSelectedLocation: RelayItem = mockk(relaxed = true)
243243
val mockLocationName = "Home"
244-
every { mockRelayLocation.locationName } returns mockLocationName
244+
every { mockSelectedLocation.locationName } returns mockLocationName
245245
setContentWithTheme {
246246
ConnectScreen(
247247
uiState =
248248
ConnectUiState(
249249
location = null,
250-
relayLocation = mockRelayLocation,
250+
selectedRelayItem = mockSelectedLocation,
251251
tunnelUiState = TunnelState.Disconnected(),
252252
tunnelRealState = TunnelState.Disconnected(),
253253
inAddress = null,
@@ -272,15 +272,15 @@ class ConnectScreenTest {
272272
fun testErrorStateBlocked() {
273273
composeExtension.use {
274274
// Arrange
275-
val mockRelayLocation: RelayItem = mockk(relaxed = true)
275+
val mockSelectedLocation: RelayItem = mockk(relaxed = true)
276276
val mockLocationName = "Home"
277-
every { mockRelayLocation.locationName } returns mockLocationName
277+
every { mockSelectedLocation.locationName } returns mockLocationName
278278
setContentWithTheme {
279279
ConnectScreen(
280280
uiState =
281281
ConnectUiState(
282282
location = null,
283-
relayLocation = mockRelayLocation,
283+
selectedRelayItem = mockSelectedLocation,
284284
tunnelUiState =
285285
TunnelState.Error(
286286
ErrorState(ErrorStateCause.StartTunnelError, true)
@@ -315,15 +315,15 @@ class ConnectScreenTest {
315315
fun testErrorStateNotBlocked() {
316316
composeExtension.use {
317317
// Arrange
318-
val mockRelayLocation: RelayItem = mockk(relaxed = true)
318+
val mockSelectedLocation: RelayItem = mockk(relaxed = true)
319319
val mockLocationName = "Home"
320-
every { mockRelayLocation.locationName } returns mockLocationName
320+
every { mockSelectedLocation.locationName } returns mockLocationName
321321
setContentWithTheme {
322322
ConnectScreen(
323323
uiState =
324324
ConnectUiState(
325325
location = null,
326-
relayLocation = mockRelayLocation,
326+
selectedRelayItem = mockSelectedLocation,
327327
tunnelUiState =
328328
TunnelState.Error(
329329
ErrorState(ErrorStateCause.StartTunnelError, false)
@@ -364,7 +364,7 @@ class ConnectScreenTest {
364364
uiState =
365365
ConnectUiState(
366366
location = null,
367-
relayLocation = null,
367+
selectedRelayItem = null,
368368
tunnelUiState =
369369
TunnelState.Disconnecting(ActionAfterDisconnect.Reconnect),
370370
tunnelRealState =
@@ -393,15 +393,15 @@ class ConnectScreenTest {
393393
fun testDisconnectingBlockState() {
394394
composeExtension.use {
395395
// Arrange
396-
val mockRelayLocation: RelayItem = mockk(relaxed = true)
396+
val mockSelectedLocation: RelayItem = mockk(relaxed = true)
397397
val mockLocationName = "Home"
398-
every { mockRelayLocation.locationName } returns mockLocationName
398+
every { mockSelectedLocation.locationName } returns mockLocationName
399399
setContentWithTheme {
400400
ConnectScreen(
401401
uiState =
402402
ConnectUiState(
403403
location = null,
404-
relayLocation = mockRelayLocation,
404+
selectedRelayItem = mockSelectedLocation,
405405
tunnelUiState = TunnelState.Disconnecting(ActionAfterDisconnect.Block),
406406
tunnelRealState =
407407
TunnelState.Disconnecting(ActionAfterDisconnect.Block),
@@ -428,16 +428,16 @@ class ConnectScreenTest {
428428
fun testClickSelectLocationButton() {
429429
composeExtension.use {
430430
// Arrange
431-
val mockRelayLocation: RelayItem = mockk(relaxed = true)
431+
val mockSelectedLocation: RelayItem = mockk(relaxed = true)
432432
val mockLocationName = "Home"
433-
every { mockRelayLocation.locationName } returns mockLocationName
433+
every { mockSelectedLocation.name } returns mockLocationName
434434
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
435435
setContentWithTheme {
436436
ConnectScreen(
437437
uiState =
438438
ConnectUiState(
439439
location = null,
440-
relayLocation = mockRelayLocation,
440+
selectedRelayItem = mockSelectedLocation,
441441
tunnelUiState = TunnelState.Disconnected(),
442442
tunnelRealState = TunnelState.Disconnected(),
443443
inAddress = null,
@@ -471,7 +471,7 @@ class ConnectScreenTest {
471471
uiState =
472472
ConnectUiState(
473473
location = null,
474-
relayLocation = null,
474+
selectedRelayItem = null,
475475
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
476476
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
477477
inAddress = null,
@@ -505,7 +505,7 @@ class ConnectScreenTest {
505505
uiState =
506506
ConnectUiState(
507507
location = null,
508-
relayLocation = null,
508+
selectedRelayItem = null,
509509
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
510510
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
511511
inAddress = null,
@@ -538,7 +538,7 @@ class ConnectScreenTest {
538538
uiState =
539539
ConnectUiState(
540540
location = null,
541-
relayLocation = null,
541+
selectedRelayItem = null,
542542
tunnelUiState = TunnelState.Disconnected(),
543543
tunnelRealState = TunnelState.Disconnected(),
544544
inAddress = null,
@@ -571,7 +571,7 @@ class ConnectScreenTest {
571571
uiState =
572572
ConnectUiState(
573573
location = null,
574-
relayLocation = null,
574+
selectedRelayItem = null,
575575
tunnelUiState = TunnelState.Connecting(null, null),
576576
tunnelRealState = TunnelState.Connecting(null, null),
577577
inAddress = null,
@@ -612,7 +612,7 @@ class ConnectScreenTest {
612612
uiState =
613613
ConnectUiState(
614614
location = mockLocation,
615-
relayLocation = null,
615+
selectedRelayItem = null,
616616
tunnelUiState = TunnelState.Connected(mockTunnelEndpoint, null),
617617
tunnelRealState = TunnelState.Connected(mockTunnelEndpoint, null),
618618
inAddress = mockInAddress,
@@ -653,7 +653,7 @@ class ConnectScreenTest {
653653
uiState =
654654
ConnectUiState(
655655
location = null,
656-
relayLocation = null,
656+
selectedRelayItem = null,
657657
tunnelUiState = TunnelState.Connecting(null, null),
658658
tunnelRealState = TunnelState.Connecting(null, null),
659659
inAddress = null,
@@ -689,7 +689,7 @@ class ConnectScreenTest {
689689
uiState =
690690
ConnectUiState(
691691
location = null,
692-
relayLocation = null,
692+
selectedRelayItem = null,
693693
tunnelUiState = TunnelState.Connecting(null, null),
694694
tunnelRealState = TunnelState.Connecting(null, null),
695695
inAddress = null,
@@ -722,7 +722,7 @@ class ConnectScreenTest {
722722
uiState =
723723
ConnectUiState(
724724
location = null,
725-
relayLocation = null,
725+
selectedRelayItem = null,
726726
tunnelUiState = TunnelState.Connecting(null, null),
727727
tunnelRealState = TunnelState.Connecting(null, null),
728728
inAddress = null,
@@ -760,7 +760,7 @@ class ConnectScreenTest {
760760
uiState =
761761
ConnectUiState(
762762
location = null,
763-
relayLocation = null,
763+
selectedRelayItem = null,
764764
tunnelUiState = TunnelState.Connecting(null, null),
765765
tunnelRealState = TunnelState.Connecting(null, null),
766766
inAddress = null,
@@ -794,7 +794,7 @@ class ConnectScreenTest {
794794
uiState =
795795
ConnectUiState(
796796
location = null,
797-
relayLocation = null,
797+
selectedRelayItem = null,
798798
tunnelUiState = TunnelState.Connecting(null, null),
799799
tunnelRealState = TunnelState.Connecting(null, null),
800800
inAddress = null,

‎android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class SelectLocationScreenTest {
5959
relayListState =
6060
RelayListState.RelayList(
6161
countries = DUMMY_RELAY_COUNTRIES,
62-
selectedRelay = null
62+
selectedItem = null
6363
),
6464
selectedOwnership = null,
6565
selectedProvidersCount = 0,
@@ -99,7 +99,7 @@ class SelectLocationScreenTest {
9999
relayListState =
100100
RelayListState.RelayList(
101101
countries = updatedDummyList,
102-
selectedRelay = updatedDummyList[0].cities[0].relays[0]
102+
selectedItem = updatedDummyList[0].cities[0].relays[0]
103103
),
104104
selectedOwnership = null,
105105
selectedProvidersCount = 0,
@@ -129,7 +129,7 @@ class SelectLocationScreenTest {
129129
relayListState =
130130
RelayListState.RelayList(
131131
countries = emptyList(),
132-
selectedRelay = null
132+
selectedItem = null
133133
),
134134
selectedOwnership = null,
135135
selectedProvidersCount = 0,

0 commit comments

Comments
 (0)