Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Fix errorprone error (duplicated expression in condition)

This commit is contained in:
Jiri Danek 2018-11-22 22:52:45 +01:00 committed by Justin Bertram
parent 4231d660c1
commit 94c158ebee
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
View File

@ -17,6 +17,7 @@
package org.apache.activemq.artemis.protocol.amqp.broker; package org.apache.activemq.artemis.protocol.amqp.broker;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
@ -1465,7 +1466,7 @@ public class AMQPMessageTest {
AMQPMessage readMessage = (AMQPMessage)decoded.getPersister().decode(buffer, null); AMQPMessage readMessage = (AMQPMessage)decoded.getPersister().decode(buffer, null);
Assert.assertEquals(33, readMessage.getMessageID()); Assert.assertEquals(33, readMessage.getMessageID());
Assert.assertEquals("someAddress", readMessage.getAddress()); Assert.assertEquals("someAddress", readMessage.getAddress());
Assert.assertArrayEquals(original, readMessage.getExtraBytesProperty(name)); assertArrayEquals(original, readMessage.getExtraBytesProperty(name));
} finally { } finally {
buffer.release(); buffer.release();
} }
@ -1475,7 +1476,7 @@ public class AMQPMessageTest {
AMQPMessage readMessage = (AMQPMessage) EmbedMessageUtil.extractEmbedded(embeddedMessage); AMQPMessage readMessage = (AMQPMessage) EmbedMessageUtil.extractEmbedded(embeddedMessage);
Assert.assertEquals(33, readMessage.getMessageID()); Assert.assertEquals(33, readMessage.getMessageID());
Assert.assertEquals("someAddress", readMessage.getAddress()); Assert.assertEquals("someAddress", readMessage.getAddress());
Assert.assertArrayEquals(original, readMessage.getExtraBytesProperty(name)); assertArrayEquals(original, readMessage.getExtraBytesProperty(name));
} }
} }
@ -2231,14 +2232,14 @@ public class AMQPMessageTest {
byte[] leftArray = leftValue.getValue().getArray(); byte[] leftArray = leftValue.getValue().getArray();
byte[] rightArray = rightValue.getValue().getArray(); byte[] rightArray = rightValue.getValue().getArray();
if (leftArray == null && leftArray == null) { if (leftArray == null && rightArray == null) {
return true; return true;
} }
if (!isNullnessEquals(leftArray, rightArray)) { if (!isNullnessEquals(leftArray, rightArray)) {
return false; return false;
} }
assertTrue(Arrays.equals(leftArray, rightArray)); assertArrayEquals(leftArray, rightArray);
} else { } else {
return false; return false;
} }