NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

test: Extract CameraTest class out of camera tests to libtest

Browse source 
Many tests other than the camera/ tests use a camera. To increase code
sharing, move the base CameraTest class to the test library. The class
becomes a helper that doesn't inherit from Test anymore (to avoid
diamond inheritance issues when more such helpers will exist).

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-10-27 19:20:39 +02:00
parent 6b3308ba1b
commit fac471e812
10 changed files with 77 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

39
test/controls/control_list.cpp
View file

@ -13,32 +13,22 @@
#include <libcamera/controls.h>
#include "camera_controls.h"
#include "camera_test.h"
#include "test.h"
using namespace std;
using namespace libcamera;
class ControlListTest : public Test
class ControlListTest : public CameraTest, public Test
{
protected:
int init()
public:
ControlListTest()
: CameraTest("VIMC Sensor B")
{
cm_ = new CameraManager();
if (cm_->start()) {
cout << "Failed to start camera manager" << endl;
return TestFail;
}
camera_ = cm_->get("VIMC Sensor B");
if (!camera_) {
cout << "Can not find VIMC camera" << endl;
return TestSkip;
}
return TestPass;
}
protected:
int run()
{
CameraControlValidator validator(camera_.get());
@ -156,21 +146,6 @@ protected:
return TestPass;
}
void cleanup()
{
if (camera_) {
camera_->release();
camera_.reset();
}
cm_->stop();
delete cm_;
}
private:
CameraManager *cm_;
std::shared_ptr<Camera> camera_;
};
TEST_REGISTER(ControlListTest)