diff options
Diffstat (limited to 'src/test/model/pki')
-rw-r--r-- | src/test/model/pki/cert/ExtensionsTest.java | 30 | ||||
-rw-r--r-- | src/test/model/pki/cert/TbsCertificateTest.java | 3 | ||||
-rw-r--r-- | src/test/model/pki/cert/ValidityTest.java | 2 |
3 files changed, 21 insertions, 14 deletions
diff --git a/src/test/model/pki/cert/ExtensionsTest.java b/src/test/model/pki/cert/ExtensionsTest.java index e50b3e6..e4d9e0b 100644 --- a/src/test/model/pki/cert/ExtensionsTest.java +++ b/src/test/model/pki/cert/ExtensionsTest.java @@ -35,14 +35,16 @@ public class ExtensionsTest { assertEquals(2, extensions.getExtensions().length); assertArrayEquals(ObjectIdentifier.OID_BASIC_CONSTRAINTS, extensions.getExtensions()[0].getExtnId().getInts()); - assertArrayEquals(ObjectIdentifier.OID_SUBJECT_KEY_IDENTIFIER, extensions.getExtensions()[1].getExtnId().getInts()); + assertArrayEquals(ObjectIdentifier.OID_SUBJECT_KEY_IDENTIFIER, + extensions.getExtensions()[1].getExtnId().getInts()); } @Test void testParse() throws ParseException { final Extensions parsed = new Extensions(new BytesReader( - Stream.of(Arrays.asList(new Byte[]{0x30, - (byte) (ExtensionTest.EXT_KEY_USAGE.length + ExtensionTest.EXT_SUBJECT_KEY_ID.length)}), + Stream.of(Arrays.asList((byte) 0x30, + (byte) (ExtensionTest.EXT_KEY_USAGE.length + + ExtensionTest.EXT_SUBJECT_KEY_ID.length)), Arrays.asList(ExtensionTest.EXT_KEY_USAGE), Arrays.asList(ExtensionTest.EXT_SUBJECT_KEY_ID)) .flatMap(Collection::stream) @@ -58,8 +60,9 @@ public class ExtensionsTest { }); assertThrows(ParseException.class, () -> { Byte[] bytes = - Stream.of(Arrays.asList(new Byte[]{0x30, - (byte) (ExtensionTest.EXT_KEY_USAGE.length + ExtensionTest.EXT_SUBJECT_KEY_ID.length)}), + Stream.of(Arrays.asList((byte) 0x30, + (byte) (ExtensionTest.EXT_KEY_USAGE.length + + ExtensionTest.EXT_SUBJECT_KEY_ID.length)), Arrays.asList(ExtensionTest.EXT_KEY_USAGE), Arrays.asList(ExtensionTest.EXT_SUBJECT_KEY_ID)) .flatMap(Collection::stream) @@ -70,8 +73,9 @@ public class ExtensionsTest { }); assertThrows(ParseException.class, () -> { Byte[] bytes = - Stream.of(Arrays.asList(new Byte[]{0x30, - (byte) (ExtensionTest.EXT_KEY_USAGE.length + ExtensionTest.EXT_SUBJECT_KEY_ID.length)}), + Stream.of(Arrays.asList((byte) 0x30, + (byte) (ExtensionTest.EXT_KEY_USAGE.length + + ExtensionTest.EXT_SUBJECT_KEY_ID.length)), Arrays.asList(ExtensionTest.EXT_KEY_USAGE), Arrays.asList(ExtensionTest.EXT_SUBJECT_KEY_ID)) .flatMap(Collection::stream) @@ -85,16 +89,17 @@ public class ExtensionsTest { @Test void testEncode() { assertArrayEquals( - Stream.of(Arrays.asList(new Byte[]{0x30, - (byte) (ExtensionTest.EXT_KEY_USAGE.length + - ExtensionTest.EXT_SUBJECT_KEY_ID.length)}), + Stream.of(Arrays.asList((byte) 0x30, + (byte) (ExtensionTest.EXT_KEY_USAGE.length + + ExtensionTest.EXT_SUBJECT_KEY_ID.length)), Arrays.asList(ExtensionTest.EXT_SUBJECT_KEY_ID), Arrays.asList(ExtensionTest.EXT_KEY_USAGE)) .flatMap(Collection::stream) .toArray(Byte[]::new), new Extensions(ASN1Object.TAG_SEQUENCE, null, new Extension[]{ new Extension(ASN1Object.TAG_SEQUENCE, null, - new ObjectIdentifier(ObjectIdentifier.TAG, null, ObjectIdentifier.OID_SUBJECT_KEY_IDENTIFIER), + new ObjectIdentifier(ObjectIdentifier.TAG, null, + ObjectIdentifier.OID_SUBJECT_KEY_IDENTIFIER), null, new OctetString(OctetString.TAG, null, new Byte[]{ 0x04, 0x14, -79, -62, -89, -127, 0x63, 0x66, @@ -102,7 +107,8 @@ public class ExtensionsTest { -67, 0x6B, 0x49, 0x09, 0x61, -64 })), new Extension(ASN1Object.TAG_SEQUENCE, null, - new ObjectIdentifier(ObjectIdentifier.TAG, null, ObjectIdentifier.OID_KEY_USAGE), + new ObjectIdentifier(ObjectIdentifier.TAG, null, + ObjectIdentifier.OID_KEY_USAGE), new Bool(Bool.TAG, null, true), new OctetString(OctetString.TAG, null, new Byte[]{ 0x03, 0x02, 0x01, -122 diff --git a/src/test/model/pki/cert/TbsCertificateTest.java b/src/test/model/pki/cert/TbsCertificateTest.java index ee2a9c7..e778350 100644 --- a/src/test/model/pki/cert/TbsCertificateTest.java +++ b/src/test/model/pki/cert/TbsCertificateTest.java @@ -21,7 +21,8 @@ public class TbsCertificateTest { void testConstructor() { assertEquals(TbsCertificate.VERSION_V3, TestConstants.CERT_GENERATED.getVersion().getLong()); assertEquals(100, TestConstants.CERT_GENERATED.getSerialNumber().getLong()); - assertArrayEquals(ObjectIdentifier.OID_RSA_ENCRYPTION, TestConstants.CERT_GENERATED.getSignature().getType().getInts()); + assertArrayEquals(ObjectIdentifier.OID_RSA_ENCRYPTION, + TestConstants.CERT_GENERATED.getSignature().getType().getInts()); assertEquals("CN=Test CA,C=CA", TestConstants.CERT_GENERATED.getIssuer().toString()); assertEquals(TestConstants.NOW, TestConstants.CERT_GENERATED.getValidity().getNotBefore().getTimestamp()); assertEquals(TestConstants.NOW.plusYears(1), diff --git a/src/test/model/pki/cert/ValidityTest.java b/src/test/model/pki/cert/ValidityTest.java index 2471ced..0eb60b5 100644 --- a/src/test/model/pki/cert/ValidityTest.java +++ b/src/test/model/pki/cert/ValidityTest.java @@ -109,7 +109,7 @@ public class ValidityTest { final Byte[] utcBytes = utc.encodeDER(); final Byte[] genBytes = gen.encodeDER(); - assertArrayEquals(Stream.of(Arrays.asList(new Byte[]{0x30, (byte) (utcBytes.length + genBytes.length)}), + assertArrayEquals(Stream.of(Arrays.asList((byte) 0x30, (byte) (utcBytes.length + genBytes.length)), Arrays.asList(utcBytes), Arrays.asList(genBytes)) .flatMap(Collection::stream) |