Skip to content

Commit ee35df9

Browse files
committed
Fix test
1 parent d271c0a commit ee35df9

File tree

1 file changed

+30
-14
lines changed

1 file changed

+30
-14
lines changed

app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/util/ForwardedEmailServiceTypeExtensionsTest.kt

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ class ForwardedEmailServiceTypeExtensionsTest {
2929
)
3030
UsernameGenerationOptions.ForwardedEmailServiceType.entries
3131
.forEach {
32-
val expected = createMockForwardedEmailAliasServiceType(it, true)
32+
val expected = createMockForwardedEmailAliasServiceType(
33+
serviceTypeOption = it,
34+
useEmptyValues = false,
35+
)
3336
assertEquals(
3437
expected,
3538
it.toServiceType(options),
@@ -59,53 +62,66 @@ class ForwardedEmailServiceTypeExtensionsTest {
5962
)
6063
UsernameGenerationOptions.ForwardedEmailServiceType.entries
6164
.forEach {
62-
val expected =
63-
createMockForwardedEmailAliasServiceType(serviceTypeOption = it, empty = true)
6465
assertEquals(
65-
expected,
66+
createMockForwardedEmailAliasServiceType(
67+
serviceTypeOption = it,
68+
useEmptyValues = true,
69+
),
6670
it.toServiceType(options),
6771
)
6872
}
6973
}
7074

7175
private fun createMockForwardedEmailAliasServiceType(
7276
serviceTypeOption: UsernameGenerationOptions.ForwardedEmailServiceType,
73-
empty: Boolean = false,
77+
useEmptyValues: Boolean = false,
7478
): ServiceType? = when (serviceTypeOption) {
7579
UsernameGenerationOptions.ForwardedEmailServiceType.NONE -> null
7680

7781
UsernameGenerationOptions.ForwardedEmailServiceType.ANON_ADDY -> {
7882
ServiceType.AddyIo(
79-
apiAccessToken = "access_token_anon_addy".takeUnless { empty }.orEmpty(),
80-
domainName = "anonaddy.com".takeUnless { empty }.orEmpty(),
81-
selfHostServerUrl = "anonaddy.local".takeUnless { empty }.orEmpty(),
83+
apiAccessToken = "access_token_anon_addy".takeUnless { useEmptyValues }.orEmpty(),
84+
domainName = "anonaddy.com".takeUnless { useEmptyValues }.orEmpty(),
85+
selfHostServerUrl = "anonaddy.local".takeUnless { useEmptyValues }.orEmpty(),
8286
)
8387
}
8488

8589
UsernameGenerationOptions.ForwardedEmailServiceType.FIREFOX_RELAY -> {
8690
ServiceType.FirefoxRelay(
8791
apiAccessToken = "access_token_firefox_relay"
88-
.takeUnless { empty }
92+
.takeUnless { useEmptyValues }
8993
.orEmpty(),
9094
)
9195
}
9296

9397
UsernameGenerationOptions.ForwardedEmailServiceType.SIMPLE_LOGIN -> {
94-
ServiceType.SimpleLogin(apiKey = "api_key_simple_login".takeUnless { empty }.orEmpty())
98+
ServiceType.SimpleLogin(
99+
apiKey = "api_key_simple_login"
100+
.takeUnless { useEmptyValues }
101+
.orEmpty(),
102+
)
95103
}
96104

97105
UsernameGenerationOptions.ForwardedEmailServiceType.DUCK_DUCK_GO -> {
98-
ServiceType.DuckDuckGo(apiKey = "api_key_duck_duck_go".takeUnless { empty }.orEmpty())
106+
ServiceType.DuckDuckGo(
107+
apiKey = "api_key_duck_duck_go"
108+
.takeUnless { useEmptyValues }
109+
.orEmpty(),
110+
)
99111
}
100112

101113
UsernameGenerationOptions.ForwardedEmailServiceType.FASTMAIL -> {
102-
ServiceType.FastMail(apiKey = "api_key_fast_mail".takeUnless { empty }.orEmpty())
114+
ServiceType.FastMail(
115+
apiKey = "api_key_fast_mail"
116+
.takeUnless { useEmptyValues }
117+
.orEmpty(),
118+
)
103119
}
104120

105121
UsernameGenerationOptions.ForwardedEmailServiceType.FORWARD_EMAIL -> {
106122
ServiceType.ForwardEmail(
107-
apiKey = "access_token_forward_email".takeUnless { empty }.orEmpty(),
108-
domainName = "forwardemail.net".takeUnless { empty }.orEmpty(),
123+
apiKey = "access_token_forward_email".takeUnless { useEmptyValues }.orEmpty(),
124+
domainName = "forwardemail.net".takeUnless { useEmptyValues }.orEmpty(),
109125
)
110126
}
111127
}

0 commit comments

Comments
 (0)