Skip to content

Commit c85891a

Browse files
committed
Fix tests
1 parent 7297d95 commit c85891a

File tree

3 files changed

+39
-9
lines changed

3 files changed

+39
-9
lines changed

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class DnsDialogTest {
2424
isLocal = false,
2525
isAllowLanEnabled = false,
2626
index = null,
27+
isIpv6 = false,
28+
isIpv6Enabled = true,
2729
)
2830

2931
private fun ComposeContext.initDialog(

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

+36-9
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class VpnSettingsScreenTest {
7474
navigateToUdp2TcpSettings: () -> Unit = {},
7575
onToggleAutoStartAndConnectOnBoot: (Boolean) -> Unit = {},
7676
onSelectDeviceIpVersion: (Constraint<IpVersion>) -> Unit = {},
77+
onToggleIPv6Toggle: (Boolean) -> Unit = {},
7778
) {
7879
setContentWithTheme {
7980
VpnSettingsScreen(
@@ -106,6 +107,7 @@ class VpnSettingsScreenTest {
106107
navigateToUdp2TcpSettings = navigateToUdp2TcpSettings,
107108
onToggleAutoStartAndConnectOnBoot = onToggleAutoStartAndConnectOnBoot,
108109
onSelectDeviceIpVersion = onSelectDeviceIpVersion,
110+
onToggleIPv6Toggle = onToggleIPv6Toggle,
109111
)
110112
}
111113
}
@@ -154,9 +156,9 @@ class VpnSettingsScreenTest {
154156
isCustomDnsEnabled = true,
155157
customDnsItems =
156158
listOf(
157-
CustomDnsItem(address = DUMMY_DNS_ADDRESS, false),
158-
CustomDnsItem(address = DUMMY_DNS_ADDRESS_2, false),
159-
CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false),
159+
CustomDnsItem(address = DUMMY_DNS_ADDRESS, false, false),
160+
CustomDnsItem(address = DUMMY_DNS_ADDRESS_2, false, false),
161+
CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false, false),
160162
),
161163
)
162164
)
@@ -176,7 +178,8 @@ class VpnSettingsScreenTest {
176178
state =
177179
VpnSettingsUiState.createDefault(
178180
isCustomDnsEnabled = false,
179-
customDnsItems = listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false)),
181+
customDnsItems =
182+
listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false, false)),
180183
)
181184
)
182185
onNodeWithTag(LAZY_LIST_VPN_SETTINGS_TEST_TAG)
@@ -196,7 +199,13 @@ class VpnSettingsScreenTest {
196199
isCustomDnsEnabled = true,
197200
isLocalNetworkSharingEnabled = true,
198201
customDnsItems =
199-
listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)),
202+
listOf(
203+
CustomDnsItem(
204+
address = DUMMY_DNS_ADDRESS,
205+
isLocal = true,
206+
isIpv6 = false,
207+
)
208+
),
200209
)
201210
)
202211

@@ -213,7 +222,13 @@ class VpnSettingsScreenTest {
213222
VpnSettingsUiState.createDefault(
214223
isCustomDnsEnabled = true,
215224
customDnsItems =
216-
listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)),
225+
listOf(
226+
CustomDnsItem(
227+
address = DUMMY_DNS_ADDRESS,
228+
isLocal = false,
229+
isIpv6 = false,
230+
)
231+
),
217232
)
218233
)
219234

@@ -230,7 +245,13 @@ class VpnSettingsScreenTest {
230245
VpnSettingsUiState.createDefault(
231246
isCustomDnsEnabled = true,
232247
customDnsItems =
233-
listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)),
248+
listOf(
249+
CustomDnsItem(
250+
address = DUMMY_DNS_ADDRESS,
251+
isLocal = false,
252+
isIpv6 = false,
253+
)
254+
),
234255
)
235256
)
236257

@@ -247,7 +268,13 @@ class VpnSettingsScreenTest {
247268
VpnSettingsUiState.createDefault(
248269
isCustomDnsEnabled = true,
249270
customDnsItems =
250-
listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)),
271+
listOf(
272+
CustomDnsItem(
273+
address = DUMMY_DNS_ADDRESS,
274+
isLocal = true,
275+
isIpv6 = false,
276+
)
277+
),
251278
)
252279
)
253280

@@ -417,7 +444,7 @@ class VpnSettingsScreenTest {
417444
state =
418445
VpnSettingsUiState.createDefault(
419446
isCustomDnsEnabled = true,
420-
customDnsItems = listOf(CustomDnsItem("1.1.1.1", false)),
447+
customDnsItems = listOf(CustomDnsItem("1.1.1.1", false, false)),
421448
),
422449
navigateToDns = mockedClickHandler,
423450
)

android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ class VpnSettingsViewModelTest {
174174
daitaSettings = DaitaSettings(enabled = false, directOnly = false),
175175
),
176176
dnsOptions = mockk(relaxed = true),
177+
genericOptions = mockk(relaxed = true),
177178
)
178179

179180
// Act, Assert

0 commit comments

Comments
 (0)