summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/camera/capture.cpp7
-rw-r--r--test/camera/configuration_default.cpp4
-rw-r--r--test/camera/configuration_set.cpp7
3 files changed, 4 insertions, 14 deletions
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index bb7d380c..c0835c25 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -45,7 +45,7 @@ protected:
CameraTest::init();
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
- if (!config_) {
+ if (!config_ || config_->size() != 1) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
@@ -58,11 +58,6 @@ protected:
{
StreamConfiguration &cfg = config_->at(0);
- if (!config_->isValid()) {
- cout << "Failed to read default configuration" << endl;
- return TestFail;
- }
-
if (camera_->acquire()) {
cout << "Failed to acquire the camera" << endl;
return TestFail;
diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp
index 8a767d23..ce2ec5d0 100644
--- a/test/camera/configuration_default.cpp
+++ b/test/camera/configuration_default.cpp
@@ -22,7 +22,7 @@ protected:
/* Test asking for configuration for a video stream. */
config = camera_->generateConfiguration({ StreamRole::VideoRecording });
- if (!config || !config->isValid()) {
+ if (!config || config->size() != 1) {
cout << "Default configuration invalid" << endl;
return TestFail;
}
@@ -32,7 +32,7 @@ protected:
* stream roles returns an empty camera configuration.
*/
config = camera_->generateConfiguration({});
- if (!config || config->isValid()) {
+ if (!config || config->size() != 0) {
cout << "Failed to retrieve configuration for empty roles list"
<< endl;
return TestFail;
diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp
index ece987c7..9f10f795 100644
--- a/test/camera/configuration_set.cpp
+++ b/test/camera/configuration_set.cpp
@@ -21,7 +21,7 @@ protected:
CameraTest::init();
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
- if (!config_) {
+ if (!config_ || config_->size() != 1) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
@@ -34,11 +34,6 @@ protected:
{
StreamConfiguration &cfg = config_->at(0);
- if (!config_->isValid()) {
- cout << "Failed to read default configuration" << endl;
- return TestFail;
- }
-
if (camera_->acquire()) {
cout << "Failed to acquire the camera" << endl;
return TestFail;