Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 2953,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/2953/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/2953/",
    "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": "<20200301192619.15644-1-laurent.pinchart@ideasonboard.com>",
    "date": "2020-03-01T19:26:18",
    "name": "[libcamera-devel,32/31] test: controls: control_value: Expand test to cover all control types",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "58a6a633ab8a0bbfac5e1522e2433a05fd54c9cf",
    "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/2953/mbox/",
    "series": [
        {
            "id": 696,
            "url": "https://patchwork.libcamera.org/api/1.1/series/696/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=696",
            "date": "2020-02-29T16:42:23",
            "name": "libcamera: Add support for array controls",
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/696/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/2953/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/2953/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<laurent.pinchart@ideasonboard.com>",
        "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 E285960429\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun,  1 Mar 2020 20:26:47 +0100 (CET)",
            "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6104B54A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun,  1 Mar 2020 20:26:47 +0100 (CET)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583090807;\n\tbh=ZZ3uVv5o9JYeqnSycgzk6Xtwj05iu9U3XqBjFgoMS/M=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=EnnVQEdyo0u2o4PPLyyRNtbu4QYngK8jZiJtAg6Hz/ZjsB5eYpyl04cQpRcbedipt\n\t0yQ/ngwaHAnjQc6+lCCIu6A4Oz+FRjx7VB+x+7lAzxQnSnDDhj/+qK2EgPEdlhKff7\n\tyFp3eptZVEMHXS+B6yzwaDJ/8nTy9qw+UputbIUc=",
        "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Sun,  1 Mar 2020 21:26:18 +0200",
        "Message-Id": "<20200301192619.15644-1-laurent.pinchart@ideasonboard.com>",
        "X-Mailer": "git-send-email 2.24.1",
        "In-Reply-To": "<20200229164254.23604-1-laurent.pinchart@ideasonboard.com>",
        "References": "<20200229164254.23604-1-laurent.pinchart@ideasonboard.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH 32/31] test: controls: control_value:\n\tExpand test to cover all control types",
        "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>",
        "X-List-Received-Date": "Sun, 01 Mar 2020 19:26:48 -0000"
    },
    "content": "The ControlValueTest hasn't been updated for a long time and is\noutdated. Improve it to support all control types, and test the type(),\nisArray() and toString() methods.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/controls.cpp      |   2 +-\n test/controls/control_value.cpp | 110 +++++++++++++++++++++++++-------\n 2 files changed, 89 insertions(+), 23 deletions(-)",
    "diff": "diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex a9dfc53e8565..aa3e7a267303 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -202,7 +202,7 @@ std::string ControlValue::toString() const\n \t\tswitch (type_) {\n \t\tcase ControlTypeBool: {\n \t\t\tconst bool *value = reinterpret_cast<const bool *>(data);\n-\t\t\tstr += *value ? \"True\" : \"False\";\n+\t\t\tstr += *value ? \"true\" : \"false\";\n \t\t\tbreak;\n \t\t}\n \t\tcase ControlTypeInteger8: {\ndiff --git a/test/controls/control_value.cpp b/test/controls/control_value.cpp\nindex a1ffa842f29e..111b4c5d1a08 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<int32_t>() != 1234) {\n-\t\t\tcerr << \"Failed to get Integer\" << endl;\n+\t\tif (value.get<bool>() != 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<bool>() != 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<int8_t>(42));\n+\t\tif (value.isNone() || value.isArray() ||\n+\t\t    value.type() != ControlTypeInteger8) {\n+\t\t\tcerr << \"Control type mismatch after setting to int8_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<int8_t>() != 42) {\n+\t\t\tcerr << \"Control value mismatch after setting to int8_t\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tvalue.set<bool>(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 int8_t\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (value.get<bool>() != 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<int32_t>() != 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<int64_t>(-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<int64_t>() != -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<float>() != -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<int32_t>(10);\n-\t\tif (value.get<int32_t>() != 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",
    "prefixes": [
        "libcamera-devel",
        "32/31"
    ]
}