Compare arrays directly to appease weird JDKs?

jchambers · Mar 2, 2024 · 508704f · 508704f
1 parent 68995f0
commit 508704f
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/test/java/com/eatthepath/noise/NoiseHandshakeTest.java b/src/test/java/com/eatthepath/noise/NoiseHandshakeTest.java
@@ -285,12 +285,12 @@ private void testOneWayHandshakeWithNewByteBuffer(final CacophonyTestVector test
     for (final TestMessage message : testVector.messages()) {
       if (transportWriter != null) {
         // We've finished the handshake and the test messages are now transport messages
-        assertEquals(ByteBuffer.wrap(message.ciphertext()), transportWriter.writeMessage(ByteBuffer.wrap(message.payload())));
-        assertEquals(ByteBuffer.wrap(message.payload()), transportReader.readMessage(ByteBuffer.wrap(message.ciphertext())));
+        assertArrayEquals(message.ciphertext(), transportWriter.writeMessage(ByteBuffer.wrap(message.payload())).array());
+        assertArrayEquals(message.payload(), transportReader.readMessage(ByteBuffer.wrap(message.ciphertext())).array());
       } else {
         // The handshake isn't done and more handshake messages are expected
-        assertEquals(ByteBuffer.wrap(message.ciphertext()), handshakePair.initiatorHandshake().writeMessage(ByteBuffer.wrap(message.payload())));
-        assertEquals(ByteBuffer.wrap(message.payload()), handshakePair.responderHandshake().readMessage(ByteBuffer.wrap(message.ciphertext())));
+        assertArrayEquals(message.ciphertext(), handshakePair.initiatorHandshake().writeMessage(ByteBuffer.wrap(message.payload())).array());
+        assertArrayEquals(message.payload(), handshakePair.responderHandshake().readMessage(ByteBuffer.wrap(message.ciphertext())).array());
       }
 
       if (handshakePair.initiatorHandshake().isDone() && transportWriter == null) {
@@ -318,14 +318,14 @@ private void testInteractiveHandshakeWithNewByteBuffer(final CacophonyTestVector
 
       if (senderTransport != null && receiverTransport != null) {
         // This is a transport message, not a handshake message
-        assertEquals(ByteBuffer.wrap(testMessage.ciphertext()), senderTransport.writeMessage(ByteBuffer.wrap(testMessage.payload())));
-        assertEquals(ByteBuffer.wrap(testMessage.payload()), receiverTransport.readMessage(ByteBuffer.wrap(testMessage.ciphertext())));
+        assertArrayEquals(testMessage.ciphertext(), senderTransport.writeMessage(ByteBuffer.wrap(testMessage.payload())).array());
+        assertArrayEquals(testMessage.payload(), receiverTransport.readMessage(ByteBuffer.wrap(testMessage.ciphertext())).array());
       } else {
         assertTrue(senderHandshake.isExpectingWrite());
         assertTrue(receiverHandshake.isExpectingRead());
 
-        assertEquals(ByteBuffer.wrap(testMessage.ciphertext()), senderHandshake.writeMessage(ByteBuffer.wrap(testMessage.payload())));
-        assertEquals(ByteBuffer.wrap(testMessage.payload()), receiverHandshake.readMessage(ByteBuffer.wrap(testMessage.ciphertext())));
+        assertArrayEquals(testMessage.ciphertext(), senderHandshake.writeMessage(ByteBuffer.wrap(testMessage.payload())).array());
+        assertArrayEquals(testMessage.payload(), receiverHandshake.readMessage(ByteBuffer.wrap(testMessage.ciphertext())).array());
       }
 
       if (handshakePair.initiatorHandshake().isDone() && initiatorTransport == null) {
@@ -513,7 +513,7 @@ void fallbackTestsWithNewByteBuffer(final NoiseCFallbackTestVector testVector) t
     {
       final TestMessage ikMessage = testVector.messages().get(0);
 
-      assertEquals(ByteBuffer.wrap(ikMessage.ciphertext()), ikInitiatorHandshake.writeMessage(ByteBuffer.wrap(ikMessage.payload())));
+      assertArrayEquals(ikMessage.ciphertext(), ikInitiatorHandshake.writeMessage(ByteBuffer.wrap(ikMessage.payload())).array());
       assertThrows(AEADBadTagException.class, () -> ikResponderHandshake.readMessage(ByteBuffer.wrap(ikMessage.ciphertext())));
     }
 
@@ -524,12 +524,12 @@ void fallbackTestsWithNewByteBuffer(final NoiseCFallbackTestVector testVector) t
     {
       final TestMessage xxFallbackMessage = testVector.messages().get(1);
 
-      assertEquals(ByteBuffer.wrap(xxFallbackMessage.ciphertext()), xxFallbackResponderHandshake.writeMessage(ByteBuffer.wrap(xxFallbackMessage.payload())));
+      assertArrayEquals(xxFallbackMessage.ciphertext(), xxFallbackResponderHandshake.writeMessage(ByteBuffer.wrap(xxFallbackMessage.payload())).array());
       assertThrows(AEADBadTagException.class, () -> ikInitiatorHandshake.readMessage(ByteBuffer.wrap(xxFallbackMessage.ciphertext())));
 
       xxFallbackInitiatorHandshake = ikInitiatorHandshake.fallbackTo("XXfallback");
       assertTrue(xxFallbackInitiatorHandshake.isExpectingRead());
-      assertEquals(ByteBuffer.wrap(xxFallbackMessage.payload()), xxFallbackInitiatorHandshake.readMessage(ByteBuffer.wrap(xxFallbackMessage.ciphertext())));
+      assertArrayEquals(xxFallbackMessage.payload(), xxFallbackInitiatorHandshake.readMessage(ByteBuffer.wrap(xxFallbackMessage.ciphertext())).array());
     }
 
     @Nullable NoiseTransport initiatorTransport = null;
@@ -549,14 +549,14 @@ void fallbackTestsWithNewByteBuffer(final NoiseCFallbackTestVector testVector) t
 
       if (senderTransport != null && receiverTransport != null) {
         // This is a transport message, not a handshake message
-        assertEquals(ByteBuffer.wrap(testMessage.ciphertext()), senderTransport.writeMessage(ByteBuffer.wrap(testMessage.payload())));
-        assertEquals(ByteBuffer.wrap(testMessage.payload()), receiverTransport.readMessage(ByteBuffer.wrap(testMessage.ciphertext())));
+        assertArrayEquals(testMessage.ciphertext(), senderTransport.writeMessage(ByteBuffer.wrap(testMessage.payload())).array());
+        assertArrayEquals(testMessage.payload(), receiverTransport.readMessage(ByteBuffer.wrap(testMessage.ciphertext())).array());
       } else {
         assertTrue(senderHandshake.isExpectingWrite());
         assertTrue(receiverHandshake.isExpectingRead());
 
-        assertEquals(ByteBuffer.wrap(testMessage.ciphertext()), senderHandshake.writeMessage(ByteBuffer.wrap(testMessage.payload())));
-        assertEquals(ByteBuffer.wrap(testMessage.payload()), receiverHandshake.readMessage(ByteBuffer.wrap(testMessage.ciphertext())));
+        assertArrayEquals(testMessage.ciphertext(), senderHandshake.writeMessage(ByteBuffer.wrap(testMessage.payload())).array());
+        assertArrayEquals(testMessage.payload(), receiverHandshake.readMessage(ByteBuffer.wrap(testMessage.ciphertext())).array());
       }
 
       if (xxFallbackInitiatorHandshake.isDone() && initiatorTransport == null) {