[{"id":24268,"web_url":"https://patchwork.libcamera.org/comment/24268/","msgid":"<20220801151228.j6x22zgy2j3dw3ox@uno.localdomain>","date":"2022-08-01T15:12:28","subject":"Re: [libcamera-devel] [PATCH] test: yaml-parser: Test\n\tYamlObject::get(const T &defaultValue)","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent\n\nOn Sat, Jul 30, 2022 at 04:20:27PM +0300, Laurent Pinchart via libcamera-devel wrote:\n> When the YamlObject::get() function override that returns a\n> std::optional got introduced, all tests were moved to it, leaving no\n> tests for the override that takes a default value. Reintroduce those\n> tests.\n>\n> Reported-by: Florian Sylvestre \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> test/yaml-parser.cpp | 33 ++++++++++++++++++++++-----------\n> 1 file changed, 22 insertions(+), 11 deletions(-)\n>\n> diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\n> index 9fd278664b3b..93ba88b8bcd5 100644\n> --- a/test/yaml-parser.cpp\n> +++ b/test/yaml-parser.cpp\n> @@ -160,7 +160,8 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (strObj.get().value_or(\"\") != \"libcamera\") {\n> +\t\tif (strObj.get().value_or(\"\") != \"libcamera\" ||\n> +\t\t strObj.get(\"\") != \"libcamera\") {\n> \t\t\tcerr << \"String object parse as wrong content\" << std::endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -198,17 +199,20 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (int32Obj.get().value_or(0) != -100) {\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\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (int32Obj.get().value_or(\"\") != \"-100\") {\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\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> @@ -236,22 +240,26 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (uint32Obj.get().value_or(0) != 100) {\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\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (uint32Obj.get().value_or(\"\") != \"100\") {\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\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\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> @@ -274,12 +282,14 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (doubleObj.get().value_or(\"\") != \"3.14159\") {\n> +\t\tif (doubleObj.get().value_or(\"\") != \"3.14159\" ||\n> +\t\t doubleObj.get(\"\") != \"3.14159\") {\n> \t\t\tcerr << \"Double object fail to parse as string\" << std::endl;\n> \t\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (doubleObj.get().value_or(0.0) != 3.14159) {\n> +\t\tif (doubleObj.get().value_or(0.0) != 3.14159 ||\n> +\t\t doubleObj.get(0.0) != 3.14159) {\n> \t\t\tcerr << \"Double object parse as wrong value\" << std::endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -332,7 +342,8 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n>\n> -\t\tif (sizeObj.get().value_or(Size(0, 0)) != Size(1920, 1080)) {\n> +\t\tif (sizeObj.get().value_or(Size(0, 0)) != Size(1920, 1080) ||\n> +\t\t sizeObj.get(Size(0, 0)) != Size(1920, 1080)) {\n> \t\t\tcerr << \"Size object parse as wrong value\" << std::endl;\n> \t\t\treturn TestFail;\n> \t\t}\n>\n> base-commit: 69ae75b0cc211f82665b3e92fb3de64a9852b403\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","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 B8382BE173\n\tfor ;\n\tMon, 1 Aug 2022 15:12:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 21E736330F;\n\tMon, 1 Aug 2022 17:12:33 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::225])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0A186603E8\n\tfor ;\n\tMon, 1 Aug 2022 17:12:31 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 0F1BD1C0011;\n\tMon, 1 Aug 2022 15:12:29 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659366753;\n\tbh=TJfI2ESzyGFpOe5eGPpdAzbXaCPoNx77gRbDXJAhTkQ=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=xZQ54raIR4zf2WJKt2AesVHRkjyb27/gDF6oPm8SZCPuqNsVTMGOoapm9y+upxPt7\n\tT/9ROyLE7v3LoF6wFNRRf/NtW4bZU1v3Mscek0DJOzF5Nqw3q7bolessYU9YMVIZR5\n\tkO47CbcunvAOKGTbXzJeLFBDs/uwzuWmojY5Kg2AA2EQdPg+Ne9qc4LmBRqodjYlLw\n\t1rPzefmD9MrZ4Nf4JJLjOUmbv6TT5eCLbueARO+f8Zu/rRETQYQkRsV5U7XnTWuluh\n\twBEOtq91TLkGNTSdawBoSHy2DbUvPPEQ8EOTdewzkYnFzexhI8PJT8kin91TSLbXRq\n\t8bmj6SbDssztw==","Date":"Mon, 1 Aug 2022 17:12:28 +0200","To":"Laurent Pinchart ","Message-ID":"<20220801151228.j6x22zgy2j3dw3ox@uno.localdomain>","References":"<20220730132027.20679-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220730132027.20679-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] test: yaml-parser: Test\n\tYamlObject::get(const T &defaultValue)","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":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":24271,"web_url":"https://patchwork.libcamera.org/comment/24271/","msgid":"<165936759936.1519432.11609356920688359765@Monstersaurus>","date":"2022-08-01T15:26:39","subject":"Re: [libcamera-devel] [PATCH] test: yaml-parser: Test\n\tYamlObject::get(const T &defaultValue)","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart via libcamera-devel (2022-07-30 14:20:27)\n> When the YamlObject::get() function override that returns a\n> std::optional got introduced, all tests were moved to it, leaving no\n> tests for the override that takes a default value. Reintroduce those\n> tests.\n> \n> Reported-by: Florian Sylvestre \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n> ---\n> test/yaml-parser.cpp | 33 ++++++++++++++++++++++-----------\n> 1 file changed, 22 insertions(+), 11 deletions(-)\n> \n> diff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\n> index 9fd278664b3b..93ba88b8bcd5 100644\n> --- a/test/yaml-parser.cpp\n> +++ b/test/yaml-parser.cpp\n> @@ -160,7 +160,8 @@ protected:\n> return TestFail;\n> }\n> \n> - if (strObj.get().value_or(\"\") != \"libcamera\") {\n> + if (strObj.get().value_or(\"\") != \"libcamera\" ||\n> + strObj.get(\"\") != \"libcamera\") {\n> cerr << \"String object parse as wrong content\" << std::endl;\n> return TestFail;\n> }\n> @@ -198,17 +199,20 @@ protected:\n> return TestFail;\n> }\n> \n> - if (int32Obj.get().value_or(0) != -100) {\n> + if (int32Obj.get().value_or(0) != -100 ||\n> + int32Obj.get(0) != -100) {\n> cerr << \"Integer object parse as wrong value\" << std::endl;\n> return TestFail;\n> }\n> \n> - if (int32Obj.get().value_or(\"\") != \"-100\") {\n> + if (int32Obj.get().value_or(\"\") != \"-100\" ||\n> + int32Obj.get(\"\") != \"-100\") {\n> cerr << \"Integer object fail to parse as string\" << std::endl;\n> return TestFail;\n> }\n> \n> - if (int32Obj.get().value_or(0.0) != -100.0) {\n> + if (int32Obj.get().value_or(0.0) != -100.0 ||\n> + int32Obj.get(0.0) != -100.0) {\n> cerr << \"Integer object fail to parse as double\" << std::endl;\n> return TestFail;\n> }\n> @@ -236,22 +240,26 @@ protected:\n> return TestFail;\n> }\n> \n> - if (uint32Obj.get().value_or(0) != 100) {\n> + if (uint32Obj.get().value_or(0) != 100 ||\n> + uint32Obj.get(0) != 100) {\n> cerr << \"Unsigned integer object fail to parse as integer\" << std::endl;\n> return TestFail;\n> }\n> \n> - if (uint32Obj.get().value_or(\"\") != \"100\") {\n> + if (uint32Obj.get().value_or(\"\") != \"100\" ||\n> + uint32Obj.get(\"\") != \"100\") {\n> cerr << \"Unsigned integer object fail to parse as string\" << std::endl;\n> return TestFail;\n> }\n> \n> - if (uint32Obj.get().value_or(0.0) != 100.0) {\n> + if (uint32Obj.get().value_or(0.0) != 100.0 ||\n> + uint32Obj.get(0.0) != 100.0) {\n> cerr << \"Unsigned integer object fail to parse as double\" << std::endl;\n> return TestFail;\n> }\n> \n> - if (uint32Obj.get().value_or(0) != 100) {\n> + if (uint32Obj.get().value_or(0) != 100 ||\n> + uint32Obj.get(0) != 100) {\n> cerr << \"Unsigned integer object parsed as wrong value\" << std::endl;\n> return TestFail;\n> }\n> @@ -274,12 +282,14 @@ protected:\n> return TestFail;\n> }\n> \n> - if (doubleObj.get().value_or(\"\") != \"3.14159\") {\n> + if (doubleObj.get().value_or(\"\") != \"3.14159\" ||\n> + doubleObj.get(\"\") != \"3.14159\") {\n> cerr << \"Double object fail to parse as string\" << std::endl;\n> return TestFail;\n> }\n> \n> - if (doubleObj.get().value_or(0.0) != 3.14159) {\n> + if (doubleObj.get().value_or(0.0) != 3.14159 ||\n> + doubleObj.get(0.0) != 3.14159) {\n> cerr << \"Double object parse as wrong value\" << std::endl;\n> return TestFail;\n> }\n> @@ -332,7 +342,8 @@ protected:\n> return TestFail;\n> }\n> \n> - if (sizeObj.get().value_or(Size(0, 0)) != Size(1920, 1080)) {\n> + if (sizeObj.get().value_or(Size(0, 0)) != Size(1920, 1080) ||\n> + sizeObj.get(Size(0, 0)) != Size(1920, 1080)) {\n> cerr << \"Size object parse as wrong value\" << std::endl;\n> return TestFail;\n> }\n> \n> base-commit: 69ae75b0cc211f82665b3e92fb3de64a9852b403\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","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 3E947BE173\n\tfor ;\n\tMon, 1 Aug 2022 15:26:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 95F7F63312;\n\tMon, 1 Aug 2022 17:26:44 +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 04A17603E8\n\tfor ;\n\tMon, 1 Aug 2022 17:26:42 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6F5A848F;\n\tMon, 1 Aug 2022 17:26:42 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659367604;\n\tbh=dEQrAIuuIwmhr3QsJZoSB44dOTqHCmAAaR+z/vvrbIg=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=u6mjQLgwK4f7/AGF2ep6Tl+7KzN/p6BQNFs282MRPB6NNcezNE6MiGbdn++GzkWaz\n\tREJIPM/tRNae8WFo0NEgRqJnxIFBJkGuxASy9Bn5Z7EOUI8wvbrz8K1S02e80zVJAv\n\t2kcZIV85BMlezgL5ZoG+smUoKiG6jzxEZrWpS4V5UAAtp0PZ6+bFnukiHQt0Bq/TDW\n\tPpdF5ImfW/4yqE8ZOJspeuDJvCTtkA+YMrP/xRrJixhY7zDATLJYblZTOrW7mHwIzC\n\tzEM7bGysEXVXefrRvXhByIPUt3U+wvp1169ah5csGNMq7fSrUggLEtGYECiXPfOSsR\n\tOAEvtAQoHZukA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1659367602;\n\tbh=dEQrAIuuIwmhr3QsJZoSB44dOTqHCmAAaR+z/vvrbIg=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=NW6fqLHBgjafnbzTAGchfbuzL4Ja05cgMCQumUjAUF1dbWzEvqD9o/5gpc57VZhvr\n\t0PwHZWBi2VZppGv6Ix2pTDW0o9FCpDn+NcrsHwhima3GF7VVcTIi9J9IKZ9NvkaTwq\n\tPmERUmYUQ5LgLtkCdqdz852eiy5YH6f6bM7H0M1M="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"NW6fqLHB\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20220730132027.20679-1-laurent.pinchart@ideasonboard.com>","References":"<20220730132027.20679-1-laurent.pinchart@ideasonboard.com>","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 01 Aug 2022 16:26:39 +0100","Message-ID":"<165936759936.1519432.11609356920688359765@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH] test: yaml-parser: Test\n\tYamlObject::get(const T &defaultValue)","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":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]