{"id":12142,"url":"https://patchwork.libcamera.org/api/1.1/patches/12142/?format=json","web_url":"https://patchwork.libcamera.org/patch/12142/","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":"<20210430160026.190724-4-jacopo@jmondi.org>","date":"2021-04-30T16:00:13","name":"[libcamera-devel,v4,03/16] test: control_list: Test ControlList::merge()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d1e0a29ae554b1dfef03f05ec3c2417527e90ef0","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12142/mbox/","series":[{"id":1990,"url":"https://patchwork.libcamera.org/api/1.1/series/1990/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1990","date":"2021-04-30T16:00:10","name":"Support SensorTimestamp metadata","version":4,"mbox":"https://patchwork.libcamera.org/series/1990/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12142/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12142/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8DA79BDE4C\n\tfor ;\n\tFri, 30 Apr 2021 15:59:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5F3136891F;\n\tFri, 30 Apr 2021 17:59:55 +0200 (CEST)","from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E24F068914\n\tfor ;\n\tFri, 30 Apr 2021 17:59:50 +0200 (CEST)","from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id D9114FF804;\n\tFri, 30 Apr 2021 15:59:49 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 30 Apr 2021 18:00:13 +0200","Message-Id":"<20210430160026.190724-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210430160026.190724-1-jacopo@jmondi.org>","References":"<20210430160026.190724-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 03/16] test: control_list: Test\n\tControlList::merge()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Test the ControlList::merge() method by creating a new list and\nmerging it with the existing one.\n\nTest that the merged list contains all the controls, the existing values\ndo not get overwritten and the ones copied are not changed.\n\nReviewed-by: Niklas Söderlund \nReviewed-by: Hirokazu Honda \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n test/controls/control_list.cpp | 46 ++++++++++++++++++++++++++++++++++\n 1 file changed, 46 insertions(+)","diff":"diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp\nindex 2b321ddd6fa4..70cf61b85cbc 100644\n--- a/test/controls/control_list.cpp\n+++ b/test/controls/control_list.cpp\n@@ -150,6 +150,52 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\t/*\n+\t\t * Create a new list with a new control and merge it with the\n+\t\t * existing one, verifying that the existing controls\n+\t\t * values don't get overwritten.\n+\t\t */\n+\t\tControlList mergeList(controls::controls, &validator);\n+\t\tmergeList.set(controls::Brightness, 0.7f);\n+\t\tmergeList.set(controls::Saturation, 0.4f);\n+\n+\t\tmergeList.merge(list);\n+\t\tif (mergeList.size() != 3) {\n+\t\t\tcout << \"Merged list should contain three elements\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (list.size() != 2) {\n+\t\t\tcout << \"The list to merge should contain two elements\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!mergeList.contains(controls::Brightness) ||\n+\t\t !mergeList.contains(controls::Contrast) ||\n+\t\t !mergeList.contains(controls::Saturation)) {\n+\t\t\tcout << \"Merged list does not contain all controls\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (mergeList.get(controls::Brightness) != 0.7f) {\n+\t\t\tcout << \"Brightness control value changed after merging lists\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (mergeList.get(controls::Contrast) != 1.1f) {\n+\t\t\tcout << \"Contrast control value changed after merging lists\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (mergeList.get(controls::Saturation) != 0.4f) {\n+\t\t\tcout << \"Saturation control value changed after merging lists\"\n+\t\t\t << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\treturn TestPass;\n \t}\n };\n","prefixes":["libcamera-devel","v4","03/16"]}