Patch Detail
Show a patch.
GET /api/1.1/patches/17128/?format=api
{ "id": 17128, "url": "https://patchwork.libcamera.org/api/1.1/patches/17128/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17128/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220816015414.7462-2-laurent.pinchart@ideasonboard.com>", "date": "2022-08-16T01:54:06", "name": "[libcamera-devel,v4,1/9] test: yaml-parser: Simplify code by centralizing parse error checks", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6935ff2980570a51e2349f0a5b155d86446dadea", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17128/mbox/", "series": [ { "id": 3418, "url": "https://patchwork.libcamera.org/api/1.1/series/3418/?format=api", "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/17128/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17128/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 A61B9C3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 16 Aug 2022 01:54:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4FD2461FBC;\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 B985D61FBC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 16 Aug 2022 03:54:29 +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 57E5A496;\n\tTue, 16 Aug 2022 03:54:29 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660614872;\n\tbh=hHJclU+jgLIrh4iJSwZNCcWf+UXGK/ilaMiZ2D55/rk=;\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=kHAvwdI+MmMS884763plKq6gVUNdP05R0hkjKXH1OneIuGSb+WRiY/KXdMoJy6i1G\n\tzF4rQn8ogQO2MfB33fEY1NhT8OeB6ufgXN6Z6Pre0OajFEfVBeNokcPs6SMQNXtHlS\n\tsHBKs3M2NYdf3D13Nyv0nBvFeJk3M8vKoEMRh2ifDWaYSAJTb1/IHwvJY8BYmqEo1i\n\teU+Ia90vGD76aIh5yGxbFvpWC/uXPPTr3aKRJap4hwGc+06MqwrLoalHaxlY8fLQw7\n\ti6EGHiKXwEG3LuUAkbuS4zebOIMFUJSp0fHHAuRIWy3ygmDjkIYKs+W1+ZNJ+XLw4m\n\t54Xi8vG8r7bUA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660614869;\n\tbh=hHJclU+jgLIrh4iJSwZNCcWf+UXGK/ilaMiZ2D55/rk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=u9F4jHEp6melVzXOHNS19HKZ3nsrMyGpUJTtyQ7As43CPIn3ff1PGxXtXTsnxCqC6\n\t9ZXiyFjkdRhCgZToID+/+it1uti3Mr/UmwW6cfTfI9HOjPjJuLKLdgcDaSKTjtddsm\n\tqqLAPtQgHZKRXgsO8NAK8h8tI1ZK65IuQdV4Tw5s=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"u9F4jHEp\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 16 Aug 2022 04:54:06 +0300", "Message-Id": "<20220816015414.7462-2-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 1/9] test: yaml-parser: Simplify code\n\tby centralizing parse error checks", "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": "Centralize most parse failure checks in a single function to avoid a\nlarger number of copies of nearly identical checks.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n test/yaml-parser.cpp | 309 +++++++++++++------------------------------\n 1 file changed, 95 insertions(+), 214 deletions(-)", "diff": "diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\nindex 93ba88b8bcd5..6729e1bd430e 100644\n--- a/test/yaml-parser.cpp\n+++ b/test/yaml-parser.cpp\n@@ -72,6 +72,83 @@ protected:\n \t\treturn TestPass;\n \t}\n \n+\tenum class Type {\n+\t\tString,\n+\t\tInt32,\n+\t\tUInt32,\n+\t\tDouble,\n+\t\tSize,\n+\t\tList,\n+\t\tDictionary,\n+\t};\n+\n+\tint testObjectType(const YamlObject &obj, const char *name, Type type)\n+\t{\n+\t\tbool isList = type == Type::List || type == Type::Size;\n+\t\tbool isScalar = !isList && type != Type::Dictionary;\n+\t\tbool isInteger = type == Type::Int32 || type == Type::UInt32;\n+\t\tbool isSigned = type == Type::Int32;\n+\n+\t\tif ((isScalar && !obj.isValue()) || (!isScalar && obj.isValue())) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" type mismatch when compared to \"\n+\t\t\t\t<< \"value\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif ((isList && !obj.isList()) || (!isList && obj.isList())) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" type mismatch when compared to \"\n+\t\t\t\t<< \"list\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif ((type == Type::Dictionary && !obj.isDictionary()) ||\n+\t\t (type != Type::Dictionary && obj.isDictionary())) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" type mismatch when compared to \"\n+\t\t\t\t<< \"dictionary\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!isScalar && obj.get<std::string>()) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" didn't fail to parse as \"\n+\t\t\t\t<< \"string\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!isInteger && obj.get<int32_t>()) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" didn't fail to parse as \"\n+\t\t\t\t<< \"int32_t\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif ((!isInteger || isSigned) && obj.get<uint32_t>()) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" didn't fail to parse as \"\n+\t\t\t\t<< \"uint32_t\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (!isInteger && type != Type::Double && obj.get<double>()) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" didn't fail to parse as \"\n+\t\t\t\t<< \"double\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tif (type != Type::Size && obj.get<Size>()) {\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Object \" << name << \" didn't fail to parse as \"\n+\t\t\t\t<< \"Size\" << std::endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n \tint run()\n \t{\n \t\t/* Test invalid YAML file */\n@@ -107,58 +184,24 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (!root->contains(\"string\")) {\n-\t\t\tcerr << \"Missing string object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!root->contains(\"double\")) {\n-\t\t\tcerr << \"Missing double object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!root->contains(\"int32_t\")) {\n-\t\t\tcerr << \"Missing int32_t object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!root->contains(\"uint32_t\")) {\n-\t\t\tcerr << \"Missing uint32_t object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!root->contains(\"size\")) {\n-\t\t\tcerr << \"Missing Size object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!root->contains(\"list\")) {\n-\t\t\tcerr << \"Missing list object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!root->contains(\"dictionary\")) {\n-\t\t\tcerr << \"Missing dictionary object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!root->contains(\"level1\")) {\n-\t\t\tcerr << \"Missing leveled object in YAML root\" << std::endl;\n-\t\t\treturn TestFail;\n+\t\tstd::vector<const char *> rootElemNames = {\n+\t\t\t\"string\", \"double\", \"int32_t\", \"uint32_t\", \"size\",\n+\t\t\t\"list\", \"dictionary\", \"level1\",\n+\t\t};\n+\n+\t\tfor (const char *name : rootElemNames) {\n+\t\t\tif (!root->contains(name)) {\n+\t\t\t\tcerr << \"Missing \" << name << \" object in YAML root\"\n+\t\t\t\t << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n \t\t}\n \n \t\t/* Test string object */\n \t\tauto &strObj = (*root)[\"string\"];\n \n-\t\tif (strObj.isDictionary()) {\n-\t\t\tcerr << \"String object parse as Dictionary\" << std::endl;\n+\t\tif (testObjectType(strObj, \"string\", Type::String) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (strObj.isList()) {\n-\t\t\tcerr << \"String object parse as List\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\tif (strObj.get<string>().value_or(\"\") != \"libcamera\" ||\n \t\t strObj.get<string>(\"\") != \"libcamera\") {\n@@ -166,38 +209,11 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (strObj.get<int32_t>()) {\n-\t\t\tcerr << \"String object parse as integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (strObj.get<uint32_t>()) {\n-\t\t\tcerr << \"String object parse as unsigned integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (strObj.get<double>()) {\n-\t\t\tcerr << \"String object parse as double\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (strObj.get<Size>()) {\n-\t\t\tcerr << \"String object parse as Size\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n \t\t/* Test int32_t object */\n \t\tauto &int32Obj = (*root)[\"int32_t\"];\n \n-\t\tif (int32Obj.isDictionary()) {\n-\t\t\tcerr << \"Integer object parse as Dictionary\" << std::endl;\n+\t\tif (testObjectType(int32Obj, \"int32_t\", Type::Int32) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (int32Obj.isList()) {\n-\t\t\tcerr << \"Integer object parse as Integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\tif (int32Obj.get<int32_t>().value_or(0) != -100 ||\n \t\t int32Obj.get<int32_t>(0) != -100) {\n@@ -217,28 +233,11 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (int32Obj.get<uint32_t>()) {\n-\t\t\tcerr << \"Negative integer object parse as unsigned integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (int32Obj.get<Size>()) {\n-\t\t\tcerr << \"Integer object parse as Size\" << 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 \n-\t\tif (uint32Obj.isDictionary()) {\n-\t\t\tcerr << \"Unsigned integer object parse as Dictionary\" << std::endl;\n+\t\tif (testObjectType(uint32Obj, \"uint32_t\", Type::UInt32) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (uint32Obj.isList()) {\n-\t\t\tcerr << \"Unsigned integer object parse as List\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\tif (uint32Obj.get<int32_t>().value_or(0) != 100 ||\n \t\t uint32Obj.get<int32_t>(0) != 100) {\n@@ -264,23 +263,11 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (uint32Obj.get<Size>()) {\n-\t\t\tcerr << \"Unsigned integer object parsed as Size\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n \t\t/* Test double value */\n \t\tauto &doubleObj = (*root)[\"double\"];\n \n-\t\tif (doubleObj.isDictionary()) {\n-\t\t\tcerr << \"Double object parse as Dictionary\" << std::endl;\n+\t\tif (testObjectType(doubleObj, \"double\", Type::Double) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (doubleObj.isList()) {\n-\t\t\tcerr << \"Double object parse as List\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\tif (doubleObj.get<string>().value_or(\"\") != \"3.14159\" ||\n \t\t doubleObj.get<string>(\"\") != \"3.14159\") {\n@@ -294,53 +281,11 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (doubleObj.get<int32_t>()) {\n-\t\t\tcerr << \"Double object parse as integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (doubleObj.get<uint32_t>()) {\n-\t\t\tcerr << \"Double object parse as unsigned integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (doubleObj.get<Size>()) {\n-\t\t\tcerr << \"Double object parse as Size\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n \t\t/* Test Size value */\n \t\tauto &sizeObj = (*root)[\"size\"];\n \n-\t\tif (sizeObj.isDictionary()) {\n-\t\t\tcerr << \"Size object parse as Dictionary\" << std::endl;\n+\t\tif (testObjectType(sizeObj, \"size\", Type::Size) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!sizeObj.isList()) {\n-\t\t\tcerr << \"Size object parse as List\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (sizeObj.get<string>()) {\n-\t\t\tcerr << \"Size object parse as string\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (sizeObj.get<double>()) {\n-\t\t\tcerr << \"Size object parse as double\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (sizeObj.get<int32_t>()) {\n-\t\t\tcerr << \"Size object parse as integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (sizeObj.get<uint32_t>()) {\n-\t\t\tcerr << \"Size object parse as unsigned integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\tif (sizeObj.get<Size>().value_or(Size(0, 0)) != Size(1920, 1080) ||\n \t\t sizeObj.get<Size>(Size(0, 0)) != Size(1920, 1080)) {\n@@ -351,40 +296,8 @@ protected:\n \t\t/* Test list object */\n \t\tauto &listObj = (*root)[\"list\"];\n \n-\t\tif (listObj.isDictionary()) {\n-\t\t\tcerr << \"List object parse as Dictionary\" << std::endl;\n+\t\tif (testObjectType(listObj, \"list\", Type::List) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (!listObj.isList()) {\n-\t\t\tcerr << \"List object fail to parse as List\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (listObj.get<string>()) {\n-\t\t\tcerr << \"List object parse as string\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (listObj.get<double>()) {\n-\t\t\tcerr << \"List object parse as double\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (listObj.get<int32_t>()) {\n-\t\t\tcerr << \"List object parse as integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (listObj.get<uint32_t>()) {\n-\t\t\tcerr << \"List object parse as unsigne integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (listObj.get<Size>()) {\n-\t\t\tcerr << \"String list object parse as Size\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\tstatic constexpr std::array<const char *, 2> listValues{\n \t\t\t\"James\",\n@@ -424,40 +337,8 @@ protected:\n \t\t/* Test dictionary object */\n \t\tauto &dictObj = (*root)[\"dictionary\"];\n \n-\t\tif (!dictObj.isDictionary()) {\n-\t\t\tcerr << \"Dictionary object fail to parse as Dictionary\" << std::endl;\n+\t\tif (testObjectType(dictObj, \"dictionary\", Type::Dictionary) != TestPass)\n \t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (dictObj.isList()) {\n-\t\t\tcerr << \"Dictionary object parse as List\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (dictObj.get<string>()) {\n-\t\t\tcerr << \"Dictionary object parse as string\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (dictObj.get<double>()) {\n-\t\t\tcerr << \"Dictionary object parse as double\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (dictObj.get<int32_t>()) {\n-\t\t\tcerr << \"Dictionary object parse as integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (dictObj.get<uint32_t>()) {\n-\t\t\tcerr << \"Dictionary object parse as unsigned integer\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n-\n-\t\tif (dictObj.get<Size>()) {\n-\t\t\tcerr << \"Dictionary object parse as Size\" << std::endl;\n-\t\t\treturn TestFail;\n-\t\t}\n \n \t\tstatic constexpr std::array<std::pair<const char *, int>, 3> dictValues{ {\n \t\t\t{ \"a\", 1 },\n", "prefixes": [ "libcamera-devel", "v4", "1/9" ] }