From b5ac45ff29d10bc31b2edd893125f1594b3f6065 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Thu, 7 Aug 2014 16:25:41 -0700 Subject: Camera2/3 Test: cleanup the test 1. Fix the HAL version check 2. Disable some test temporarily as the deprecated tags were used. Bug: 16855498 Change-Id: I9f9dc285a1085b471d03c5a900cc44dd2a7480c3 --- tests/camera2/CameraBurstTests.cpp | 3 ++- tests/camera2/CameraModuleFixture.h | 2 ++ tests/camera2/CameraMultiStreamTests.cpp | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/camera2/CameraBurstTests.cpp b/tests/camera2/CameraBurstTests.cpp index 65ff460..58763de 100644 --- a/tests/camera2/CameraBurstTests.cpp +++ b/tests/camera2/CameraBurstTests.cpp @@ -311,7 +311,8 @@ TEST_F(CameraBurstTest, ManualExposureControl) { * $ setenv CAMERA2_TEST_VARIABLE_BURST_DUMP_FRAMES 1 * $ /data/nativetest/camera2_test/camera2_test --gtest_filter="*VariableBurst" */ -TEST_F(CameraBurstTest, VariableBurst) { +// Disable this test for now, as we need cleanup the usage of the deprecated tag quite a bit. +TEST_F(CameraBurstTest, DISABLED_VariableBurst) { TEST_EXTENSION_FORKING_INIT; diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h index acf41e1..0bb0e7d 100644 --- a/tests/camera2/CameraModuleFixture.h +++ b/tests/camera2/CameraModuleFixture.h @@ -97,6 +97,8 @@ struct CameraModuleFixture { *device = new Camera2Device(cameraID); break; case CAMERA_DEVICE_API_VERSION_3_0: + case CAMERA_DEVICE_API_VERSION_3_1: + case CAMERA_DEVICE_API_VERSION_3_2: *device = new Camera3Device(cameraID); break; default: diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp index 536b656..066f4ee 100644 --- a/tests/camera2/CameraMultiStreamTests.cpp +++ b/tests/camera2/CameraMultiStreamTests.cpp @@ -467,7 +467,8 @@ public: * * 2. Manual control(gain/exposure) of mutiple burst capture. */ -TEST_F(CameraMultiStreamTest, MultiBurst) { +// Disable this test for now, as we need cleanup the usage of the deprecated tag quite a bit. +TEST_F(CameraMultiStreamTest, DISABLED_MultiBurst) { TEST_EXTENSION_FORKING_INIT; -- cgit v1.1