[{"id":3961,"web_url":"https://patchwork.libcamera.org/comment/3961/","msgid":"","date":"2020-03-06T16:06:21","subject":"Re: [libcamera-devel] [PATCH v2 30/32] test: controls:\n\tcontrol_value: Expand test to cover all control types","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 06/03/2020 16:00, Laurent Pinchart wrote:\n> The ControlValueTest hasn't been updated for a long time and is\n> outdated. Improve it to support all control types, and test the type(),\n> isArray() and toString() methods.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> ---\n> Changes since v1:\n> \n> - Move change to ControlValue::toString() to a separate patch\n> ---\n> test/controls/control_value.cpp | 110 +++++++++++++++++++++++++-------\n> 1 file changed, 88 insertions(+), 22 deletions(-)\n> \n> diff --git a/test/controls/control_value.cpp b/test/controls/control_value.cpp\n> index a1ffa842f29e..37f415302ff6 100644\n> --- a/test/controls/control_value.cpp\n> +++ b/test/controls/control_value.cpp\n> @@ -19,46 +19,112 @@ class ControlValueTest : public Test\n> protected:\n> \tint run()\n> \t{\n> -\t\tControlValue integer(1234);\n> -\t\tControlValue boolean(true);\n> +\t\t/*\n> +\t\t * None type.\n> +\t\t */\n> +\t\tControlValue value;\n> +\t\tif (!value.isNone() || value.isArray()) {\n> +\t\t\tcerr << \"Empty value is non-null\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> \n> -\t\t/* Just a string conversion output test... no validation */\n> -\t\tcout << \"Int: \" << integer.toString()\n> -\t\t << \" Bool: \" << boolean.toString()\n> -\t\t << endl;\n> +\t\t/*\n> +\t\t * Bool type.\n> +\t\t */\n> +\t\tvalue.set(true);\n> +\t\tif (value.isNone() || value.isArray() ||\n> +\t\t value.type() != ControlTypeBool) {\n> +\t\t\tcerr << \"Control type mismatch after setting to bool\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> \n> -\t\tif (integer.get() != 1234) {\n> -\t\t\tcerr << \"Failed to get Integer\" << endl;\n> +\t\tif (value.get() != true) {\n> +\t\t\tcerr << \"Control value mismatch after setting to bool\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\tif (boolean.get() != true) {\n> -\t\t\tcerr << \"Failed to get Boolean\" << endl;\n> +\t\tif (value.toString() != \"true\") {\n> +\t\t\tcerr << \"Control string mismatch after setting to bool\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\t/* Test an uninitialised value, and updating it. */\n> +\t\t/*\n> +\t\t * Integer8 type.\n> +\t\t */\n> +\t\tvalue.set(static_cast(42));\n> +\t\tif (value.isNone() || value.isArray() ||\n> +\t\t value.type() != ControlTypeByte) {\n> +\t\t\tcerr << \"Control type mismatch after setting to uint8_t\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> \n> -\t\tControlValue value;\n> -\t\tif (!value.isNone()) {\n> -\t\t\tcerr << \"Empty value is non-null\" << endl;\n> +\t\tif (value.get() != 42) {\n> +\t\t\tcerr << \"Control value mismatch after setting to uint8_t\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\tvalue.set(true);\n> -\t\tif (value.isNone()) {\n> -\t\t\tcerr << \"Failed to set an empty object\" << endl;\n> +\t\tif (value.toString() != \"42\") {\n> +\t\t\tcerr << \"Control string mismatch after setting to uint8_t\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\tif (value.get() != true) {\n> -\t\t\tcerr << \"Failed to get Booleans\" << endl;\n> +\t\t/*\n> +\t\t * Integer32 type.\n> +\t\t */\n> +\t\tvalue.set(0x42000000);\n> +\t\tif (value.isNone() || value.isArray() ||\n> +\t\t value.type() != ControlTypeInteger32) {\n> +\t\t\tcerr << \"Control type mismatch after setting to int32_t\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (value.get() != 0x42000000) {\n> +\t\t\tcerr << \"Control value mismatch after setting to int32_t\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (value.toString() != \"1107296256\") {\n> +\t\t\tcerr << \"Control string mismatch after setting to int32_t\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\t/*\n> +\t\t * Integer64 type.\n> +\t\t */\n> +\t\tvalue.set(static_cast(-42));\n> +\t\tif (value.isNone() || value.isArray() ||\n> +\t\t value.type() != ControlTypeInteger64) {\n> +\t\t\tcerr << \"Control type mismatch after setting to int64_t\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (value.get() != -42) {\n> +\t\t\tcerr << \"Control value mismatch after setting to int64_t\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (value.toString() != \"-42\") {\n> +\t\t\tcerr << \"Control string mismatch after setting to int64_t\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\t/*\n> +\t\t * Float type.\n> +\t\t */\n> +\t\tvalue.set(-0.42f);\n> +\t\tif (value.isNone() || value.isArray() ||\n> +\t\t value.type() != ControlTypeFloat) {\n> +\t\t\tcerr << \"Control type mismatch after setting to float\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (value.get() != -0.42f) {\n> +\t\t\tcerr << \"Control value mismatch after setting to float\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\tvalue.set(10);\n> -\t\tif (value.get() != 10) {\n> -\t\t\tcerr << \"Failed to get Integer\" << endl;\n> +\t\tif (value.toString() != \"-0.420000\") {\n> +\t\t\tcerr << \"Control string mismatch after setting to float\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> \n>","headers":{"Return-Path":"","Received":["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 6A7AA60424\n\tfor ;\n\tFri, 6 Mar 2020 17:06:29 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D369524B;\n\tFri, 6 Mar 2020 17:06:28 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583510789;\n\tbh=zgZZ4Rr8EsmUURJRjzt0l0Ou69pEsNPtbao8ph8rs1k=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=ljaC6xfr7W6XqlaYzrMQAXPUDOfMLnu2X9D88R818hcFq8w73pcDoL+oLs0WmDjor\n\t+wsZiEpizNktTT/5hNfoJ1K9OQBEUdAqtwoV7/ENLBCeCDQ6b4Zz26bX8PBjVO4nnb\n\taDbqF8I2KW131ZYdLDwtuAbBVIVXla5WgeDFcS+M=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200306160002.30549-1-laurent.pinchart@ideasonboard.com>\n\t<20200306160002.30549-31-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Fri, 6 Mar 2020 16:06:21 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200306160002.30549-31-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v2 30/32] test: controls:\n\tcontrol_value: Expand test to cover all control types","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","X-List-Received-Date":"Fri, 06 Mar 2020 16:06:29 -0000"}}]