2 files changed, 92 insertions, 0 deletions
diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp
new file mode 100644
index 00000000..dedb8500
--- /dev/null
+++ b/test/camera/configuration_set.cpp
@@ -0,0 +1,91 @@
+/* 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 std;
+
+namespace {
+
+class ConfigurationSet : public CameraTest
+{
+protected:
+	int run()
+	{
+		std::set<Stream *> streams = { *camera_->streams().begin() };
+		std::map<Stream *, StreamConfiguration> conf =
+			camera_->streamConfiguration(streams);
+		StreamConfiguration *sconf = &conf.begin()->second;
+
+		if (!configurationValid(streams, conf)) {
+			cout << "Failed to read default configuration" << endl;
+			return TestFail;
+		}
+
+		if (camera_->acquire()) {
+			cout << "Failed to acquire the camera" << endl;
+			return TestFail;
+		}
+
+		/* Test that setting the default configuration works. */
+		if (camera_->configureStreams(conf)) {
+			cout << "Failed to set default configuration" << endl;
+			return TestFail;
+		}
+
+		/*
+		 * Test that configuring the camera fails if it is not
+		 * acquired, this will also test release and reacquiring
+		 * of the camera.
+		 */
+		if (camera_->release()) {
+			cout << "Failed to release the camera" << endl;
+			return TestFail;
+		}
+
+		if (!camera_->configureStreams(conf)) {
+			cout << "Setting configuration on a camera not acquired succeeded when it should have failed"
+			     << endl;
+			return TestFail;
+		}
+
+		if (camera_->acquire()) {
+			cout << "Failed to acquire the camera" << endl;
+			return TestFail;
+		}
+
+		/*
+		 * Test that modifying the default configuration works. Doubling
+		 * the default configuration of the VIMC camera is known to
+		 * work.
+		 */
+		sconf->width *= 2;
+		sconf->height *= 2;
+		if (camera_->configureStreams(conf)) {
+			cout << "Failed to set modified configuration" << endl;
+			return TestFail;
+		}
+
+		/*
+		 * Test that setting an invalid configuration fails.
+		 */
+		sconf->width = 0;
+		sconf->height = 0;
+		if (!camera_->configureStreams(conf)) {
+			cout << "Invalid configuration incorrectly accepted" << endl;
+			return TestFail;
+		}
+
+		return TestPass;
+	}
+};
+
+} /* namespace */
+
+TEST_REGISTER(ConfigurationSet);
diff --git a/test/camera/meson.build b/test/camera/meson.build
index 186ba211..ed483719 100644
--- a/test/camera/meson.build
+++ b/test/camera/meson.build
@@ -2,6 +2,7 @@
 # They are not alphabetically sorted.
 camera_tests = [
   [ 'configuration_default',  'configuration_default.cpp' ],
+  [ 'configuration_set',      'configuration_set.cpp' ],
 ]
 
 foreach t : camera_tests