Skip to content

Commit 19d5304

Browse files
jonduran3000complexspaces
authored andcommitted
Use valid Java package names
Updated to use valid Java packages names. This isn't a problem on older versions of Java but newer versions of Java validate this and cause build failures.
1 parent f485efa commit 19d5304

File tree

5 files changed

+510
-512
lines changed

5 files changed

+510
-512
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
package com.onepassword.rustls_platform_verifier // ktlint-disable package-name
2-
3-
import android.content.Context
4-
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
import androidx.test.platform.app.InstrumentationRegistry
6-
import org.junit.Assert.assertEquals
7-
import org.junit.Assert.assertTrue
8-
import org.junit.BeforeClass
9-
import org.junit.Test
10-
import org.junit.runner.RunWith
11-
12-
private const val SUCCESS_MARKER: String = "success"
13-
private const val FAILURE_MSG: String = "A test failed. Check the logs above for Rust panics."
14-
15-
/**
16-
* Instrumented test, which will execute on an Android device.
17-
*
18-
* See [testing documentation](http://d.android.com/tools/testing).
19-
*/
20-
@RunWith(AndroidJUnit4::class)
21-
class CertificateVerifierTests {
22-
private external fun mockTests(applicationContext: Context): String
23-
private external fun realWorldTests(applicationContext: Context): String
24-
private external fun verifyMockRootUsage(applicationContext: Context): String
25-
26-
companion object {
27-
@BeforeClass
28-
@JvmStatic
29-
fun init() {
30-
System.loadLibrary("rustls_platform_verifier")
31-
}
32-
}
33-
34-
@Test
35-
fun runMockTestSuite() {
36-
val context = InstrumentationRegistry.getInstrumentation().targetContext
37-
val result = mockTests(context)
38-
assertEquals(FAILURE_MSG, SUCCESS_MARKER, result)
39-
}
40-
41-
@Test
42-
fun runRealWorldTestSuite() {
43-
val context = InstrumentationRegistry.getInstrumentation().targetContext
44-
val result = realWorldTests(context)
45-
assertEquals(FAILURE_MSG, SUCCESS_MARKER, result)
46-
}
47-
48-
@Test
49-
fun runVerifyMockRootUsage() {
50-
val context = InstrumentationRegistry.getInstrumentation().targetContext
51-
val result = verifyMockRootUsage(context)
52-
assertEquals(FAILURE_MSG, SUCCESS_MARKER, result)
53-
}
54-
55-
// Note:
56-
//
57-
// - Full negative path (`CertificateVerifier`'s flow for unknown roots,
58-
// end-entity-only revocation check) already exercised via `runMockTestSuite`.
59-
//
60-
// - Full positive path (`CertificateVerifier`'s flow for known roots,
61-
// full-chain revocation check) already exercised via `runRealWorldTestSuite`.
62-
@Test
63-
fun runTestIsPublicRoot() {
64-
val rootCAs = CertificateVerifier.getSystemRootCAs()
65-
66-
// Positive - can ID known roots
67-
assertTrue(rootCAs.isNotEmpty())
68-
for (ca in rootCAs) {
69-
assertTrue(CertificateVerifier.isKnownRoot(ca))
70-
}
71-
}
72-
}
1+
package rustls.platformverifier.android
2+
3+
import android.content.Context
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
import androidx.test.platform.app.InstrumentationRegistry
6+
import org.junit.Assert.assertEquals
7+
import org.junit.Assert.assertTrue
8+
import org.junit.BeforeClass
9+
import org.junit.Test
10+
import org.junit.runner.RunWith
11+
12+
private const val SUCCESS_MARKER: String = "success"
13+
private const val FAILURE_MSG: String = "A test failed. Check the logs above for Rust panics."
14+
15+
/**
16+
* Instrumented test, which will execute on an Android device.
17+
*
18+
* See [testing documentation](http://d.android.com/tools/testing).
19+
*/
20+
@RunWith(AndroidJUnit4::class)
21+
class CertificateVerifierTests {
22+
private external fun mockTests(applicationContext: Context): String
23+
private external fun realWorldTests(applicationContext: Context): String
24+
private external fun verifyMockRootUsage(applicationContext: Context): String
25+
26+
companion object {
27+
@BeforeClass
28+
@JvmStatic
29+
fun init() {
30+
System.loadLibrary("rustls_platform_verifier")
31+
}
32+
}
33+
34+
@Test
35+
fun runMockTestSuite() {
36+
val context = InstrumentationRegistry.getInstrumentation().targetContext
37+
val result = mockTests(context)
38+
assertEquals(FAILURE_MSG, SUCCESS_MARKER, result)
39+
}
40+
41+
@Test
42+
fun runRealWorldTestSuite() {
43+
val context = InstrumentationRegistry.getInstrumentation().targetContext
44+
val result = realWorldTests(context)
45+
assertEquals(FAILURE_MSG, SUCCESS_MARKER, result)
46+
}
47+
48+
@Test
49+
fun runVerifyMockRootUsage() {
50+
val context = InstrumentationRegistry.getInstrumentation().targetContext
51+
val result = verifyMockRootUsage(context)
52+
assertEquals(FAILURE_MSG, SUCCESS_MARKER, result)
53+
}
54+
55+
// Note:
56+
//
57+
// - Full negative path (`CertificateVerifier`'s flow for unknown roots,
58+
// end-entity-only revocation check) already exercised via `runMockTestSuite`.
59+
//
60+
// - Full positive path (`CertificateVerifier`'s flow for known roots,
61+
// full-chain revocation check) already exercised via `runRealWorldTestSuite`.
62+
@Test
63+
fun runTestIsPublicRoot() {
64+
val rootCAs = CertificateVerifier.getSystemRootCAs()
65+
66+
// Positive - can ID known roots
67+
assertTrue(rootCAs.isNotEmpty())
68+
for (ca in rootCAs) {
69+
assertTrue(CertificateVerifier.isKnownRoot(ca))
70+
}
71+
}
72+
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.onepassword.rustls_platform_verifier">
4-
5-
</manifest>
3+
package="rustls.platformverifier.android"/>

0 commit comments

Comments
 (0)