admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java: switch order of assertEquals arguments for consistency

Browse Source 
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}
This commit is contained in:
Philipp Hancke 2025-01-22 13:10:13 -08:00 committed by WebRTC LUCI CQ
parent bf1ada2730
commit e42988ec0e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java
View File

@ -75,7 +75,7 @@ public class GlRectDrawerTest {
// Convert RGBA ByteBuffer to RGB ByteBuffer. // Convert RGBA ByteBuffer to RGB ByteBuffer.
private static ByteBuffer stripAlphaChannel(ByteBuffer rgbaBuffer) { private static ByteBuffer stripAlphaChannel(ByteBuffer rgbaBuffer) {
rgbaBuffer.rewind(); rgbaBuffer.rewind();
assertEquals(rgbaBuffer.remaining() % 4, 0); assertEquals(0, rgbaBuffer.remaining() % 4);
final int numberOfPixels = rgbaBuffer.remaining() / 4; final int numberOfPixels = rgbaBuffer.remaining() / 4;
final ByteBuffer rgbBuffer = ByteBuffer.allocateDirect(numberOfPixels * 3); final ByteBuffer rgbBuffer = ByteBuffer.allocateDirect(numberOfPixels * 3);
while (rgbaBuffer.hasRemaining()) { while (rgbaBuffer.hasRemaining()) {
@ -199,7 +199,7 @@ public class GlRectDrawerTest {
assertTrue(Math.abs(actualRed - expectedRed) < MAX_DIFF); assertTrue(Math.abs(actualRed - expectedRed) < MAX_DIFF);
assertTrue(Math.abs(actualGreen - expectedGreen) < MAX_DIFF); assertTrue(Math.abs(actualGreen - expectedGreen) < MAX_DIFF);
assertTrue(Math.abs(actualBlue - expectedBlue) < MAX_DIFF); assertTrue(Math.abs(actualBlue - expectedBlue) < MAX_DIFF);
assertEquals(actualAlpha, 255); assertEquals(255, actualAlpha);
} }
} }

20
sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
View File

@ -810,10 +810,10 @@ public class PeerConnectionEndToEndTest {
assertEquals(answeringPC.getLocalDescription().type, answerSdp.type); assertEquals(answeringPC.getLocalDescription().type, answerSdp.type);
assertEquals(answeringPC.getRemoteDescription().type, offerSdp.type); assertEquals(answeringPC.getRemoteDescription().type, offerSdp.type);
assertEquals(offeringPC.getSenders().size(), 2); assertEquals(2, offeringPC.getSenders().size());
assertEquals(offeringPC.getReceivers().size(), 2); assertEquals(2, offeringPC.getReceivers().size());
assertEquals(answeringPC.getSenders().size(), 2); assertEquals(2, answeringPC.getSenders().size());
assertEquals(answeringPC.getReceivers().size(), 2); assertEquals(2, answeringPC.getReceivers().size());
offeringExpectations.expectFirstPacketReceived(); offeringExpectations.expectFirstPacketReceived();
answeringExpectations.expectFirstPacketReceived(); answeringExpectations.expectFirstPacketReceived();
@ -1461,8 +1461,8 @@ public class PeerConnectionEndToEndTest {
assertTrue(sdpLatch.await()); assertTrue(sdpLatch.await());
// Sanity check that we get one remote stream with one audio track. // Sanity check that we get one remote stream with one audio track.
MediaStream remoteStream = expectations.gotRemoteStreams.iterator().next(); MediaStream remoteStream = expectations.gotRemoteStreams.iterator().next();
assertEquals(remoteStream.audioTracks.size(), 1); assertEquals(1, remoteStream.audioTracks.size());
assertEquals(remoteStream.videoTracks.size(), 0); assertEquals(0, remoteStream.videoTracks.size());
// Add a video track... // Add a video track...
final CameraEnumerator enumerator = new Camera1Enumerator(false /* captureToTexture */); final CameraEnumerator enumerator = new Camera1Enumerator(false /* captureToTexture */);
@ -1488,8 +1488,8 @@ public class PeerConnectionEndToEndTest {
pcUnderTest.setRemoteDescription(sdpLatch, offerSdp); pcUnderTest.setRemoteDescription(sdpLatch, offerSdp);
assertTrue(sdpLatch.await()); assertTrue(sdpLatch.await());
// The remote stream should now have a video track. // The remote stream should now have a video track.
assertEquals(remoteStream.audioTracks.size(), 1); assertEquals(1, remoteStream.audioTracks.size());
assertEquals(remoteStream.videoTracks.size(), 1); assertEquals(1, remoteStream.videoTracks.size());
// Finally, create another offer with the audio track removed. // Finally, create another offer with the audio track removed.
offeringExpectations.expectRenegotiationNeeded(); offeringExpectations.expectRenegotiationNeeded();
@ -1506,8 +1506,8 @@ public class PeerConnectionEndToEndTest {
pcUnderTest.setRemoteDescription(sdpLatch, offerSdp); pcUnderTest.setRemoteDescription(sdpLatch, offerSdp);
assertTrue(sdpLatch.await()); assertTrue(sdpLatch.await());
// The remote stream should no longer have an audio track. // The remote stream should no longer have an audio track.
assertEquals(remoteStream.audioTracks.size(), 0); assertEquals(0, remoteStream.audioTracks.size());
assertEquals(remoteStream.videoTracks.size(), 1); assertEquals(1, remoteStream.videoTracks.size());
// Free the Java-land objects. Video capturer and source aren't owned by // Free the Java-land objects. Video capturer and source aren't owned by
// the PeerConnection and need to be disposed separately. // the PeerConnection and need to be disposed separately.