fix/test: Argument order in assertions

Author: spryslmatej

compiler/src/test/java/org/capnproto/test/EncodingTest.java

@@ -36,15 +36,15 @@ public void testEmptyArray() throws java.io.IOException {
 
     // read() should return -1 at the end of the stream
     // https://docs.oracle.com/javase/7/docs/api/java/nio/channels/ReadableByteChannel.html
-    assertEquals(stream.read(dst), -1);
+    assertEquals(-1, stream.read(dst));
   }
 
   @Test
   public void testRequestMoreBytesThanArePresent() throws java.io.IOException {
     byte[] oneByte = new byte[]{42};
     ArrayInputStream stream = new ArrayInputStream(ByteBuffer.wrap(oneByte));
     ByteBuffer dst = ByteBuffer.allocate(10);
-    assertEquals(stream.read(dst), 1);
-    assertEquals(stream.read(dst), -1); // end of stream
+    assertEquals(1, stream.read(dst));
+    assertEquals(-1, stream.read(dst)); // end of stream
   }
 }

compiler/src/test/java/org/capnproto/test/TestUtil.java

@@ -9,8 +9,7 @@ public class DefaultAllocatorTest {
     @Test
     public void maxSegmentBytes() {
       DefaultAllocator allocator = new DefaultAllocator();
-      assertEquals(allocator.allocationStrategy,
-                          BuilderArena.AllocationStrategy.GROW_HEURISTICALLY);
+      assertEquals(BuilderArena.AllocationStrategy.GROW_HEURISTICALLY, allocator.allocationStrategy);
       allocator.maxSegmentBytes = (1 << 25) - 1;
 
       int allocationSize = 1 << 24;

runtime/src/test/java/org/capnproto/ArrayInputStreamTest.java

@@ -33,40 +33,40 @@ public void testSimpleRawDataStruct() {
 
         StructReader reader = WireHelpers.readStructPointer(new BareStructReader(), arena.tryGetSegment(0), 0, null, 0, MAX_NESTING_LIMIT);
 
-        assertEquals(reader._getLongField(0), 0xefcdab8967452301L);
-        assertEquals(reader._getLongField(1), 0L);
-
-        assertEquals(reader._getIntField(0), 0x67452301);
-        assertEquals(reader._getIntField(1), 0xefcdab89);
-        assertEquals(reader._getIntField(2), 0);
-
-        assertEquals(reader._getShortField(0), (short)0x2301);
-        assertEquals(reader._getShortField(1), (short)0x6745);
-        assertEquals(reader._getShortField(2), (short)0xab89);
-        assertEquals(reader._getShortField(3), (short)0xefcd);
-        assertEquals(reader._getShortField(4), (short)0);
-
-        assertEquals(reader._getBooleanField(0), true);
-        assertEquals(reader._getBooleanField(1), false);
-        assertEquals(reader._getBooleanField(2), false);
-
-        assertEquals(reader._getBooleanField(3), false);
-        assertEquals(reader._getBooleanField(4), false);
-        assertEquals(reader._getBooleanField(5), false);
-        assertEquals(reader._getBooleanField(6), false);
-        assertEquals(reader._getBooleanField(7), false);
-
-        assertEquals(reader._getBooleanField(8), true);
-        assertEquals(reader._getBooleanField(9), true);
-        assertEquals(reader._getBooleanField(10), false);
-        assertEquals(reader._getBooleanField(11), false);
-        assertEquals(reader._getBooleanField(12), false);
-        assertEquals(reader._getBooleanField(13), true);
-        assertEquals(reader._getBooleanField(14), false);
-        assertEquals(reader._getBooleanField(15), false);
-
-        assertEquals(reader._getBooleanField(63), true);
-        assertEquals(reader._getBooleanField(64), false);
+        assertEquals(0xefcdab8967452301L, reader._getLongField(0));
+        assertEquals(0L, reader._getLongField(1));
+
+        assertEquals(0x67452301, reader._getIntField(0));
+        assertEquals(0xefcdab89, reader._getIntField(1));
+        assertEquals(0, reader._getIntField(2));
+
+        assertEquals((short)0x2301, reader._getShortField(0));
+        assertEquals((short)0x6745, reader._getShortField(1));
+        assertEquals((short)0xab89, reader._getShortField(2));
+        assertEquals((short)0xefcd, reader._getShortField(3));
+        assertEquals((short)0, reader._getShortField(4));
+
+        assertEquals(true, reader._getBooleanField(0));
+        assertEquals(false, reader._getBooleanField(1));
+        assertEquals(false, reader._getBooleanField(2));
+
+        assertEquals(false, reader._getBooleanField(3));
+        assertEquals(false, reader._getBooleanField(4));
+        assertEquals(false, reader._getBooleanField(5));
+        assertEquals(false, reader._getBooleanField(6));
+        assertEquals(false, reader._getBooleanField(7));
+
+        assertEquals(true, reader._getBooleanField(8));
+        assertEquals(true, reader._getBooleanField(9));
+        assertEquals(false, reader._getBooleanField(10));
+        assertEquals(false, reader._getBooleanField(11));
+        assertEquals(false, reader._getBooleanField(12));
+        assertEquals(true, reader._getBooleanField(13));
+        assertEquals(false, reader._getBooleanField(14));
+        assertEquals(false, reader._getBooleanField(15));
+
+        assertEquals(true, reader._getBooleanField(63));
+        assertEquals(false, reader._getBooleanField(64));
     }
 
     /**

runtime/src/test/java/org/capnproto/DefaultAllocatorTest.java

@@ -15,21 +15,21 @@ public class SegmentReaderTest {
     public void in_boundsCalculationShouldNotOverflow() {
         ByteBuffer byteBuffer = ByteBuffer.allocate(64);
         SegmentReader segmentReader = new SegmentReader(byteBuffer, null);
-        assertEquals(segmentReader.isInBounds(0, Integer.MAX_VALUE), false);
+        assertEquals(false, segmentReader.isInBounds(0, Integer.MAX_VALUE));
     }
 
     @Test
     public void oneWordAtLastWordShouldBeInBounds() {
         ByteBuffer byteBuffer = ByteBuffer.allocate(64);
         SegmentReader segmentReader = new SegmentReader(byteBuffer, null);
-        assertEquals(segmentReader.isInBounds(7, 1), true);
+        assertEquals(true, segmentReader.isInBounds(7, 1));
     }
 
     @Test
     public void twoWordsAtLastWordShouldNotBeInBounds() {
         ByteBuffer byteBuffer = ByteBuffer.allocate(64);
         SegmentReader segmentReader = new SegmentReader(byteBuffer, null);
-        assertEquals(segmentReader.isInBounds(7, 2), false);
+        assertEquals(false, segmentReader.isInBounds(7, 2));
     }
 
     @Test
@@ -78,15 +78,15 @@ public void validSegmentWithNegativeOffsetShouldBeInBounds() {
         refTarget = WirePointer.target(refOffset, ref);
         dataSizeWords = StructPointer.dataSize(ref);
         wordSize = dataSizeWords + StructPointer.ptrCount(ref);
-        assertEquals(segment.isInBounds(refTarget, wordSize), true);
+        assertEquals(true, segment.isInBounds(refTarget, wordSize));
 
         /* Read inner Struct: ComObject. */
         refOffset = refTarget + dataSizeWords; /* At the inner STRUCT POINTER */
         ref = segment.get(refOffset);
         refTarget = WirePointer.target(refOffset, ref);
         dataSizeWords = StructPointer.dataSize(ref);
         wordSize = dataSizeWords + StructPointer.ptrCount(ref);
-        assertEquals(segment.isInBounds(refTarget, wordSize), true);
+        assertEquals(true, segment.isInBounds(refTarget, wordSize));
     }
 
 }