Camera: modify test per framework interface change
Wrap camera_module_t by CameraModule to follow
framework interface change.
Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h
index 0bb0e7d..bf82a97 100644
--- a/tests/camera2/CameraModuleFixture.h
+++ b/tests/camera2/CameraModuleFixture.h
@@ -22,6 +22,7 @@
#include "hardware/hardware.h"
#include "hardware/camera2.h"
+#include <common/CameraModule.h>
#include <device2/Camera2Device.h>
#include <device3/Camera3Device.h>
@@ -54,15 +55,17 @@
void SetUp() {
TEST_EXTENSION_FORKING_SET_UP;
+ camera_module_t *rawModule;
ASSERT_LE(0, hw_get_module(CAMERA_HARDWARE_MODULE_ID,
- (const hw_module_t **)&mModule)) << "Could not load camera module";
- ASSERT_NE((void*)0, mModule);
+ (const hw_module_t **)&rawModule)) << "Could not load camera module";
+ ASSERT_NE((void*)0, rawModule);
+ mModule = new CameraModule(rawModule);
- mNumberOfCameras = mModule->get_number_of_cameras();
+ mNumberOfCameras = mModule->getNumberOfCameras();
ASSERT_LE(0, mNumberOfCameras);
ASSERT_LE(
- CAMERA_MODULE_API_VERSION_2_0, mModule->common.module_api_version)
+ CAMERA_MODULE_API_VERSION_2_0, mModule->getRawModule()->module_api_version)
<< "Wrong module API version";
/* For using this fixture in other tests only */
@@ -72,6 +75,7 @@
void TearDown() {
TEST_EXTENSION_FORKING_TEAR_DOWN;
+ delete mModule;
TearDownMixin();
/* important: device must be destructed before closing module,
@@ -79,14 +83,14 @@
mDevice.clear();
if (!TEST_EXTENSION_FORKING_ENABLED) {
- ASSERT_EQ(0, HWModuleHelpers::closeModule(&mModule->common))
+ ASSERT_EQ(0, HWModuleHelpers::closeModule(mModule->getRawModule()))
<< "Failed to close camera HAL module";
}
}
void CreateCamera(int cameraID, /*out*/ sp<CameraDeviceBase> *device) {
struct camera_info info;
- ASSERT_EQ(OK, mModule->get_camera_info(cameraID, &info));
+ ASSERT_EQ(OK, mModule->getCameraInfo(cameraID, &info));
ASSERT_GE((int)info.device_version, CAMERA_DEVICE_API_VERSION_2_0) <<
"Device version too old for camera " << cameraID << ". Version: " <<
@@ -116,7 +120,7 @@
int getDeviceVersion(int cameraId, status_t* status = NULL) {
camera_info info;
status_t res;
- res = mModule->get_camera_info(cameraId, &info);
+ res = mModule->getCameraInfo(cameraId, &info);
if (status != NULL) *status = res;
return info.device_version;
@@ -147,7 +151,7 @@
protected:
int mNumberOfCameras;
- camera_module_t *mModule;
+ CameraModule *mModule;
sp<CameraDeviceBase> mDevice;
private:
diff --git a/tests/camera2/CameraModuleTests.cpp b/tests/camera2/CameraModuleTests.cpp
index 828c56a..2e85d81 100644
--- a/tests/camera2/CameraModuleTests.cpp
+++ b/tests/camera2/CameraModuleTests.cpp
@@ -93,11 +93,7 @@
for (unsigned i = 0; i < sizeof(idx)/sizeof(idx[0]); ++i) {
String8 deviceName = String8::format("%d", idx[i]);
- status_t res =
- mModule->common.methods->open(
- &mModule->common,
- deviceName,
- &device);
+ status_t res = mModule->open(deviceName, &device);
EXPECT_NE(OK, res);
EXPECT_EQ(-ENODEV, res)
<< "Incorrect error code when trying to open camera with invalid id "
@@ -111,7 +107,7 @@
for (int i = 0; i < mNumberOfCameras; ++i) {
struct camera_info info;
- ASSERT_EQ(OK, mModule->get_camera_info(i, &info));
+ ASSERT_EQ(OK, mModule->getCameraInfo(i, &info));
}
}
@@ -123,8 +119,8 @@
int idx[] = { -1, mNumberOfCameras, mNumberOfCameras + 1 };
for (unsigned i = 0; i < sizeof(idx)/sizeof(idx[0]); ++i) {
struct camera_info info;
- EXPECT_NE(OK, mModule->get_camera_info(idx[i], &info));
- EXPECT_EQ(-ENODEV, mModule->get_camera_info(idx[i], &info))
+ EXPECT_NE(OK, mModule->getCameraInfo(idx[i], &info));
+ EXPECT_EQ(-ENODEV, mModule->getCameraInfo(idx[i], &info))
<< "Incorrect error code for get_camera_info idx= "
<< idx[i];
}
diff --git a/tests/camera2/camera2_utils.cpp b/tests/camera2/camera2_utils.cpp
index 9cc6c90..930b909 100644
--- a/tests/camera2/camera2_utils.cpp
+++ b/tests/camera2/camera2_utils.cpp
@@ -580,7 +580,7 @@
mCondition.signal();
}
-int HWModuleHelpers::closeModule(hw_module_t* module) {
+int HWModuleHelpers::closeModule(const hw_module_t* module) {
int status;
if (!module) {
diff --git a/tests/camera2/camera2_utils.h b/tests/camera2/camera2_utils.h
index c1d1e72..2072eb6 100644
--- a/tests/camera2/camera2_utils.h
+++ b/tests/camera2/camera2_utils.h
@@ -240,7 +240,7 @@
struct HWModuleHelpers {
/* attempt to unload the library with dlclose */
- static int closeModule(hw_module_t* module);
+ static int closeModule(const hw_module_t* module);
};
}