summaryrefslogtreecommitdiffstats
path: root/tests/camera2/CameraModuleFixture.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/camera2/CameraModuleFixture.h')
-rw-r--r--tests/camera2/CameraModuleFixture.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h
index 6ad1ae8..cd8ddc4 100644
--- a/tests/camera2/CameraModuleFixture.h
+++ b/tests/camera2/CameraModuleFixture.h
@@ -37,14 +37,10 @@ struct CameraModuleFixture {
TEST_EXTENSION_FORKING_CONSTRUCTOR;
mCameraID = CameraID;
-
- SetUp();
}
~CameraModuleFixture() {
TEST_EXTENSION_FORKING_DESTRUCTOR;
-
- TearDown();
}
camera_metadata_ro_entry GetStaticEntry(uint32_t tag) const {
@@ -53,8 +49,6 @@ struct CameraModuleFixture {
return entry;
}
-private:
-
void SetUp() {
TEST_EXTENSION_FORKING_SET_UP;
@@ -88,6 +82,8 @@ private:
}
}
+private:
+
void SetUpMixin() {
/* For using this fixture in other tests only */
if (mCameraID != -1) {