@@ -29,7 +29,10 @@ class ForwardedEmailServiceTypeExtensionsTest {
29
29
)
30
30
UsernameGenerationOptions .ForwardedEmailServiceType .entries
31
31
.forEach {
32
- val expected = createMockForwardedEmailAliasServiceType(it, true )
32
+ val expected = createMockForwardedEmailAliasServiceType(
33
+ serviceTypeOption = it,
34
+ useEmptyValues = false ,
35
+ )
33
36
assertEquals(
34
37
expected,
35
38
it.toServiceType(options),
@@ -59,53 +62,66 @@ class ForwardedEmailServiceTypeExtensionsTest {
59
62
)
60
63
UsernameGenerationOptions .ForwardedEmailServiceType .entries
61
64
.forEach {
62
- val expected =
63
- createMockForwardedEmailAliasServiceType(serviceTypeOption = it, empty = true )
64
65
assertEquals(
65
- expected,
66
+ createMockForwardedEmailAliasServiceType(
67
+ serviceTypeOption = it,
68
+ useEmptyValues = true ,
69
+ ),
66
70
it.toServiceType(options),
67
71
)
68
72
}
69
73
}
70
74
71
75
private fun createMockForwardedEmailAliasServiceType (
72
76
serviceTypeOption : UsernameGenerationOptions .ForwardedEmailServiceType ,
73
- empty : Boolean = false,
77
+ useEmptyValues : Boolean = false,
74
78
): ServiceType ? = when (serviceTypeOption) {
75
79
UsernameGenerationOptions .ForwardedEmailServiceType .NONE -> null
76
80
77
81
UsernameGenerationOptions .ForwardedEmailServiceType .ANON_ADDY -> {
78
82
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(),
82
86
)
83
87
}
84
88
85
89
UsernameGenerationOptions .ForwardedEmailServiceType .FIREFOX_RELAY -> {
86
90
ServiceType .FirefoxRelay (
87
91
apiAccessToken = " access_token_firefox_relay"
88
- .takeUnless { empty }
92
+ .takeUnless { useEmptyValues }
89
93
.orEmpty(),
90
94
)
91
95
}
92
96
93
97
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
+ )
95
103
}
96
104
97
105
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
+ )
99
111
}
100
112
101
113
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
+ )
103
119
}
104
120
105
121
UsernameGenerationOptions .ForwardedEmailServiceType .FORWARD_EMAIL -> {
106
122
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(),
109
125
)
110
126
}
111
127
}
0 commit comments