Chromium Code Reviews| Index: webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java |
| diff --git a/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java b/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java |
| index cff3a8cab8b241f5372e6d5c7ab8dc18650af465..0717fae36bd6157e49693f8fb17b7f2d98bf4556 100644 |
| --- a/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java |
| +++ b/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java |
| @@ -95,11 +95,8 @@ public final class RendererCommonTest extends ActivityTestCase { |
| // Assert: |
| // u' = u. |
| // v' = v. |
| - MoreAsserts.assertEquals(new double[] { |
| - 1, 0, 0, 0, |
| - 0, 1, 0, 0, |
| - 0, 0, 1, 0, |
| - 0, 0, 0, 1}, round(layoutMatrix)); |
| + MoreAsserts.assertEquals( |
|
magjed_webrtc
2016/09/28 13:45:05
revert.
|
| + new double[] {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}, round(layoutMatrix)); |
| } |
| @SmallTest |
| @@ -108,11 +105,8 @@ public final class RendererCommonTest extends ActivityTestCase { |
| // Assert: |
| // u' = 1 - u. |
| // v' = v. |
| - MoreAsserts.assertEquals(new double[] { |
| - -1, 0, 0, 0, |
| - 0, 1, 0, 0, |
| - 0, 0, 1, 0, |
| - 1, 0, 0, 1}, round(layoutMatrix)); |
| + MoreAsserts.assertEquals( |
| + new double[] {-1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1}, round(layoutMatrix)); |
| } |
| @SmallTest |
| @@ -123,22 +117,14 @@ public final class RendererCommonTest extends ActivityTestCase { |
| // Assert: |
| // u' = 0.25 + 0.5 u. |
| // v' = v. |
| - MoreAsserts.assertEquals(new double[] { |
| - 0.5, 0, 0, 0, |
| - 0, 1, 0, 0, |
| - 0, 0, 1, 0, |
| - 0.25, 0, 0, 1}, round(layoutMatrix)); |
| + MoreAsserts.assertEquals( |
| + new double[] {0.5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.25, 0, 0, 1}, round(layoutMatrix)); |
| } |
| @SmallTest |
| public static void testRotateTextureMatrixDefault() { |
| // Test that rotation with 0 degrees returns an identical matrix. |
| - final float[] matrix = new float[] { |
| - 1, 2, 3, 4, |
| - 5, 6, 7, 8, |
| - 9, 0, 1, 2, |
| - 3, 4, 5, 6 |
| - }; |
| + final float[] matrix = new float[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6}; |
| final float rotatedMatrix[] = rotateTextureMatrix(matrix, 0); |
| MoreAsserts.assertEquals(round(matrix), round(rotatedMatrix)); |
| } |
| @@ -149,11 +135,8 @@ public final class RendererCommonTest extends ActivityTestCase { |
| // Assert: |
| // u' = 1 - v. |
| // v' = u. |
| - MoreAsserts.assertEquals(new double[] { |
| - 0, 1, 0, 0, |
| - -1, 0, 0, 0, |
| - 0, 0, 1, 0, |
| - 1, 0, 0, 1}, round(samplingMatrix)); |
| + MoreAsserts.assertEquals( |
| + new double[] {0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1}, round(samplingMatrix)); |
| } |
| @SmallTest |
| @@ -162,10 +145,7 @@ public final class RendererCommonTest extends ActivityTestCase { |
| // Assert: |
| // u' = 1 - u. |
| // v' = 1 - v. |
| - MoreAsserts.assertEquals(new double[] { |
| - -1, 0, 0, 0, |
| - 0, -1, 0, 0, |
| - 0, 0, 1, 0, |
| - 1, 1, 0, 1}, round(samplingMatrix)); |
| + MoreAsserts.assertEquals( |
| + new double[] {-1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1}, round(samplingMatrix)); |
| } |
| } |