Skip to content

Commit 90c390f

Browse files
committed
Fix unit tests
1 parent d521614 commit 90c390f

File tree

2 files changed

+10
-38
lines changed

2 files changed

+10
-38
lines changed

lib/src/androidTest/java/at/bitfire/cert4android/CertUtilsTest.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/src/test/java/at/bitfire/cert4android/CertUtilsTest.kt

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ class CertUtilsTest {
1616
private val certFactory = CertificateFactory.getInstance("X.509")!!
1717

1818

19+
@Test
20+
fun testGetTrustManagerSystem() {
21+
assertNotNull(CertUtils.getTrustManager(null))
22+
}
23+
1924
@Test
2025
fun testFingerprint() {
2126
javaClass.classLoader!!.getResourceAsStream("davdroid-web.crt").use { stream ->
@@ -25,33 +30,16 @@ class CertUtilsTest {
2530
}
2631
}
2732

28-
@Test
29-
fun testGetTrustManagerSystem() {
30-
assertNotNull(CertUtils.getTrustManager(null))
31-
}
32-
3333
@Test
3434
fun testGetTag() {
3535
javaClass.classLoader!!.getResourceAsStream("davdroid-web.crt").use { stream ->
3636
val cert = certFactory.generateCertificate(stream) as X509Certificate
3737
assertNotNull(cert)
3838

39-
assertEquals("276126a80783ee16b84811e1e96e977a" +
40-
"05ac0f980c586cc9784d95a804260c6d" +
41-
"ddea1172266f210ef2d9463fee60afe7" +
42-
"875274bdc65b91838f65ba566a51e55e" +
43-
"143e7c40948eb5f314d253d36a695235" +
44-
"c6df782e773f8455431e905d65d5d489" +
45-
"a4e8afcfdc2dceb8ba5f706f71c75106" +
46-
"caae8d4de5670d3721c722df11a0f377" +
47-
"b13aca4525399954c31414dcb5449cbe" +
48-
"3b444595b31952bb5782aff07d0d4ff3" +
49-
"feefeabe8332a7fef47d64f29546a127" +
50-
"e461ed972e5d1bbe0ebca916ed0fb03b" +
51-
"81ec4c6019ac2f01b9f6c22dfbf4fb69" +
52-
"0564874dc8e7ee3ac2ac0f29722ca353" +
53-
"17865e1cac3c4a1fb9780fafd1c8763e" +
54-
"1b4854d63067b91ece029833e9506b75", CertUtils.getTag(cert))
39+
assertEquals(
40+
"4F91DE498B026C600389A9F40D37CBC6A74DBCA060CA0F927556A88B67CC6C8B15D2F7B93B3FA1407AD49994CB3DEA6FA72851A5B680B283E449CEB25B6559A2",
41+
CertUtils.getTag(cert)
42+
)
5543
}
5644
}
5745

@@ -61,4 +49,4 @@ class CertUtilsTest {
6149
assertEquals("00:01:02:03:04:05:06:07:08:09:0A:0B:0C:0D:0E:0F:10", CertUtils.hexString(ByteArray(17) { i -> i.toByte() }))
6250
}
6351

64-
}
52+
}

0 commit comments

Comments
 (0)