commit e42988ec0e236a23c1b7b6aedd5b2126f343f024
author Philipp Hancke <phancke@meta.com> Wed Jan 22 21:10:13 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Feb 10 10:20:28 2025
tree 66cf6a3b6ef52eee2e93d4c3fab73438da32f5e7
parent bf1ada27307a039782a2532bc3f0fd38c768a20c

java: switch order of assertEquals arguments for consistency

to unbreak the Chromium roll which bails out on
  ../../sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java:78: warning: [AssertEqualsArgumentOrderChecker] Arguments are swapped in assertEquals-like call
assertEquals(rgbaBuffer.remaining() % 4, 0);

BUG=None

Change-Id: I437de037ad45fb6779a03bde3851088ed81e1943
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/375023
Reviewed-by: Guido Urdaneta <guidou@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43862}

sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java

diff --git a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
index a9d9d7b..7a5674a 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
@@ -75,7 +75,7 @@
   // 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 @@
         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);
       }
     }
 

sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java

diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
index 47d6f08..f097df2 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
@@ -810,10 +810,10 @@
     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 @@
     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 @@
     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 @@
     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.