From f1f4f8ed508339ae5d565f48b4a0bf006b0dad0b Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Fri, 8 Oct 2021 00:55:32 -0700 Subject: [PATCH] Fix DisplayWhiteBalanceTintControllerTest Bug: 202417127 Test: atest FrameworksMockingServicesTests:DisplayWhiteBalanceTintControllerTest Change-Id: Ic2f2b0f722eeb6a285bf329f6f78d5aade4856e9 --- .../color/DisplayWhiteBalanceTintControllerTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java index b9551999cacb3..bc9e9bb9bce85 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java @@ -38,7 +38,6 @@ import com.android.internal.R; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -191,7 +190,6 @@ public class DisplayWhiteBalanceTintControllerTest { * Matrix should match the precalculated one for given cct and display primaries. */ @Test - @Ignore public void displayWhiteBalance_validateTransformMatrix() { DisplayPrimaries displayPrimaries = new DisplayPrimaries(); displayPrimaries.red = new CieXyz(); @@ -226,12 +224,12 @@ public class DisplayWhiteBalanceTintControllerTest { float[] matrixDwb = mDisplayWhiteBalanceTintController.getMatrix(); final float[] expectedMatrixDwb = { - 0.962880f, -0.001780f, -0.000158f, 0.0f, - 0.035765f, 0.929988f, 0.000858f, 0.0f, - 0.001354f, -0.000470f, 0.948327f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f + 0.971848f, -0.001421f, 0.000491f, 0.0f, + 0.028193f, 0.945798f, 0.003207f, 0.0f, + -0.000042f, -0.000989f, 0.988659f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f }; - assertArrayEquals("Unexpected DWB matrix", matrixDwb, expectedMatrixDwb, + assertArrayEquals("Unexpected DWB matrix", expectedMatrixDwb, matrixDwb, 1e-6f /* tolerance */); }