commit c2537654815c015d82719dd46023997b647a5e9c
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Mar 24 10:48:08 2015 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Mar 24 12:07:32 2015 -0700
tree d02afa3c97cd5bb433b11556cddbf241364632df
parent 889dd060327c19dca5e07ba95eda8271cad3490a

Camera: update test per interface change

CameraModule does not allow for accessing raw module pointer
anymore. Also cleanup some warnings.

Bug: 19897963

Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058

tests/camera2/CameraModuleFixture.h

diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h
index bf82a97..3a2df69 100644
--- a/tests/camera2/CameraModuleFixture.h
+++ b/tests/camera2/CameraModuleFixture.h
@@ -65,7 +65,7 @@
         ASSERT_LE(0, mNumberOfCameras);
 
         ASSERT_LE(
-            CAMERA_MODULE_API_VERSION_2_0, mModule->getRawModule()->module_api_version)
+            CAMERA_MODULE_API_VERSION_2_0, mModule->getModuleApiVersion())
             << "Wrong module API version";
 
         /* For using this fixture in other tests only */
@@ -83,7 +83,7 @@
         mDevice.clear();
 
         if (!TEST_EXTENSION_FORKING_ENABLED) {
-            ASSERT_EQ(0, HWModuleHelpers::closeModule(mModule->getRawModule()))
+            ASSERT_EQ(0, HWModuleHelpers::closeModule(mModule->getDso()))
                 << "Failed to close camera HAL module";
         }
     }