{"id":16163,"url":"https://patchwork.libcamera.org/api/1.1/patches/16163/?format=json","web_url":"https://patchwork.libcamera.org/patch/16163/","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":"<20220604185939.29163-9-laurent.pinchart@ideasonboard.com>","date":"2022-06-04T18:59:33","name":"[libcamera-devel,RFC,v2,08/14] test: yaml_parser: Extend tests to cover the iterator API","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"e2f5d01c621cc9c9dbeddfaeaf75988004aaff13","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/16163/mbox/","series":[{"id":3161,"url":"https://patchwork.libcamera.org/api/1.1/series/3161/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3161","date":"2022-06-04T18:59:25","name":"Replace boost JSON parser with libyaml in Raspberry Pi IPA","version":2,"mbox":"https://patchwork.libcamera.org/series/3161/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16163/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16163/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 21A47C3278\n\tfor ;\n\tSat, 4 Jun 2022 19:00:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8AE206563D;\n\tSat, 4 Jun 2022 21:00:12 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AABFD6563D\n\tfor ;\n\tSat, 4 Jun 2022 21:00:10 +0200 (CEST)","from pendragon.ideasonboard.com (85-76-79-203-nat.elisa-mobile.fi\n\t[85.76.79.203])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 41FF86D4;\n\tSat, 4 Jun 2022 21:00:09 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1654369212;\n\tbh=SUZ5vJfie+i32xSq7wD2gVnyYdGkZTsdqJhOzBSQbHQ=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=G2CFfuUnYM/DyDPSU/RIXTUIf+cfOOdsVJuZxs3VzO9OuZ9HEWV9i6Zk0yLZ0zQaX\n\td+PSAM/J5YfRc3yAJrZn2m7oBzsmayqKvdvwGXAvRP4Zir/X7uom3Qz9u38cBODsoI\n\t0tL1WT7PkX5yonazMElXcVvWcLr0emmg3LgC6qNznVGpCaU2+aiGCwSr19iU8g0amF\n\twljQfdB5Qu3kAGChlaaA1eLjPnUn/twVeQ3pYXE+UqFDrY+naSpf0GCdmZ0ozn+36k\n\trEFhFrcNwVqgcU3i5bb2VJMouyzQ4MYhfJvAlP1juU61yhzJdLYiOb9pspqXnPH8K1\n\t26a/9vnKNpqxg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1654369210;\n\tbh=SUZ5vJfie+i32xSq7wD2gVnyYdGkZTsdqJhOzBSQbHQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=K8kuYlwZ00g7uhuK3xC8+fSFvMs5eHXULdND3npPAHtiLg/uGc9WUuVeDS8y5evYj\n\tpKs3xgo2V12cDBiIzEMgwfu9agkAHZJPYhhUJHG8K170ulIDc1JjxKyX2912R+tden\n\t8bmI7UPsn+8J94NGVC5Vo1M+wvUdEx5S6m5PcdQU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"K8kuYlwZ\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Jun 2022 21:59:33 +0300","Message-Id":"<20220604185939.29163-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220604185939.29163-1-laurent.pinchart@ideasonboard.com>","References":"<20220604185939.29163-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH v2 08/14] test: yaml_parser: Extend\n\ttests to cover the iterator API","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","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Test iteration over lists and dictionaries to test the YamlObject\niterator API.\n\nSigned-off-by: Laurent Pinchart \n---\n test/yaml-parser.cpp | 88 ++++++++++++++++++++++++++++++++++----------\n 1 file changed, 69 insertions(+), 19 deletions(-)","diff":"diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\nindex 582c9caed836..6dfec49d6be0 100644\n--- a/test/yaml-parser.cpp\n+++ b/test/yaml-parser.cpp\n@@ -5,6 +5,7 @@\n * yaml-parser.cpp - YAML parser operations tests\n */\n \n+#include \n #include \n #include \n #include \n@@ -373,15 +374,39 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj.size() > 2) {\n+\t\tstatic constexpr std::array listValues{\n+\t\t\t\"James\",\n+\t\t\t\"Mary\",\n+\t\t};\n+\n+\t\tif (listObj.size() != listValues.size()) {\n \t\t\tcerr << \"List object parse with wrong size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj[0].get(\"\") != \"James\" ||\n-\t\t listObj[1].get(\"\") != \"Mary\") {\n-\t\t\tcerr << \"List object parse as wrong value\" << std::endl;\n-\t\t\treturn TestFail;\n+\t\tunsigned int i = 0;\n+\t\tfor (auto &elem : listObj.asList()) {\n+\t\t\tif (i >= listValues.size()) {\n+\t\t\t\tstd::cerr << \"Too many elements in list during iteration\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tstd::string value = listValues[i];\n+\n+\t\t\tif (&elem != &listObj[i]) {\n+\t\t\t\tstd::cerr << \"List element \" << i << \" has wrong address\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tif (elem.get(\"\") != value) {\n+\t\t\t\tstd::cerr << \"List element \" << i << \" has wrong value\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\ti++;\n \t\t}\n \n \t\t/* Test dictionary object */\n@@ -422,18 +447,50 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj.size() != 3) {\n-\t\t\tcerr << \"Dictionary object parse with wrong size\" << std::endl;\n+\t\tstatic constexpr std::array, 3> dictValues{ {\n+\t\t\t{ \"a\", 1 },\n+\t\t\t{ \"c\", 3 },\n+\t\t\t{ \"b\", 2 },\n+\t\t} };\n+\n+\t\tif (dictObj.size() != dictValues.size()) {\n+\t\t\tcerr << \"Dictionary object has wrong size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\ti = 0;\n+\t\tfor (const auto &[key, elem] : dictObj.asDict()) {\n+\t\t\tif (i >= dictValues.size()) {\n+\t\t\t\tstd::cerr << \"Too many elements in dictionary during iteration\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tconst std::pair &value = dictValues[i];\n+\n+\t\t\tif (key != value.first) {\n+\t\t\t\tstd::cerr << \"Dictionary key \" << i << \" has wrong value\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tif (&elem != &dictObj[key]) {\n+\t\t\t\tstd::cerr << \"Dictionary element \" << i << \" has wrong address\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\tif (elem.get(0) != value.second) {\n+\t\t\t\tstd::cerr << \"Dictionary element \" << i << \" has wrong value\"\n+\t\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\n+\t\t\ti++;\n+\t\t}\n+\n \t\tauto memeberNames = dictObj.memberNames();\n \n-\t\tif (memeberNames.size() != 3) {\n-\t\t\tcerr << \"Dictionary object fail to extra member names\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n \t\tif (memeberNames[0] != \"a\" ||\n \t\t memeberNames[1] != \"c\" ||\n \t\t memeberNames[2] != \"b\") {\n@@ -441,13 +498,6 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj[\"a\"].get(0) != 1 ||\n-\t\t dictObj[\"b\"].get(0) != 2 ||\n-\t\t dictObj[\"c\"].get(0) != 3) {\n-\t\t\tcerr << \"Dictionary object fail to parse member value\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n \t\t/* Test leveled objects */\n \t\tauto &level1Obj = (*root)[\"level1\"];\n \n","prefixes":["libcamera-devel","RFC","v2","08/14"]}