{"id":1571,"url":"https://patchwork.libcamera.org/api/1.1/patches/1571/?format=json","web_url":"https://patchwork.libcamera.org/patch/1571/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190701201504.28487-13-laurent.pinchart@ideasonboard.com>","date":"2019-07-01T20:15:03","name":"[libcamera-devel,v4,12/13] libcamera: test: Add ControlList tests","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a89dc19d55ad0715725a9afea06e73a1f42c0ec9","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1571/mbox/","series":[{"id":386,"url":"https://patchwork.libcamera.org/api/1.1/series/386/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=386","date":"2019-07-01T20:14:51","name":"libcamera Controls","version":4,"mbox":"https://patchwork.libcamera.org/series/386/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1571/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1571/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1984861FAE\n\tfor ;\n\tMon, 1 Jul 2019 22:15:32 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B0F27120A\n\tfor ;\n\tMon, 1 Jul 2019 22:15:31 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1562012131;\n\tbh=GpI0w1AfwKmT2AQKF+PZAkjbN548YkhJCCn67q3xugM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=bS3Iyp0vevErMpLlh9a5UNI5rXUnUjV3edVrJTK0WpoDpdgbm1qSeAradAcN4BEai\n\t92+sjUWGbQeWY8l18Rvz+nqWG0u1QcLaz5vCuOpZ786+Wvjy0G3zlE7cqC9uH3+KMs\n\tdSp9yE83E3K6y3VOcn8w2mH5pHsrG8RVPOPlpxIU=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 1 Jul 2019 23:15:03 +0300","Message-Id":"<20190701201504.28487-13-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190701201504.28487-1-laurent.pinchart@ideasonboard.com>","References":"<20190701201504.28487-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 12/13] libcamera: test: Add ControlList\n\ttests","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 01 Jul 2019 20:15:33 -0000"},"content":"From: Kieran Bingham \n\nAdd tests of the ControlList infrastructure and public API.\n\nSigned-off-by: Kieran Bingham \n---\n test/controls/control_list.cpp | 213 +++++++++++++++++++++++++++++++++\n test/controls/meson.build | 1 +\n 2 files changed, 214 insertions(+)\n create mode 100644 test/controls/control_list.cpp","diff":"diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp\nnew file mode 100644\nindex 000000000000..c834edc352f5\n--- /dev/null\n+++ b/test/controls/control_list.cpp\n@@ -0,0 +1,213 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * control_list.cpp - ControlList tests\n+ */\n+\n+#include \n+\n+#include \n+#include \n+#include \n+\n+#include \"test.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class ControlListTest : public Test\n+{\n+protected:\n+\tint init()\n+\t{\n+\t\tcm_ = CameraManager::instance();\n+\n+\t\tif (cm_->start()) {\n+\t\t\tcout << \"Failed to start camera manager\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tcamera_ = cm_->get(\"VIMC Sensor B\");\n+\t\tif (!camera_) {\n+\t\t\tcout << \"Can not find VIMC camera\" << endl;\n+\t\t\treturn TestSkip;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tint run()\n+\t{\n+\t\tControlList list(camera_.get());\n+\n+\t\t/* Test that the list is initially empty. */\n+\t\tif (!list.empty()) {\n+\t\t\tcout << \"List should to be empty\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (list.size() != 0) {\n+\t\t\tcout << \"List should contain zero items\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (list.contains(Brightness)) {\n+\t\t\tcout << \"List should not contain Brightness control\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tunsigned int count = 0;\n+\t\tfor (auto iter = list.begin(); iter != list.end(); ++iter)\n+\t\t\tcount++;\n+\n+\t\tif (count != 0) {\n+\t\t\tcout << \"List iteration should not produce any item\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Set a control, and verify that the list now contains it, and\n+\t\t * nothing else.\n+\t\t */\n+\t\tlist[Brightness] = 255;\n+\n+\t\tif (list.empty()) {\n+\t\t\tcout << \"List should not be empty\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (list.size() != 1) {\n+\t\t\tcout << \"List should contain one item\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!list.contains(Brightness)) {\n+\t\t\tcout << \"List should contain Brightness control\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tcount = 0;\n+\t\tfor (auto iter = list.begin(); iter != list.end(); ++iter)\n+\t\t\tcount++;\n+\n+\t\tif (count != 1) {\n+\t\t\tcout << \"List iteration should produce one item\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (list[Brightness].getInt() != 255) {\n+\t\t\tcout << \"Incorrest Brightness control value\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (list.contains(Contrast)) {\n+\t\t\tcout << \"List should not contain Contract control\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Set a second control through ControlInfo and retrieve it\n+\t\t * through both controlId and ControlInfo.\n+\t\t */\n+\t\tconst ControlInfoMap &controls = camera_->controls();\n+\t\tconst ControlInfo *brightness = &controls.find(Brightness)->second;\n+\t\tconst ControlInfo *contrast = &controls.find(Contrast)->second;\n+\n+\t\tlist[brightness] = 64;\n+\t\tlist[contrast] = 128;\n+\n+\t\tif (!list.contains(Contrast) || !list.contains(contrast)) {\n+\t\t\tcout << \"List should contain Contrast control\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Test control value retrieval and update through ControlInfo.\n+\t\t */\n+\t\tif (list[brightness].getInt() != 64 ||\n+\t\t list[contrast].getInt() != 128) {\n+\t\t\tcout << \"Failed to retrieve control value\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tlist[brightness] = 10;\n+\t\tlist[contrast] = 20;\n+\n+\t\tif (list[brightness].getInt() != 10 ||\n+\t\t list[contrast].getInt() != 20) {\n+\t\t\tcout << \"Failed to update control value\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Assert that the container has not grown with the control\n+\t\t * updated.\n+\t\t */\n+\t\tif (list.size() != 2) {\n+\t\t\tcout << \"List should contain two elements\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Test list merging. Create a new list, add two controls with\n+\t\t * one overlapping the existing list, merge the lists and clear\n+\t\t * the old list. Verify that the new list is empty and that the\n+\t\t * new list contains the expected items and values.\n+\t\t */\n+\t\tControlList newList(camera_.get());\n+\n+\t\tnewList[Brightness] = 128;\n+\t\tnewList[Saturation] = 255;\n+\t\tnewList.update(list);\n+\n+\t\tlist.clear();\n+\n+\t\tif (list.size() != 0) {\n+\t\t\tcout << \"Old List should contain zero items\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!list.empty()) {\n+\t\t\tcout << \"Old List should be empty\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (newList.size() != 3) {\n+\t\t\tcout << \"New list has incorrect size\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!newList.contains(Brightness) ||\n+\t\t !newList.contains(Contrast) ||\n+\t\t !newList.contains(Saturation)) {\n+\t\t\tcout << \"New list contains incorrect items\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (newList[Brightness].getInt() != 10 ||\n+\t\t newList[Contrast].getInt() != 20 ||\n+\t\t newList[Saturation].getInt() != 255) {\n+\t\t\tcout << \"New list contains incorrect values\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+\tvoid cleanup()\n+\t{\n+\t\tif (camera_) {\n+\t\t\tcamera_->release();\n+\t\t\tcamera_.reset();\n+\t\t}\n+\n+\t\tcm_->stop();\n+\t}\n+\n+private:\n+\tCameraManager *cm_;\n+\tstd::shared_ptr camera_;\n+};\n+\n+TEST_REGISTER(ControlListTest)\ndiff --git a/test/controls/meson.build b/test/controls/meson.build\nindex f8cda2877e73..f4fc7b947dd9 100644\n--- a/test/controls/meson.build\n+++ b/test/controls/meson.build\n@@ -1,5 +1,6 @@\n control_tests = [\n [ 'control_info', 'control_info.cpp' ],\n+ [ 'control_list', 'control_list.cpp' ],\n [ 'control_value', 'control_value.cpp' ],\n ]\n \n","prefixes":["libcamera-devel","v4","12/13"]}