Skip to content

Commit 57f7652

Browse files
committed
Fix tests
1 parent 386c189 commit 57f7652

File tree

1 file changed

+23
-10
lines changed

1 file changed

+23
-10
lines changed

app/src/test/kotlin/at/bitfire/davdroid/network/ConnectionSecurityManagerTest.kt

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@ import org.junit.Assert.assertNull
1414
import org.junit.Assert.assertTrue
1515
import org.junit.Test
1616
import java.util.Optional
17+
import java.util.logging.Logger
1718

1819
class ConnectionSecurityManagerTest {
1920

21+
private val logger = Logger.getLogger(javaClass.name)
22+
2023
@Test
2124
fun `getContext(no customTrustManager, no client certificate)`() {
2225
val manager = ConnectionSecurityManager(
2326
customTrustManager = Optional.empty(),
2427
customHostnameVerifier = Optional.empty(),
25-
keyManagerFactory = mockk()
28+
keyManagerFactory = mockk(),
29+
logger = logger
2630
)
2731
val context = manager.getContext(null)
2832
assertNull(context.sslSocketFactory)
@@ -37,7 +41,8 @@ class ConnectionSecurityManagerTest {
3741
val manager = ConnectionSecurityManager(
3842
customTrustManager = Optional.empty(),
3943
customHostnameVerifier = Optional.empty(),
40-
keyManagerFactory = kmf
44+
keyManagerFactory = kmf,
45+
logger = logger
4146
)
4247
val context = manager.getContext("alias")
4348
assertNotNull(context.sslSocketFactory)
@@ -56,7 +61,8 @@ class ConnectionSecurityManagerTest {
5661
val manager = ConnectionSecurityManager(
5762
customTrustManager = Optional.of(customTrustManager),
5863
customHostnameVerifier = Optional.of(customHostnameVerifier),
59-
keyManagerFactory = mockk()
64+
keyManagerFactory = mockk(),
65+
logger = logger
6066
)
6167
val context = manager.getContext(null)
6268
assertNotNull(context.sslSocketFactory)
@@ -73,7 +79,8 @@ class ConnectionSecurityManagerTest {
7379
val manager = ConnectionSecurityManager(
7480
customTrustManager = Optional.of(customTrustManager),
7581
customHostnameVerifier = Optional.of(customHostnameVerifier),
76-
keyManagerFactory = kmf
82+
keyManagerFactory = kmf,
83+
logger = logger
7784
)
7885
val context = manager.getContext("alias")
7986
assertNotNull(context.sslSocketFactory)
@@ -90,7 +97,8 @@ class ConnectionSecurityManagerTest {
9097
val manager = ConnectionSecurityManager(
9198
customTrustManager = Optional.empty(),
9299
customHostnameVerifier = Optional.empty(),
93-
keyManagerFactory = mockk()
100+
keyManagerFactory = mockk(),
101+
logger = logger
94102
)
95103
val socketFactory = manager.getSocketFactory(null)
96104
assertNotNull(socketFactory.javaClass)
@@ -102,7 +110,8 @@ class ConnectionSecurityManagerTest {
102110
val manager = ConnectionSecurityManager(
103111
customTrustManager = Optional.empty(),
104112
customHostnameVerifier = Optional.empty(),
105-
keyManagerFactory = kmf
113+
keyManagerFactory = kmf,
114+
logger = logger
106115
)
107116
val socketFactory = manager.getSocketFactory("alias")
108117
assertNotNull(socketFactory.javaClass)
@@ -118,7 +127,8 @@ class ConnectionSecurityManagerTest {
118127
val manager = ConnectionSecurityManager(
119128
customTrustManager = Optional.of(customTrustManager),
120129
customHostnameVerifier = Optional.of(customHostnameVerifier),
121-
keyManagerFactory = mockk()
130+
keyManagerFactory = mockk(),
131+
logger = logger
122132
)
123133
val socketFactory = manager.getSocketFactory(null)
124134
assertNotNull(socketFactory.javaClass)
@@ -132,7 +142,8 @@ class ConnectionSecurityManagerTest {
132142
val manager = ConnectionSecurityManager(
133143
customTrustManager = Optional.of(customTrustManager),
134144
customHostnameVerifier = Optional.of(customHostnameVerifier),
135-
keyManagerFactory = kmf
145+
keyManagerFactory = kmf,
146+
logger = logger
136147
)
137148
val socketFactory = manager.getSocketFactory("alias")
138149
assertNotNull(socketFactory.javaClass)
@@ -147,7 +158,8 @@ class ConnectionSecurityManagerTest {
147158
val manager = ConnectionSecurityManager(
148159
customTrustManager = Optional.empty(),
149160
customHostnameVerifier = Optional.empty(),
150-
keyManagerFactory = kmf
161+
keyManagerFactory = kmf,
162+
logger = logger
151163
)
152164

153165
// First call - should create new socket factory
@@ -173,7 +185,8 @@ class ConnectionSecurityManagerTest {
173185
val manager = ConnectionSecurityManager(
174186
customTrustManager = Optional.empty(),
175187
customHostnameVerifier = Optional.empty(),
176-
keyManagerFactory = kmf
188+
keyManagerFactory = kmf,
189+
logger = logger
177190
)
178191

179192
// Get context for first alias

0 commit comments

Comments
 (0)