Fix test: assert Rect instead of RectF
The failure is caused by float number rounding error.
Bug: 155166312
Test: manual test and ./gradlew bOS
Change-Id: I3a7269e24b20d63757366b9db0d7d10413105afb
diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/CameraXTest.java b/camera/camera-core/src/androidTest/java/androidx/camera/core/CameraXTest.java
index 927876d..864834f 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/CameraXTest.java
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/CameraXTest.java
@@ -227,38 +227,44 @@
@Test
public void viewPortRectFillCenter() {
- assertThat(getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FILL_CENTER))
- .isEqualTo(new RectF(15, 10, 45, 40));
+ Rect expectedRect = new Rect();
+ getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FILL_CENTER).round(expectedRect);
+ assertThat(expectedRect).isEqualTo(new Rect(15, 10, 45, 40));
}
@Test
public void getScaledRectFillStart() {
- assertThat(getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FILL_START))
- .isEqualTo(new RectF(10, 10, 40, 40));
+ Rect expectedRect = new Rect();
+ getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FILL_START).round(expectedRect);
+ assertThat(expectedRect).isEqualTo(new Rect(10, 10, 40, 40));
}
@Test
public void getScaledRectFillEnd() {
- assertThat(getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FILL_END))
- .isEqualTo(new RectF(20, 10, 50, 40));
+ Rect expectedRect = new Rect();
+ getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FILL_END).round(expectedRect);
+ assertThat(expectedRect).isEqualTo(new Rect(20, 10, 50, 40));
}
@Test
public void getScaledRectFitCenter() {
- assertThat(getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FIT_CENTER))
- .isEqualTo(new RectF(10, 5, 50, 45));
+ Rect expectedRect = new Rect();
+ getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FIT_CENTER).round(expectedRect);
+ assertThat(expectedRect).isEqualTo(new Rect(10, 5, 50, 45));
}
@Test
public void getScaledRectFitStart() {
- assertThat(getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FIT_START))
- .isEqualTo(new RectF(10, 10, 50, 50));
+ Rect expectedRect = new Rect();
+ getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FIT_START).round(expectedRect);
+ assertThat(expectedRect).isEqualTo(new Rect(10, 10, 50, 50));
}
@Test
public void getScaledRectFitEnd() {
- assertThat(getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FIT_END))
- .isEqualTo(new RectF(10, 0, 50, 40));
+ Rect expectedRect = new Rect();
+ getScaledRect(CONTAINER_RECT, FIT_ASPECT_RATIO, ViewPort.FIT_END).round(expectedRect);
+ assertThat(expectedRect).isEqualTo(new Rect(10, 0, 50, 40));
}
@Test