diff options
| author | Igor Murashkin <iam@google.com> | 2014-04-01 15:50:48 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2014-04-01 15:50:48 -0700 |
| commit | 5c207ec9a080f3be8ca28de8310483fe1c182c51 (patch) | |
| tree | 449ef9f5b031a2fb63a4e7d77d9e4cc3804df97d /media/tests | |
| parent | 47bbaea4c3f5dee97f2e1c56c6cc9957efa17eaf (diff) | |
| download | frameworks_base-5c207ec9a080f3be8ca28de8310483fe1c182c51.zip frameworks_base-5c207ec9a080f3be8ca28de8310483fe1c182c51.tar.gz frameworks_base-5c207ec9a080f3be8ca28de8310483fe1c182c51.tar.bz2 | |
camera2: Fix out-of-date metadata test
* The tag android.sensor.calibrationTransform1 was renamed
to android.sensor.calibrationTransform (1 removed)
Bug: 12002757
Change-Id: Ida0e37a30222f08d0d9bb3871717c74c21e428ac
Diffstat (limited to 'media/tests')
2 files changed, 4 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index 43ebef4..5f3ba74 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -140,7 +140,9 @@ public class CameraDeviceBinderTest extends AndroidTestCase { private int submitCameraRequest(CaptureRequest request, boolean streaming) throws Exception { int requestId = mCameraUser.submitRequest(request, streaming); - assertTrue("Request IDs should be non-negative", requestId >= 0); + assertTrue( + "Request IDs should be non-negative (expected: >= 0, actual: " + requestId + ")", + requestId >= 0); return requestId; } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java index 3f17aa9..26498ca 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java @@ -309,7 +309,7 @@ public class CameraMetadataTest extends junit.framework.TestCase { }); // rational (n) -- in particular rational x 9 - checkKeyGetAndSetArray("android.sensor.calibrationTransform1", Rational[].class, + checkKeyGetAndSetArray("android.sensor.calibrationTransform", Rational[].class, new Rational[] { new Rational(1, 2), new Rational(3, 4), new Rational(5, 6), new Rational(7, 8), new Rational(9, 10), new Rational(10, 11), |