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

14
test/camera/buffer_import.cpp
View file

@ -18,6 +18,7 @@
#include "v4l2_videodevice.h"
#include "camera_test.h"
#include "test.h"
using namespace libcamera;
@ -254,11 +255,11 @@ private:
bool done_;
};
class BufferImportTest : public CameraTest
class BufferImportTest : public CameraTest, public Test
{
public:
BufferImportTest()
: CameraTest()
: CameraTest("VIMC Sensor B")
{
}
@ -350,11 +351,10 @@ protected:
int init()
{
int ret = CameraTest::init();
if (ret)
return ret;
if (status_ != TestPass)
return status_;
ret = sink_.init();
int ret = sink_.init();
if (ret != TestPass) {
cleanup();
return ret;
@ -422,8 +422,6 @@ protected:
camera_->stop();
camera_->freeBuffers();
CameraTest::cleanup();
}
private:

48
test/camera/camera_test.cpp
View file

@ -1,48 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Copyright (C) 2019, Google Inc.
*
* libcamera Camera API tests
*/
#include <iostream>
#include "camera_test.h"
using namespace libcamera;
using namespace std;
int CameraTest::init()
{
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;
}
/* Sanity check that the camera has streams. */
if (camera_->streams().empty()) {
cout << "Camera has no stream" << endl;
return TestFail;
}
return TestPass;
}
void CameraTest::cleanup()
{
if (camera_) {
camera_->release();
camera_.reset();
}
cm_->stop();
delete cm_;
}

30
test/camera/camera_test.h
View file

@ -1,30 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Copyright (C) 2019, Google Inc.
*
* camera_test.h - libcamera camera test base class
*/
#ifndef __LIBCAMERA_CAMERA_TEST_H__
#define __LIBCAMERA_CAMERA_TEST_H__
#include <libcamera/libcamera.h>
#include "test.h"
using namespace libcamera;
class CameraTest : public Test
{
public:
CameraTest()
: cm_(nullptr) {}
protected:
int init();
void cleanup();
CameraManager *cm_;
std::shared_ptr<Camera> camera_;
};
#endif /* __LIBCAMERA_CAMERA_TEST_H__ */

15
test/camera/capture.cpp
View file

@ -8,13 +8,20 @@
#include <iostream>
#include "camera_test.h"
#include "test.h"
using namespace std;
namespace {
class Capture : public CameraTest
class Capture : public CameraTest, public Test
{
public:
Capture()
: CameraTest("VIMC Sensor B")
{
}
protected:
unsigned int completeBuffersCount_;
unsigned int completeRequestsCount_;
@ -48,14 +55,12 @@ protected:
int init() override
{
int ret = CameraTest::init();
if (ret)
return ret;
if (status_ != TestPass)
return status_;
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
if (!config_ || config_->size() != 1) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
}

16
test/camera/configuration_default.cpp
View file

@ -8,15 +8,27 @@
#include <iostream>
#include "camera_test.h"
#include "test.h"
using namespace std;
namespace {
class ConfigurationDefault : public CameraTest
class ConfigurationDefault : public CameraTest, public Test
{
public:
ConfigurationDefault()
: CameraTest("VIMC Sensor B")
{
}
protected:
int run()
int init() override
{
return status_;
}
int run() override
{
std::unique_ptr<CameraConfiguration> config;

15
test/camera/configuration_set.cpp
View file

@ -8,24 +8,29 @@
#include <iostream>
#include "camera_test.h"
#include "test.h"
using namespace std;
namespace {
class ConfigurationSet : public CameraTest
class ConfigurationSet : public CameraTest, public Test
{
public:
ConfigurationSet()
: CameraTest("VIMC Sensor B")
{
}
protected:
int init() override
{
int ret = CameraTest::init();
if (ret)
return ret;
if (status_ != TestPass)
return status_;
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
if (!config_ || config_->size() != 1) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
}

2
test/camera/meson.build
View file

@ -9,7 +9,7 @@ camera_tests = [
]
foreach t : camera_tests
exe = executable(t[0], [t[1], 'camera_test.cpp'],
exe = executable(t[0], t[1],
dependencies : libcamera_dep,
link_with : test_libraries,
include_directories : test_includes_internal)

15
test/camera/statemachine.cpp
View file

@ -8,13 +8,20 @@
#include <iostream>
#include "camera_test.h"
#include "test.h"
using namespace std;
namespace {
class Statemachine : public CameraTest
class Statemachine : public CameraTest, public Test
{
public:
Statemachine()
: CameraTest("VIMC Sensor B")
{
}
protected:
int testAvailable()
{
@ -233,14 +240,12 @@ protected:
int init() override
{
int ret = CameraTest::init();
if (ret)
return ret;
if (status_ != TestPass)
return status_;
defconf_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
if (!defconf_) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
}