diff options
author | Igor Murashkin <iam@google.com> | 2012-11-06 17:02:54 -0800 |
---|---|---|
committer | Igor Murashkin <iam@google.com> | 2012-11-27 11:38:06 -0800 |
commit | eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea (patch) | |
tree | aa511cddad9a1643fec806ed54e198923b4fcc65 /tests/camera2/CameraModuleTests.cpp | |
parent | 192e51c92a34645b5e6e864d9ba65b245bd37c2b (diff) | |
download | hardware_libhardware-eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea.zip hardware_libhardware-eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea.tar.gz hardware_libhardware-eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea.tar.bz2 |
Camera2: Tests -- Fork each test before executing it
Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).
Change-Id: Ib639885bdb827fc2415c878cbcb1b2d84dff687b
Diffstat (limited to 'tests/camera2/CameraModuleTests.cpp')
-rw-r--r-- | tests/camera2/CameraModuleTests.cpp | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/tests/camera2/CameraModuleTests.cpp b/tests/camera2/CameraModuleTests.cpp index 2bfdb88..5e85698 100644 --- a/tests/camera2/CameraModuleTests.cpp +++ b/tests/camera2/CameraModuleTests.cpp @@ -16,7 +16,7 @@ #include <gtest/gtest.h> -#define LOG_TAG "DISABLED_CameraModuleTest" +#define LOG_TAG "CameraModuleTest" #define LOG_NDEBUG 0 #include <utils/Log.h> @@ -31,23 +31,13 @@ namespace android { namespace camera2 { namespace tests { -class DISABLED_CameraModuleTest : public ::testing::Test, +class CameraModuleTest : public ::testing::Test, public CameraModuleFixture<> { - - virtual void SetUp() { - //CameraModuleFixture::SetUp(); - } - - virtual void TearDown() { - //CameraModuleFixture::TearDown(); - } }; -TEST_F(DISABLED_CameraModuleTest, LoadModule) { +TEST_F(CameraModuleTest, LoadModule) { - if (HasFatalFailure()) { - return; - } + TEST_EXTENSION_FORKING_INIT; for (int i = 0; i < mNumberOfCameras; ++i) { mDevice = new Camera2Device(i); @@ -58,11 +48,9 @@ TEST_F(DISABLED_CameraModuleTest, LoadModule) { } -TEST_F(DISABLED_CameraModuleTest, LoadModuleBadIndices) { +TEST_F(CameraModuleTest, LoadModuleBadIndices) { - if (HasFatalFailure()) { - return; - } + TEST_EXTENSION_FORKING_INIT; int idx[] = { -1, mNumberOfCameras, mNumberOfCameras + 1 }; @@ -77,11 +65,9 @@ TEST_F(DISABLED_CameraModuleTest, LoadModuleBadIndices) { } } -TEST_F(DISABLED_CameraModuleTest, GetCameraInfo) { +TEST_F(CameraModuleTest, GetCameraInfo) { - if (HasFatalFailure()) { - return; - } + TEST_EXTENSION_FORKING_INIT; for (int i = 0; i < mNumberOfCameras; ++i) { struct camera_info info; @@ -90,11 +76,9 @@ TEST_F(DISABLED_CameraModuleTest, GetCameraInfo) { } -TEST_F(DISABLED_CameraModuleTest, GetCameraInfoBadIndices) { +TEST_F(CameraModuleTest, GetCameraInfoBadIndices) { - if (HasFatalFailure()) { - return; - } + TEST_EXTENSION_FORKING_INIT; int idx[] = { -1, mNumberOfCameras, mNumberOfCameras + 1 }; for (unsigned i = 0; i < sizeof(idx)/sizeof(idx[0]); ++i) { @@ -109,6 +93,8 @@ TEST_F(DISABLED_CameraModuleTest, GetCameraInfoBadIndices) { /** * TODO: Additional test to add: open two cameras at once. * (is allowed to fail, at least for now, but should not blow up) + * - open same device multiple times + * - close same device multiple times */ |