{"id":26470,"url":"https://patchwork.libcamera.org/api/patches/26470/?format=json","web_url":"https://patchwork.libcamera.org/patch/26470/","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":"<20260407153427.1825999-31-laurent.pinchart@ideasonboard.com>","date":"2026-04-07T15:34:15","name":"[v2,30/42] test: yaml-parser: Replace \"object\" with \"node\"","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e44873aca0a2df0338de674fc9dd0e28ad4cf844","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/26470/mbox/","series":[{"id":5873,"url":"https://patchwork.libcamera.org/api/series/5873/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5873","date":"2026-04-07T15:33:45","name":"libcamera: Global configuration file improvements","version":2,"mbox":"https://patchwork.libcamera.org/series/5873/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26470/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26470/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 74A25C32F6\n\tfor ;\n\tTue, 7 Apr 2026 15:35:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 11FD462E49;\n\tTue, 7 Apr 2026 17:35:17 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ED12762E34\n\tfor ;\n\tTue, 7 Apr 2026 17:35:09 +0200 (CEST)","from killaraus.ideasonboard.com\n\t(2001-14ba-703d-e500--2a1.rev.dnainternet.fi\n\t[IPv6:2001:14ba:703d:e500::2a1])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 632FA6A6\n\tfor ;\n\tTue, 7 Apr 2026 17:33:42 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Kw2yoNGS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1775576022;\n\tbh=iAl7Uhf4ozNMtd1aKDUtx6PDQo9FCvFjccikshDLOhc=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Kw2yoNGShZ3T4VrBigHDU5WUA7tFIvFyjrPNDKfXLV8kHUPoRKj29lMmpPp8X6y54\n\tktshTXO8ER5ZqO3Ginxj6oxP3xZP73Z1PP/drem0LTr5/0WKgwzSuIRQeGqJ5RKIc6\n\tlAgU4ApwKFJ98hsIiLH1uU7TGFZhjIG2/EY3JSs0=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 30/42] test: yaml-parser: Replace \"object\" with \"node\"","Date":"Tue, 7 Apr 2026 18:34:15 +0300","Message-ID":"<20260407153427.1825999-31-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260407153427.1825999-1-laurent.pinchart@ideasonboard.com>","References":"<20260407153427.1825999-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that the storage class for the property tree storing data parsed\nfrom YAML has been renamed from YamlObject to ValueNode, rename\nvariables and update error messages accordingly.\n\nSigned-off-by: Laurent Pinchart \n---\n test/yaml-parser.cpp | 32 ++++++++++++++++----------------\n 1 file changed, 16 insertions(+), 16 deletions(-)","diff":"diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\nindex e8fd9ad61cd0..c8ef51fe18aa 100644\n--- a/test/yaml-parser.cpp\n+++ b/test/yaml-parser.cpp\n@@ -151,7 +151,7 @@ protected:\n \t\t}\n \n \t\t/* Test list node. */\n-\t\tauto &listObj = (*root)[\"list\"];\n+\t\tauto &listNode = (*root)[\"list\"];\n \n \t\tstatic constexpr std::array listValues{\n \t\t\t\"libcamera\",\n@@ -159,13 +159,13 @@ protected:\n \t\t\t\"\",\n \t\t};\n \n-\t\tif (listObj.size() != listValues.size()) {\n-\t\t\tstd::cerr << \"List object parsed with wrong size\" << std::endl;\n+\t\tif (listNode.size() != listValues.size()) {\n+\t\t\tstd::cerr << \"List node parsed with wrong size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n \t\tunsigned int i = 0;\n-\t\tfor (auto &elem : listObj.asList()) {\n+\t\tfor (auto &elem : listNode.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@@ -174,7 +174,7 @@ protected:\n \n \t\t\tstd::string value = listValues[i];\n \n-\t\t\tif (&elem != &listObj[i]) {\n+\t\t\tif (&elem != &listNode[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@@ -190,32 +190,32 @@ protected:\n \t\t}\n \n \t\t/* Ensure that empty list elements get parsed as empty strings. */\n-\t\tif (!listObj[2].isValue()) {\n+\t\tif (!listNode[2].isValue()) {\n \t\t\tstd::cerr << \"Empty list element is not a value\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n \t\t/* Test nested nodes. */\n-\t\tauto &level1Obj = (*root)[\"level1\"];\n+\t\tauto &level1Node = (*root)[\"level1\"];\n \n-\t\tif (!level1Obj.isDictionary()) {\n-\t\t\tstd::cerr << \"level1 object fail to parse as Dictionary\" << std::endl;\n+\t\tif (!level1Node.isDictionary()) {\n+\t\t\tstd::cerr << \"level1 node fail to parse as Dictionary\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tauto &level2Obj = level1Obj[\"level2\"];\n+\t\tauto &level2Node = level1Node[\"level2\"];\n \n-\t\tif (!level2Obj.isList() || level2Obj.size() != 2) {\n-\t\t\tstd::cerr << \"level2 object should be a 2 elements list\" << std::endl;\n+\t\tif (!level2Node.isList() || level2Node.size() != 2) {\n+\t\t\tstd::cerr << \"level2 node should be a 2 elements list\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tauto &firstElement = level2Obj[0];\n+\t\tauto &firstElement = level2Node[0];\n \t\tif (!firstElement.isList() ||\n \t\t firstElement.size() != 2 ||\n \t\t firstElement[0].get(0) != 1 ||\n \t\t firstElement[1].get(0) != 2) {\n-\t\t\tstd::cerr << \"The first element of level2 object fail to parse as integer list\" << std::endl;\n+\t\t\tstd::cerr << \"The first element of level2 node fail to parse as integer list\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n@@ -225,13 +225,13 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tauto &secondElement = level2Obj[1];\n+\t\tauto &secondElement = level2Node[1];\n \t\tif (!secondElement.isDictionary() ||\n \t\t !secondElement.contains(\"one\") ||\n \t\t !secondElement.contains(\"two\") ||\n \t\t secondElement[\"one\"].get(0) != 1 ||\n \t\t secondElement[\"two\"].get(0) != 2) {\n-\t\t\tstd::cerr << \"The second element of level2 object fail to parse as dictionary\" << std::endl;\n+\t\t\tstd::cerr << \"The second element of level2 node fail to parse as dictionary\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n","prefixes":["v2","30/42"]}