{"id":17129,"url":"https://patchwork.libcamera.org/api/patches/17129/?format=json","web_url":"https://patchwork.libcamera.org/patch/17129/","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":"<20220816015414.7462-3-laurent.pinchart@ideasonboard.com>","date":"2022-08-16T01:54:07","name":"[libcamera-devel,v4,2/9] test: yaml-parser: Centralize integer parse checks","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e525a6d2a7faafcc27634403300456784f0e50e2","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/17129/mbox/","series":[{"id":3418,"url":"https://patchwork.libcamera.org/api/series/3418/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3418","date":"2022-08-16T01:54:05","name":"Add DPF tuning support for RkISP1","version":4,"mbox":"https://patchwork.libcamera.org/series/3418/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17129/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17129/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 DE876C3272\n\tfor ;\n\tTue, 16 Aug 2022 01:54:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D443261FC8;\n\tTue, 16 Aug 2022 03:54:32 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 520FE603E3\n\tfor ;\n\tTue, 16 Aug 2022 03:54:31 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D7A65496;\n\tTue, 16 Aug 2022 03:54:30 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660614872;\n\tbh=RFaj1YfbNtPs/J89bCrjLlmBZYKCilVYZMH7MRWeKW0=;\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=d/XAWfWBe2eKCh4kQ6vj3jQX6+Ey+sbtCdssR+ZLKuO0hwpUIhsXAopZJ8ZMZLo01\n\tJQ33JdmyHKH2hr1iiS9GHxbG+p6sbzfYNVR3tTMlZg3tBlcMQNpl8h2MAdWoEN9Ajn\n\tws3WdXkJbkSOFvW0WMOdj3Z6reITwUWrWdm+kCdoK+V5kDC1So1liZHLiTZZ7gKV52\n\tRUuYjf6hRCpLt+mWkdI+0kv1+/0ptFn7hxujvvSeAo4cZfTg7WJ6xTJRtpNY7XnaIN\n\ttFn6Xml0JVXUk8TXVBPF0Yh2Sel/W6/glbonbcmERnAZX4o3SyFFpsSUy6a6uHPCe2\n\tqzZ7y5jtLSARQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660614871;\n\tbh=RFaj1YfbNtPs/J89bCrjLlmBZYKCilVYZMH7MRWeKW0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=UzdhceGpW9lpmc71NLZCHnxBmNsVMfKlqlHscKTZtQzBaP5t7HgzNviIAH78MUt8G\n\tKFf8c/ZMinsDPsjLqlpVk4rAY370dC2UPSQ0O+qM9XDaur6P+iZQyPfkZRLVTuGF+I\n\t5bBziINfsLGFto9M8b7iTMW0uTuKBO67t9xCDORw="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"UzdhceGp\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 16 Aug 2022 04:54:07 +0300","Message-Id":"<20220816015414.7462-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220816015414.7462-1-laurent.pinchart@ideasonboard.com>","References":"<20220816015414.7462-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 2/9] test: yaml-parser: Centralize\n\tinteger parse checks","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":"Centralize the signed and unsigned integer parse checks to avoid code\nduplication. The diffstat isn't very impressive at this point, but this\nwill help more when adding 8-bit and 16-bit integer tests.\n\nSigned-off-by: Laurent Pinchart \n---\n test/yaml-parser.cpp | 86 ++++++++++++++++++++++++--------------------\n 1 file changed, 48 insertions(+), 38 deletions(-)","diff":"diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\nindex 6729e1bd430e..803e70beb782 100644\n--- a/test/yaml-parser.cpp\n+++ b/test/yaml-parser.cpp\n@@ -149,6 +149,52 @@ protected:\n \t\treturn TestPass;\n \t}\n \n+\tint testIntegerObject(const YamlObject &obj, const char *name, Type type,\n+\t\t\t int64_t value)\n+\t{\n+\t\tuint64_t unsignedValue = static_cast(value);\n+\t\tstd::string strValue = std::to_string(value);\n+\t\tbool isSigned = type == Type::Int32;\n+\n+\t\t/* All integers can be parsed as strings or double. */\n+\n+\t\tif (obj.get().value_or(\"\") != strValue ||\n+\t\t obj.get(\"\") != strValue) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" failed to parse as \"\n+\t\t\t\t<< \"string\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (obj.get().value_or(0.0) != value ||\n+\t\t obj.get(0.0) != value) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" failed to parse as \"\n+\t\t\t\t<< \"double\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (obj.get().value_or(0) != value ||\n+\t\t obj.get(0) != value) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" failed to parse as \"\n+\t\t\t\t<< \"int32_t\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!isSigned) {\n+\t\t\tif (obj.get().value_or(0) != unsignedValue ||\n+\t\t\t obj.get(0) != unsignedValue) {\n+\t\t\t\tstd::cerr\n+\t\t\t\t\t<< \"Object \" << name << \" failed to parse as \"\n+\t\t\t\t\t<< \"uint32_t\" << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n \tint run()\n \t{\n \t\t/* Test invalid YAML file */\n@@ -215,23 +261,8 @@ protected:\n \t\tif (testObjectType(int32Obj, \"int32_t\", Type::Int32) != TestPass)\n \t\t\treturn TestFail;\n \n-\t\tif (int32Obj.get().value_or(0) != -100 ||\n-\t\t int32Obj.get(0) != -100) {\n-\t\t\tcerr << \"Integer object parse as wrong value\" << std::endl;\n+\t\tif (testIntegerObject(int32Obj, \"int32_t\", Type::Int32, -100) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (int32Obj.get().value_or(\"\") != \"-100\" ||\n-\t\t int32Obj.get(\"\") != \"-100\") {\n-\t\t\tcerr << \"Integer object fail to parse as string\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (int32Obj.get().value_or(0.0) != -100.0 ||\n-\t\t int32Obj.get(0.0) != -100.0) {\n-\t\t\tcerr << \"Integer object fail to parse as double\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\t/* Test uint32_t object */\n \t\tauto &uint32Obj = (*root)[\"uint32_t\"];\n@@ -239,29 +270,8 @@ protected:\n \t\tif (testObjectType(uint32Obj, \"uint32_t\", Type::UInt32) != TestPass)\n \t\t\treturn TestFail;\n \n-\t\tif (uint32Obj.get().value_or(0) != 100 ||\n-\t\t uint32Obj.get(0) != 100) {\n-\t\t\tcerr << \"Unsigned integer object fail to parse as integer\" << std::endl;\n+\t\tif (testIntegerObject(uint32Obj, \"uint32_t\", Type::UInt32, 100) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (uint32Obj.get().value_or(\"\") != \"100\" ||\n-\t\t uint32Obj.get(\"\") != \"100\") {\n-\t\t\tcerr << \"Unsigned integer object fail to parse as string\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (uint32Obj.get().value_or(0.0) != 100.0 ||\n-\t\t uint32Obj.get(0.0) != 100.0) {\n-\t\t\tcerr << \"Unsigned integer object fail to parse as double\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (uint32Obj.get().value_or(0) != 100 ||\n-\t\t uint32Obj.get(0) != 100) {\n-\t\t\tcerr << \"Unsigned integer object parsed as wrong value\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\t/* Test double value */\n \t\tauto &doubleObj = (*root)[\"double\"];\n","prefixes":["libcamera-devel","v4","2/9"]}