Merge remote-tracking branch 'upstream/master' into updates

jenkinsci · Mar 5, 2021 · b0a8f67 · b0a8f67
2 parents f807832 + 6f7d06b
commit b0a8f67
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -91,5 +91,11 @@
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>1.68</version>
     </dependency>
+    <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>3.11.1</version>
+        <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/src/test/java/jenkins/bouncycastle/EncodingDecodingTest.java b/src/test/java/jenkins/bouncycastle/EncodingDecodingTest.java
@@ -24,6 +24,8 @@
 
 package jenkins.bouncycastle;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.contentOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -122,7 +124,7 @@ public void testReadOnlyPrivateKeyPEM() throws Exception {
         pemEncOnlyPrivate.write(onlyPrivate);
         assertTrue(Arrays.equals(pemEncOnlyPrivate.toPrivateKey().getEncoded(),
                 pemEnc.toPrivateKey().getEncoded()));
-        assertEquals(FileUtils.readFileToString(PRIVATE_KEY_PEM), FileUtils.readFileToString(onlyPrivate));
+        assertThat(contentOf(onlyPrivate)).isEqualToNormalizingNewlines(contentOf(PRIVATE_KEY_PEM));
     }
 
     @Test
@@ -186,7 +188,7 @@ public void testWritePublicKeyPEM() throws Exception {
         PEMEncodable pemEnc = PEMEncodable.read(PUBLIC_KEY_PEM);
         pemEnc.write(pemFileNew);
 
-        assertEquals(FileUtils.readFileToString(PUBLIC_KEY_PEM), FileUtils.readFileToString(pemFileNew));
+        assertThat(contentOf(pemFileNew)).isEqualToNormalizingNewlines(contentOf(PUBLIC_KEY_PEM));
     }
 
     @Test
@@ -196,7 +198,7 @@ public void testWritePrivateKeyPEM() throws Exception {
         PEMEncodable pemEnc = PEMEncodable.read(PRIVATE_KEY_PEM);
         pemEnc.write(pemFileNew);
 
-        assertEquals(FileUtils.readFileToString(PRIVATE_KEY_PEM), FileUtils.readFileToString(pemFileNew));
+        assertThat(contentOf(pemFileNew)).isEqualToNormalizingNewlines(contentOf(PRIVATE_KEY_PEM));
     }
 
     @Test
@@ -206,7 +208,7 @@ public void testWriteCertificatePEM() throws Exception {
         PEMEncodable pemEnc = PEMEncodable.read(CERTIFICATE_PW_PEM);
         pemEnc.write(pemFileNew);
 
-        assertEquals(FileUtils.readFileToString(CERTIFICATE_PW_PEM), FileUtils.readFileToString(pemFileNew));
+        assertThat(contentOf(pemFileNew)).isEqualToNormalizingNewlines(contentOf(CERTIFICATE_PW_PEM));
     }
 
     @Test
@@ -216,7 +218,7 @@ public void testCreationFromObjectPublicKeyPEM() throws Exception {
         PEMEncodable pemEnc = PEMEncodable.read(PUBLIC_KEY_PEM);
         PEMEncodable.create(pemEnc.toPublicKey()).write(pemFileNew);
 
-        assertEquals(FileUtils.readFileToString(PUBLIC_KEY_PEM), FileUtils.readFileToString(pemFileNew));
+        assertThat(contentOf(pemFileNew)).isEqualToNormalizingNewlines(contentOf(PUBLIC_KEY_PEM));
     }
 
     @Test
@@ -226,7 +228,7 @@ public void testCreationFromObjectPrivateKeyPEM() throws Exception {
         PEMEncodable pemEnc = PEMEncodable.read(PRIVATE_KEY_PEM);
         PEMEncodable.create(pemEnc.toKeyPair()).write(pemFileNew);
 
-        assertEquals(FileUtils.readFileToString(PRIVATE_KEY_PEM), FileUtils.readFileToString(pemFileNew));
+        assertThat(contentOf(pemFileNew)).isEqualToNormalizingNewlines(contentOf(PRIVATE_KEY_PEM));
     }