diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-17 18:29:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 18:29:35 -0700 |
| commit | 8a658946e9eced055d85f31b27921664c5db914f (patch) | |
| tree | 2e4ee13f9be22643bf9ff0d58c74387eaeb7f5f9 /tests | |
| parent | 0cd89c8c3619fcc3df3fd14ab74a80c14c34878b (diff) | |
| parent | b3ac07c0028b0afe8f9b009e37af90ec9a697b44 (diff) | |
| download | hardware_libhardware-8a658946e9eced055d85f31b27921664c5db914f.zip hardware_libhardware-8a658946e9eced055d85f31b27921664c5db914f.tar.gz hardware_libhardware-8a658946e9eced055d85f31b27921664c5db914f.tar.bz2 | |
am b3ac07c0: Camera2 Tests: fix some sanity checks
* commit 'b3ac07c0028b0afe8f9b009e37af90ec9a697b44':
Camera2 Tests: fix some sanity checks
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/camera2/CameraMetadataTests.cpp | 12 | ||||
| -rw-r--r-- | tests/camera2/CameraModuleTests.cpp | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/tests/camera2/CameraMetadataTests.cpp b/tests/camera2/CameraMetadataTests.cpp index 2923de9..eddc593 100644 --- a/tests/camera2/CameraMetadataTests.cpp +++ b/tests/camera2/CameraMetadataTests.cpp @@ -136,10 +136,6 @@ TEST_F(CameraMetadataTest, RequiredFormats) { EXPECT_TRUE( HasElementInArrayFromStaticTag(ANDROID_SCALER_AVAILABLE_FORMATS, - HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED)); - - EXPECT_TRUE( - HasElementInArrayFromStaticTag(ANDROID_SCALER_AVAILABLE_FORMATS, HAL_PIXEL_FORMAT_BLOB)); // JPEG if (getDeviceVersion() < CAMERA_DEVICE_API_VERSION_3_0) { @@ -169,9 +165,11 @@ TEST_F(CameraMetadataTest, SaneResolutions) { // Iff there are listed raw resolutions, the format should be available int rawResolutionsCount = GetEntryCountFromStaticTag(ANDROID_SCALER_AVAILABLE_RAW_SIZES); - EXPECT_EQ(rawResolutionsCount > 0, - HasElementInArrayFromStaticTag(ANDROID_SCALER_AVAILABLE_FORMATS, - HAL_PIXEL_FORMAT_RAW_SENSOR)); + if (rawResolutionsCount > 0) { + EXPECT_TRUE( + HasElementInArrayFromStaticTag(ANDROID_SCALER_AVAILABLE_FORMATS, + HAL_PIXEL_FORMAT_RAW_SENSOR)); + } // Required processed sizes. int processedSizeCount = diff --git a/tests/camera2/CameraModuleTests.cpp b/tests/camera2/CameraModuleTests.cpp index e01cea4..9bd65ec 100644 --- a/tests/camera2/CameraModuleTests.cpp +++ b/tests/camera2/CameraModuleTests.cpp @@ -80,9 +80,7 @@ TEST_F(CameraModuleTest, LoadModuleBadIndices) { int idx[] = { -1, mNumberOfCameras, mNumberOfCameras + 1 }; for (unsigned i = 0; i < sizeof(idx)/sizeof(idx[0]); ++i) { - // Since the initialization should fail at device open(), it doesn't - // matter which version of CameraNDevice is used here - mDevice = new Camera2Device(idx[i]); + CreateCamera(idx[i], &mDevice); status_t deviceInitializeCode = initializeDevice(idx[i]); EXPECT_NE(OK, deviceInitializeCode); EXPECT_EQ(-ENODEV, deviceInitializeCode) |