Patch Detail
Show a patch.
GET /api/patches/16239/?format=api
{ "id": 16239, "url": "https://patchwork.libcamera.org/api/patches/16239/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16239/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220616142403.20723-4-laurent.pinchart@ideasonboard.com>", "date": "2022-06-16T14:23:59", "name": "[libcamera-devel,3/7] test: yaml_parser: Extend tests to cover the iterator API", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d2acb2abbac8c553c4e9e96185dd4ab15705799e", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16239/mbox/", "series": [ { "id": 3181, "url": "https://patchwork.libcamera.org/api/series/3181/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3181", "date": "2022-06-16T14:23:56", "name": "libcamera: yaml_parser: Add iterator API", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3181/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16239/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16239/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 CDFF3C3275\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 16 Jun 2022 14:24:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C7A146563B;\n\tThu, 16 Jun 2022 16:24:23 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4240165635\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 16 Jun 2022 16:24:20 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A61B3415;\n\tThu, 16 Jun 2022 16:24:19 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655389463;\n\tbh=l/IgiffefRYZLY6fMuKPGTjR9AJ3eP6LacrA1gQk1Yc=;\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=STPtpu15iIqr/6mauXJv07yc7bc/Qsd+a4ZN11hrjNAS/U73D+8PcN8f8KgopLqOV\n\tbpzUUSl5jRTie7Gw7e27n+AJh2UaHbjdc4kQXNS796i8CTcpo7PThixznkqcE8+V3E\n\tTH/LE5zVIBO2qc04xMFosv5JNlfwX4BNu96Me/RUz7QTMHYNvMY/OzAnAtG6z1pD0g\n\tEzWOX9i+EJeCTV+51OyGX00+20abd/kJk1ZQR1psx1HFOrvK+1H6aHfQFjLN1V3M6g\n\t379evsWpEZdEpaTOAvv6rRw6HqKjALpZF0fb5wU6YwUr0+p9sw0oYsrvRYGJRQQOZq\n\tYJDsCDuEG3wnw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1655389460;\n\tbh=l/IgiffefRYZLY6fMuKPGTjR9AJ3eP6LacrA1gQk1Yc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HTZBke8bnEAqdckiXUJ6jgl1tR62Gpu3tVAzra9SW4sfcs4HhJZU4tIFvja6Q3yZO\n\tIILDG6MVTuG57AenIYNWsGWi1QR2WQwbmEV/aq/99kr9G8ohpnwmR2xCLZpuzMLAMt\n\tgTeljWlETZFmsrjh5zC2cHJNTH9KtqxLNGS3gAz0=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"HTZBke8b\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 16 Jun 2022 17:23:59 +0300", "Message-Id": "<20220616142403.20723-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20220616142403.20723-1-laurent.pinchart@ideasonboard.com>", "References": "<20220616142403.20723-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 3/7] test: yaml_parser: Extend tests to\n\tcover the iterator API", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Test iteration over lists and dictionaries to test the YamlObject\niterator API.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n test/yaml-parser.cpp | 99 +++++++++++++++++++++++++++++++++++---------\n 1 file changed, 80 insertions(+), 19 deletions(-)", "diff": "diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\nindex 5ff4c3236dbf..ab6e9a01c0fe 100644\n--- a/test/yaml-parser.cpp\n+++ b/test/yaml-parser.cpp\n@@ -5,11 +5,14 @@\n * yaml-parser.cpp - YAML parser operations tests\n */\n \n+#include <array>\n #include <iostream>\n+#include <map>\n #include <string>\n #include <unistd.h>\n \n #include <libcamera/base/file.h>\n+#include <libcamera/base/utils.h>\n \n #include \"libcamera/internal/yaml_parser.h\"\n \n@@ -373,15 +376,39 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj.size() > 2) {\n+\t\tstatic constexpr std::array<const char *, 2> 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<string>(\"\") != \"James\" ||\n-\t\t listObj[1].get<string>(\"\") != \"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<std::string>(\"\") != 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,19 +449,60 @@ 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\tstd::map<std::string, int> dictValues{ {\n+\t\t\t{ \"a\", 1 },\n+\t\t\t{ \"b\", 2 },\n+\t\t\t{ \"c\", 3 },\n+\t\t} };\n+\n+\t\tsize_t dictSize = dictValues.size();\n+\n+\t\tif (dictObj.size() != dictSize) {\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 >= dictSize) {\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 auto item = dictValues.find(key);\n+\t\t\tif (item == dictValues.end()) {\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<int32_t>(0) != item->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\t/*\n+\t\t\t * Erase the item to make sure that each iteration\n+\t\t\t * produces a different value.\n+\t\t\t */\n+\t\t\tdictValues.erase(item);\n+\t\t\ti++;\n+\t\t}\n+\n+\t\t/* Make sure utils::map_keys() works on the adapter. */\n+\t\t(void)utils::map_keys(dictObj.asDict());\n+\n \t\tauto memeberNames = dictObj.memberNames();\n \t\tsort(memeberNames.begin(), memeberNames.end());\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] != \"b\" ||\n \t\t memeberNames[2] != \"c\") {\n@@ -442,13 +510,6 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj[\"a\"].get<int32_t>(0) != 1 ||\n-\t\t dictObj[\"b\"].get<int32_t>(0) != 2 ||\n-\t\t dictObj[\"c\"].get<int32_t>(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", "3/7" ] }