From 8a7d2455240c2897e029573cdf12a246abab6dbd Mon Sep 17 00:00:00 2001 From: Matthew McPherrin Date: Wed, 8 Nov 2023 22:42:54 -0500 Subject: [PATCH] Test value changes These are genuine functionality changes, and may represent unexpected impact. Having two CNs doesn't seem right, but that case is tested so I'm leaving that here for discussion's sake. The other test case doesn't have a CN anymore, as expected --- .../test/java/org/shredzone/acme4j/util/CSRBuilderTest.java | 4 ++-- .../java/org/shredzone/acme4j/util/CertificateUtilsTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java index 071e9c16..a5cf5b50 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java @@ -189,7 +189,7 @@ public class CSRBuilderTest { builder.addValue("CN", "firstcn.example.com"); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com"); builder.addValue("CN", "scnd.example.com"); - assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com"); + assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,CN=scnd.example.com,DNS=firstcn.example.com,DNS=scnd.example.com"); builder = new CSRBuilder(); builder.addValue(BCStyle.C, "DE"); @@ -199,7 +199,7 @@ public class CSRBuilderTest { builder.addValue(BCStyle.CN, "firstcn.example.com"); assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com"); builder.addValue(BCStyle.CN, "scnd.example.com"); - assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,DNS=firstcn.example.com,DNS=scnd.example.com"); + assertThat(builder.toString()).isEqualTo("C=DE,E=contact@example.com,CN=firstcn.example.com,CN=scnd.example.com,DNS=firstcn.example.com,DNS=scnd.example.com"); } private CSRBuilder createBuilderWithValues() throws UnknownHostException { diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java index 9e4b0788..ca4c4da0 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/util/CertificateUtilsTest.java @@ -228,7 +228,7 @@ public class CertificateUtilsTest { notAfter, rootCert, rootKeypair.getPrivate()); assertThat(cert.getIssuerX500Principal().getName()).isEqualTo(rootSubject); - assertThat(cert.getSubjectX500Principal().getName()).isEqualTo("CN=example.org"); + assertThat(cert.getSubjectX500Principal().getName()).isEqualTo(""); assertThat(getSANs(cert)).contains("example.org", "www.example.org"); assertThat(getIpSANs(cert)).contains(InetAddress.getByName("192.168.0.1")); assertThat(cert.getNotBefore().toInstant()).isEqualTo(notBefore);