diff --git a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java index a9d9d7be6e..7a5674a3bf 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java @@ -75,7 +75,7 @@ public class GlRectDrawerTest { // Convert RGBA ByteBuffer to RGB ByteBuffer. private static ByteBuffer stripAlphaChannel(ByteBuffer rgbaBuffer) { rgbaBuffer.rewind(); - assertEquals(rgbaBuffer.remaining() % 4, 0); + assertEquals(0, rgbaBuffer.remaining() % 4); final int numberOfPixels = rgbaBuffer.remaining() / 4; final ByteBuffer rgbBuffer = ByteBuffer.allocateDirect(numberOfPixels * 3); while (rgbaBuffer.hasRemaining()) { @@ -199,7 +199,7 @@ public class GlRectDrawerTest { assertTrue(Math.abs(actualRed - expectedRed) < MAX_DIFF); assertTrue(Math.abs(actualGreen - expectedGreen) < MAX_DIFF); assertTrue(Math.abs(actualBlue - expectedBlue) < MAX_DIFF); - assertEquals(actualAlpha, 255); + assertEquals(255, actualAlpha); } } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java index 47d6f089a6..f097df23b7 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java @@ -810,10 +810,10 @@ public class PeerConnectionEndToEndTest { assertEquals(answeringPC.getLocalDescription().type, answerSdp.type); assertEquals(answeringPC.getRemoteDescription().type, offerSdp.type); - assertEquals(offeringPC.getSenders().size(), 2); - assertEquals(offeringPC.getReceivers().size(), 2); - assertEquals(answeringPC.getSenders().size(), 2); - assertEquals(answeringPC.getReceivers().size(), 2); + assertEquals(2, offeringPC.getSenders().size()); + assertEquals(2, offeringPC.getReceivers().size()); + assertEquals(2, answeringPC.getSenders().size()); + assertEquals(2, answeringPC.getReceivers().size()); offeringExpectations.expectFirstPacketReceived(); answeringExpectations.expectFirstPacketReceived(); @@ -1461,8 +1461,8 @@ public class PeerConnectionEndToEndTest { assertTrue(sdpLatch.await()); // Sanity check that we get one remote stream with one audio track. MediaStream remoteStream = expectations.gotRemoteStreams.iterator().next(); - assertEquals(remoteStream.audioTracks.size(), 1); - assertEquals(remoteStream.videoTracks.size(), 0); + assertEquals(1, remoteStream.audioTracks.size()); + assertEquals(0, remoteStream.videoTracks.size()); // Add a video track... final CameraEnumerator enumerator = new Camera1Enumerator(false /* captureToTexture */); @@ -1488,8 +1488,8 @@ public class PeerConnectionEndToEndTest { pcUnderTest.setRemoteDescription(sdpLatch, offerSdp); assertTrue(sdpLatch.await()); // The remote stream should now have a video track. - assertEquals(remoteStream.audioTracks.size(), 1); - assertEquals(remoteStream.videoTracks.size(), 1); + assertEquals(1, remoteStream.audioTracks.size()); + assertEquals(1, remoteStream.videoTracks.size()); // Finally, create another offer with the audio track removed. offeringExpectations.expectRenegotiationNeeded(); @@ -1506,8 +1506,8 @@ public class PeerConnectionEndToEndTest { pcUnderTest.setRemoteDescription(sdpLatch, offerSdp); assertTrue(sdpLatch.await()); // The remote stream should no longer have an audio track. - assertEquals(remoteStream.audioTracks.size(), 0); - assertEquals(remoteStream.videoTracks.size(), 1); + assertEquals(0, remoteStream.audioTracks.size()); + assertEquals(1, remoteStream.videoTracks.size()); // Free the Java-land objects. Video capturer and source aren't owned by // the PeerConnection and need to be disposed separately.