diff options
author | Yuuta Liang <yuutaw@students.cs.ubc.ca> | 2023-10-14 05:35:17 +0800 |
---|---|---|
committer | Yuuta Liang <yuutaw@students.cs.ubc.ca> | 2023-10-14 05:35:17 +0800 |
commit | 28fa18278c1f3a87722d5e8b78f581526a30bb38 (patch) | |
tree | 2f23f6e2e222a78f40809ec37e8b28a29cba3d3c /src/test/model/pki/cert | |
parent | 0bcc057e741af3fbc108f42b75f9d42f48f6a51e (diff) | |
download | jca-28fa18278c1f3a87722d5e8b78f581526a30bb38.tar jca-28fa18278c1f3a87722d5e8b78f581526a30bb38.tar.gz jca-28fa18278c1f3a87722d5e8b78f581526a30bb38.tar.bz2 jca-28fa18278c1f3a87722d5e8b78f581526a30bb38.zip |
Fix lint
Signed-off-by: Yuuta Liang <yuutaw@students.cs.ubc.ca>
Diffstat (limited to 'src/test/model/pki/cert')
-rw-r--r-- | src/test/model/pki/cert/CertificateTest.java | 19 | ||||
-rw-r--r-- | src/test/model/pki/cert/ExtensionTest.java | 42 | ||||
-rw-r--r-- | src/test/model/pki/cert/TbsCertificateTest.java | 10 | ||||
-rw-r--r-- | src/test/model/pki/cert/ValidityTest.java | 18 |
4 files changed, 44 insertions, 45 deletions
diff --git a/src/test/model/pki/cert/CertificateTest.java b/src/test/model/pki/cert/CertificateTest.java index 70564fc..5fb2e82 100644 --- a/src/test/model/pki/cert/CertificateTest.java +++ b/src/test/model/pki/cert/CertificateTest.java @@ -1,20 +1,15 @@ package model.pki.cert; import model.TestConstants; -import model.asn1.*; +import model.asn1.ASN1Object; +import model.asn1.BitString; +import model.asn1.Null; +import model.asn1.ObjectIdentifier; import model.asn1.exceptions.ParseException; import model.asn1.parsing.BytesReader; -import model.csr.CertificationRequest; -import model.csr.CertificationRequestInfo; -import model.csr.CertificationRequestInfoTest; import model.pki.AlgorithmIdentifier; -import model.pki.SubjectPublicKeyInfo; import org.junit.jupiter.api.Test; -import java.util.Arrays; -import java.util.Collection; -import java.util.stream.Stream; - import static model.TestConstants.mutate; import static org.junit.jupiter.api.Assertions.*; @@ -26,13 +21,13 @@ public class CertificateTest { new AlgorithmIdentifier(ASN1Object.TAG_SEQUENCE, null, new ObjectIdentifier(ObjectIdentifier.TAG, null, ObjectIdentifier.OID_RSA_ENCRYPTION), new Null(Null.TAG, null)), - new BitString(BitString.TAG, null, 0, new Byte[]{ 1, 2, 3 })); + new BitString(BitString.TAG, null, 0, new Byte[]{1, 2, 3})); assertEquals(TbsCertificate.VERSION_V3, certificate.getCertificate().getVersion().getLong()); assertArrayEquals(ObjectIdentifier.OID_RSA_ENCRYPTION, certificate.getSignatureAlgorithm().getType().getInts()); - assertArrayEquals(new Byte[]{ 1, 2, 3 }, + assertArrayEquals(new Byte[]{1, 2, 3}, certificate.getSignature().getConvertedVal()); } @@ -57,7 +52,7 @@ public class CertificateTest { void testParseFail() { // Incorrect certificate tag assertThrows(ParseException.class, () -> - new Certificate(new BytesReader(mutate(TestConstants.CERT_L1_ECC, 4, 0x30, 0x31)), false) + new Certificate(new BytesReader(mutate(TestConstants.CERT_L1_ECC, 4, 0x30, 0x31)), false) ); // Incorrect signatureAlgorithm tag assertThrows(ParseException.class, () -> diff --git a/src/test/model/pki/cert/ExtensionTest.java b/src/test/model/pki/cert/ExtensionTest.java index 06561ba..e00cbc5 100644 --- a/src/test/model/pki/cert/ExtensionTest.java +++ b/src/test/model/pki/cert/ExtensionTest.java @@ -11,19 +11,19 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; public class ExtensionTest { - static final Byte[] EXT_SUBJECT_KEY_ID = new Byte[] { + static final Byte[] EXT_SUBJECT_KEY_ID = new Byte[]{ 0x30, 0x1D, // SEQUENCE Extension 0x06, 0x03, 0x55, 0x1D, 0x0E, // OID subjectKeyIdentifier 0x04, 0x16, // OCTET STRING - 0x04, 0x14, -79, -62, -89, -127, 0x63, 0x66, - 0x4B, 0x72, 0x0A, -35, -3, 0x7D, 0x20, 0x29, - -67, 0x6B, 0x49, 0x09, 0x61, -64 + 0x04, 0x14, -79, -62, -89, -127, 0x63, 0x66, + 0x4B, 0x72, 0x0A, -35, -3, 0x7D, 0x20, 0x29, + -67, 0x6B, 0x49, 0x09, 0x61, -64 }; - static final Byte[] EXT_KEY_USAGE = new Byte[] { + static final Byte[] EXT_KEY_USAGE = new Byte[]{ 0x30, 0x0E, // SEQUENCE Extension 0x06, 0x03, 0x55, 0x1D, 0x0F, // OID keyUsage - 0x01, 0x01, -1, // BOOLEAN critical + 0x01, 0x01, -1, // BOOLEAN critical 0x04, 0x04, // OCTET STRING 0x03, 0x02, 0x01, -122 }; @@ -33,10 +33,10 @@ public class ExtensionTest { final Extension ext = new Extension(ASN1Object.TAG_SEQUENCE, null, new ObjectIdentifier(ObjectIdentifier.TAG, null, ObjectIdentifier.OID_BASIC_CONSTRAINTS), new Bool(Bool.TAG, null, true), - new OctetString(OctetString.TAG, null, new Byte[]{ 0x30, 0x03, 0x01, 0x01, -1 })); + new OctetString(OctetString.TAG, null, new Byte[]{0x30, 0x03, 0x01, 0x01, -1})); assertArrayEquals(ObjectIdentifier.OID_BASIC_CONSTRAINTS, ext.getExtnId().getInts()); assertTrue(ext.getCritical().getValue()); - assertArrayEquals(new Byte[]{ 0x30, 0x03, 0x01, 0x01, -1 }, ext.getExtnValue().getBytes()); + assertArrayEquals(new Byte[]{0x30, 0x03, 0x01, 0x01, -1}, ext.getExtnValue().getBytes()); } @Test @@ -44,16 +44,16 @@ public class ExtensionTest { Extension parsed = new Extension(new BytesReader(EXT_SUBJECT_KEY_ID), false); assertArrayEquals(ObjectIdentifier.OID_SUBJECT_KEY_IDENTIFIER, parsed.getExtnId().getInts()); assertNull(parsed.getCritical()); - assertArrayEquals(new Byte[] { - 0x04, 0x14, -79, -62, -89, -127, 0x63, 0x66, - 0x4B, 0x72, 0x0A, -35, -3, 0x7D, 0x20, 0x29, - -67, 0x6B, 0x49, 0x09, 0x61, -64 + assertArrayEquals(new Byte[]{ + 0x04, 0x14, -79, -62, -89, -127, 0x63, 0x66, + 0x4B, 0x72, 0x0A, -35, -3, 0x7D, 0x20, 0x29, + -67, 0x6B, 0x49, 0x09, 0x61, -64 }, parsed.getExtnValue().getBytes()); parsed = new Extension(new BytesReader(EXT_KEY_USAGE), false); assertArrayEquals(ObjectIdentifier.OID_KEY_USAGE, parsed.getExtnId().getInts()); assertTrue(parsed.getCritical().getValue()); - assertArrayEquals(new Byte[] { + assertArrayEquals(new Byte[]{ 0x03, 0x02, 0x01, -122 }, parsed.getExtnValue().getBytes()); } @@ -68,7 +68,7 @@ public class ExtensionTest { assertThrows(ParseException.class, () -> new Extension(new BytesReader(new Byte[]{ 0x30, 0x0E, // SEQUENCE Extension 0x07, 0x03, 0x55, 0x1D, 0x0F, // OID keyUsage - 0x01, 0x01, -1, // BOOLEAN critical + 0x01, 0x01, -1, // BOOLEAN critical 0x04, 0x04, // OCTET STRING 0x03, 0x02, 0x01, -122 }), false)); @@ -76,7 +76,7 @@ public class ExtensionTest { assertThrows(ParseException.class, () -> new Extension(new BytesReader(new Byte[]{ 0x30, 0x0E, // SEQUENCE Extension 0x06, 0x03, 0x55, 0x1D, 0x0F, // OID keyUsage - 0x05, 0x01, -1, // BOOLEAN critical + 0x05, 0x01, -1, // BOOLEAN critical 0x04, 0x04, // OCTET STRING 0x03, 0x02, 0x01, -122 }), false)); @@ -84,7 +84,7 @@ public class ExtensionTest { assertThrows(ParseException.class, () -> new Extension(new BytesReader(new Byte[]{ 0x30, 0x0E, // SEQUENCE Extension 0x06, 0x03, 0x55, 0x1D, 0x0F, // OID keyUsage - 0x01, 0x01, -1, // BOOLEAN critical + 0x01, 0x01, -1, // BOOLEAN critical 0x09, 0x04, // OCTET STRING 0x03, 0x02, 0x01, -122 }), false)); @@ -103,15 +103,15 @@ public class ExtensionTest { assertArrayEquals(EXT_SUBJECT_KEY_ID, new Extension(ASN1Object.TAG_SEQUENCE, null, 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, - 0x4B, 0x72, 0x0A, -35, -3, 0x7D, 0x20, 0x29, - -67, 0x6B, 0x49, 0x09, 0x61, -64 + new OctetString(OctetString.TAG, null, new Byte[]{ + 0x04, 0x14, -79, -62, -89, -127, 0x63, 0x66, + 0x4B, 0x72, 0x0A, -35, -3, 0x7D, 0x20, 0x29, + -67, 0x6B, 0x49, 0x09, 0x61, -64 })).encodeDER()); assertArrayEquals(EXT_KEY_USAGE, new Extension(ASN1Object.TAG_SEQUENCE, null, new ObjectIdentifier(ObjectIdentifier.TAG, null, ObjectIdentifier.OID_KEY_USAGE), new Bool(Bool.TAG, null, true), - new OctetString(OctetString.TAG, null, new Byte[] { + new OctetString(OctetString.TAG, null, new Byte[]{ 0x03, 0x02, 0x01, -122 })).encodeDER()); } diff --git a/src/test/model/pki/cert/TbsCertificateTest.java b/src/test/model/pki/cert/TbsCertificateTest.java index be26eb9..972f59a 100644 --- a/src/test/model/pki/cert/TbsCertificateTest.java +++ b/src/test/model/pki/cert/TbsCertificateTest.java @@ -1,9 +1,11 @@ package model.pki.cert; -import model.asn1.*; +import model.TestConstants; +import model.asn1.ASN1Object; +import model.asn1.Null; +import model.asn1.ObjectIdentifier; import model.asn1.exceptions.ParseException; import model.asn1.parsing.BytesReader; -import model.TestConstants; import org.junit.jupiter.api.Test; import java.math.BigInteger; @@ -52,13 +54,13 @@ public class TbsCertificateTest { false); assertEquals(TbsCertificate.VERSION_V3, parsed.getVersion().getLong()); assertEquals(0, parsed.getSerialNumber().getValue() - .compareTo(new BigInteger("644983544608556543477205958886697401602227090424"))); + .compareTo(new BigInteger("644983544608556543477205958886697401602227090424"))); assertArrayEquals(ObjectIdentifier.OID_ECDSA_WITH_SHA256, parsed.getSignature().getType().getInts()); assertNull(parsed.getSignature().getParameters()); assertEquals("CN=Yuuta Root CA,C=CA", parsed.getIssuer().toString()); assertEquals(ZonedDateTime.of(2023, 6, 23, - 2, 50, 46, 0, ZoneId.of("UTC")), + 2, 50, 46, 0, ZoneId.of("UTC")), parsed.getValidity().getNotBefore().getTimestamp()); assertEquals(ZonedDateTime.of(2048, 6, 23, 2, 50, 46, 0, ZoneId.of("UTC")), diff --git a/src/test/model/pki/cert/ValidityTest.java b/src/test/model/pki/cert/ValidityTest.java index eba5092..2471ced 100644 --- a/src/test/model/pki/cert/ValidityTest.java +++ b/src/test/model/pki/cert/ValidityTest.java @@ -1,7 +1,9 @@ package model.pki.cert; -import jdk.jshell.EvalException; -import model.asn1.*; +import model.asn1.ASN1Object; +import model.asn1.ASN1Time; +import model.asn1.GeneralizedTime; +import model.asn1.UtcTime; import model.asn1.exceptions.ParseException; import model.asn1.parsing.BytesReader; import org.junit.jupiter.api.BeforeEach; @@ -81,7 +83,7 @@ public class ValidityTest { // Too short assertThrows(ParseException.class, () -> - new Validity(new BytesReader(new Byte[] { + new Validity(new BytesReader(new Byte[]{ 0x30, 0x0 }), false)); assertThrows(ParseException.class, () -> { @@ -107,11 +109,11 @@ 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) }), - Arrays.asList(utcBytes), - Arrays.asList(genBytes)) - .flatMap(Collection::stream) - .toArray(Byte[]::new), + assertArrayEquals(Stream.of(Arrays.asList(new Byte[]{0x30, (byte) (utcBytes.length + genBytes.length)}), + Arrays.asList(utcBytes), + Arrays.asList(genBytes)) + .flatMap(Collection::stream) + .toArray(Byte[]::new), new Validity(ASN1Object.TAG_SEQUENCE, null, utc, gen) .encodeDER()); } |