commit 32b9b9ff9ae2f367ad3626690d6ef1fd9339e423
author Igor Murashkin <iam@google.com> Thu Jan 10 13:37:12 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 10 13:37:12 2013 -0800
tree 4fb31bbd320eda0dd5bd39e7ce90e7ee14952a4e
parent 5a6b76d2ae1e6da5929a6f475fada31b280a2360
parent d887503095926eadfefefdc07fcedaff51e4f07d

am d8875030: Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE

* commit 'd887503095926eadfefefdc07fcedaff51e4f07d':
  Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE

tests/camera2/CameraModuleFixture.h

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 @@
         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 @@
         return entry;
     }
 
-private:
-
     void SetUp() {
         TEST_EXTENSION_FORKING_SET_UP;
 
@@ -88,6 +82,8 @@
         }
     }
 
+private:
+
     void SetUpMixin() {
         /* For using this fixture in other tests only */
         if (mCameraID != -1) {

tests/camera2/CameraModuleTests.cpp

diff --git a/tests/camera2/CameraModuleTests.cpp b/tests/camera2/CameraModuleTests.cpp
index 5e85698..b5b88fc 100644
--- a/tests/camera2/CameraModuleTests.cpp
+++ b/tests/camera2/CameraModuleTests.cpp
@@ -33,6 +33,15 @@
 
 class CameraModuleTest : public ::testing::Test,
                                   public CameraModuleFixture<> {
+
+public:
+    CameraModuleTest() {
+        CameraModuleFixture::SetUp();
+    }
+
+    ~CameraModuleTest() {
+        CameraModuleFixture::TearDown();
+    }
 };
 
 TEST_F(CameraModuleTest, LoadModule) {

tests/camera2/CameraStreamFixture.h

diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h
index 7a6fa31..569b9d1 100644
--- a/tests/camera2/CameraStreamFixture.h
+++ b/tests/camera2/CameraStreamFixture.h
@@ -68,6 +68,8 @@
     void SetUp() {
         TEST_EXTENSION_FORKING_SET_UP;
 
+        CameraModuleFixture::SetUp();
+
         CameraStreamParams p = mParam;
         sp<Camera2Device> device = mDevice;
 
@@ -89,6 +91,13 @@
     }
     void TearDown() {
         TEST_EXTENSION_FORKING_TEAR_DOWN;
+
+        // important: shut down HAL before releasing streams
+        CameraModuleFixture::TearDown();
+
+        mNativeWindow.clear();
+        mCpuConsumer.clear();
+        mFrameListener.clear();
     }
 
 protected: