{"id":3003,"url":"https://patchwork.libcamera.org/api/patches/3003/?format=json","web_url":"https://patchwork.libcamera.org/patch/3003/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200306160002.30549-32-laurent.pinchart@ideasonboard.com>","date":"2020-03-06T16:00:01","name":"[libcamera-devel,v2,31/32] test: controls: control_value: Expand test to cover array controls","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c9af52619a5dd973547afcb749b65aa245b58632","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3003/mbox/","series":[{"id":703,"url":"https://patchwork.libcamera.org/api/series/703/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=703","date":"2020-03-06T15:59:30","name":"libcamera: Add support for array controls","version":2,"mbox":"https://patchwork.libcamera.org/series/703/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3003/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3003/checks/","tags":{},"headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 311F9628E0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  6 Mar 2020 17:00:28 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C10A824B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  6 Mar 2020 17:00:27 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583510427;\n\tbh=n8DnTCdboN0zG0KmvXupotD2rPXq5x5/jyNh0KMTpwQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=t+/crHY3gEbhNWfx5SJU0mKyvlD7QvgoXL2AQJDXSdsOH/ROzZ0up+wvp7DvFqao8\n\t4wSn1+E+7wLGp52/Q/LxVs6Aw2iFQQqDuTLc/g5IzGJ31LQz6KC6wOMvsn0MHtQRA1\n\tcd4s39hZkp5rUqqbWMC4KFgGvcGJOqjht5XQ8JAg=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Fri,  6 Mar 2020 18:00:01 +0200","Message-Id":"<20200306160002.30549-32-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200306160002.30549-1-laurent.pinchart@ideasonboard.com>","References":"<20200306160002.30549-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 31/32] test: controls: control_value:\n\tExpand test to cover array controls","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Fri, 06 Mar 2020 16:00:28 -0000"},"content":"Add tests to ControlValueTest to cover array controls of all supported\ntypes.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\nChanges since v1:\n\n- Renamed int8s to bytes\n---\n test/controls/control_value.cpp | 101 ++++++++++++++++++++++++++++++++\n 1 file changed, 101 insertions(+)","diff":"diff --git a/test/controls/control_value.cpp b/test/controls/control_value.cpp\nindex 37f415302ff6..fd28bfe4604a 100644\n--- a/test/controls/control_value.cpp\n+++ b/test/controls/control_value.cpp\n@@ -5,6 +5,7 @@\n  * control_value.cpp - ControlValue tests\n  */\n \n+#include <algorithm>\n #include <iostream>\n \n #include <libcamera/controls.h>\n@@ -48,6 +49,26 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tstd::array<bool, 2> bools{ true, false };\n+\t\tvalue.set(Span<bool>(bools));\n+\t\tif (value.isNone() || !value.isArray() ||\n+\t\t    value.type() != ControlTypeBool) {\n+\t\t\tcerr << \"Control type mismatch after setting to bool array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tSpan<const bool> boolsResult = value.get<Span<const bool>>();\n+\t\tif (bools.size() != boolsResult.size() ||\n+\t\t    !std::equal(bools.begin(), bools.end(), boolsResult.begin())) {\n+\t\t\tcerr << \"Control value mismatch after setting to bool\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.toString() != \"[ true, false ]\") {\n+\t\t\tcerr << \"Control string mismatch after setting to bool array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\t/*\n \t\t * Integer8 type.\n \t\t */\n@@ -68,6 +89,26 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tstd::array<uint8_t, 4> bytes{ 3, 14, 15, 9 };\n+\t\tvalue.set(Span<uint8_t>(bytes));\n+\t\tif (value.isNone() || !value.isArray() ||\n+\t\t    value.type() != ControlTypeByte) {\n+\t\t\tcerr << \"Control type mismatch after setting to uint8_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tSpan<const uint8_t> int8sResult = value.get<Span<const uint8_t>>();\n+\t\tif (bytes.size() != int8sResult.size() ||\n+\t\t    !std::equal(bytes.begin(), bytes.end(), int8sResult.begin())) {\n+\t\t\tcerr << \"Control value mismatch after setting to uint8_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.toString() != \"[ 3, 14, 15, 9 ]\") {\n+\t\t\tcerr << \"Control string mismatch after setting to uint8_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\t/*\n \t\t * Integer32 type.\n \t\t */\n@@ -88,6 +129,26 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tstd::array<int32_t, 4> int32s{ 3, 14, 15, 9 };\n+\t\tvalue.set(Span<int32_t>(int32s));\n+\t\tif (value.isNone() || !value.isArray() ||\n+\t\t    value.type() != ControlTypeInteger32) {\n+\t\t\tcerr << \"Control type mismatch after setting to int32_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tSpan<const int32_t> int32sResult = value.get<Span<const int32_t>>();\n+\t\tif (int32s.size() != int32sResult.size() ||\n+\t\t    !std::equal(int32s.begin(), int32s.end(), int32sResult.begin())) {\n+\t\t\tcerr << \"Control value mismatch after setting to int32_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.toString() != \"[ 3, 14, 15, 9 ]\") {\n+\t\t\tcerr << \"Control string mismatch after setting to int32_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\t/*\n \t\t * Integer64 type.\n \t\t */\n@@ -108,6 +169,26 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tstd::array<int64_t, 4> int64s{ 3, 14, 15, 9 };\n+\t\tvalue.set(Span<int64_t>(int64s));\n+\t\tif (value.isNone() || !value.isArray() ||\n+\t\t    value.type() != ControlTypeInteger64) {\n+\t\t\tcerr << \"Control type mismatch after setting to int64_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tSpan<const int64_t> int64sResult = value.get<Span<const int64_t>>();\n+\t\tif (int64s.size() != int64sResult.size() ||\n+\t\t    !std::equal(int64s.begin(), int64s.end(), int64sResult.begin())) {\n+\t\t\tcerr << \"Control value mismatch after setting to int64_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.toString() != \"[ 3, 14, 15, 9 ]\") {\n+\t\t\tcerr << \"Control string mismatch after setting to int64_t array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\t/*\n \t\t * Float type.\n \t\t */\n@@ -128,6 +209,26 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tstd::array<float, 3> floats{ 3.141593, 2.718282, 299792458.0 };\n+\t\tvalue.set(Span<float>(floats));\n+\t\tif (value.isNone() || !value.isArray() ||\n+\t\t    value.type() != ControlTypeFloat) {\n+\t\t\tcerr << \"Control type mismatch after setting to float array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tSpan<const float> floatsResult = value.get<Span<const float>>();\n+\t\tif (floats.size() != floatsResult.size() ||\n+\t\t    !std::equal(floats.begin(), floats.end(), floatsResult.begin())) {\n+\t\t\tcerr << \"Control value mismatch after setting to float array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (value.toString() != \"[ 3.141593, 2.718282, 299792448.000000 ]\") {\n+\t\t\tcerr << \"Control string mismatch after setting to float array\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\treturn TestPass;\n \t}\n };\n","prefixes":["libcamera-devel","v2","31/32"]}