From patchwork Sun Mar 1 19:26:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2953 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E285960429 for ; Sun, 1 Mar 2020 20:26:47 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6104B54A for ; Sun, 1 Mar 2020 20:26:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583090807; bh=ZZ3uVv5o9JYeqnSycgzk6Xtwj05iu9U3XqBjFgoMS/M=; h=From:To:Subject:Date:In-Reply-To:References:From; b=EnnVQEdyo0u2o4PPLyyRNtbu4QYngK8jZiJtAg6Hz/ZjsB5eYpyl04cQpRcbedipt 0yQ/ngwaHAnjQc6+lCCIu6A4Oz+FRjx7VB+x+7lAzxQnSnDDhj/+qK2EgPEdlhKff7 yFp3eptZVEMHXS+B6yzwaDJ/8nTy9qw+UputbIUc= From: Laurent Pinchart 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 Subject: [libcamera-devel] [PATCH 32/31] test: controls: control_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: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2020 19:26:48 -0000 The ControlValueTest hasn't been updated for a long time and is outdated. Improve it to support all control types, and test the type(), isArray() and toString() methods. Signed-off-by: Laurent Pinchart --- src/libcamera/controls.cpp | 2 +- test/controls/control_value.cpp | 110 +++++++++++++++++++++++++------- 2 files changed, 89 insertions(+), 23 deletions(-) diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index a9dfc53e8565..aa3e7a267303 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -202,7 +202,7 @@ std::string ControlValue::toString() const switch (type_) { case ControlTypeBool: { const bool *value = reinterpret_cast(data); - str += *value ? "True" : "False"; + str += *value ? "true" : "false"; break; } case ControlTypeInteger8: { diff --git a/test/controls/control_value.cpp b/test/controls/control_value.cpp index a1ffa842f29e..111b4c5d1a08 100644 --- a/test/controls/control_value.cpp +++ b/test/controls/control_value.cpp @@ -19,46 +19,112 @@ class ControlValueTest : public Test protected: int run() { - ControlValue integer(1234); - ControlValue boolean(true); + /* + * None type. + */ + ControlValue value; + if (!value.isNone() || value.isArray()) { + cerr << "Empty value is non-null" << endl; + return TestFail; + } - /* Just a string conversion output test... no validation */ - cout << "Int: " << integer.toString() - << " Bool: " << boolean.toString() - << endl; + /* + * Bool type. + */ + value.set(true); + if (value.isNone() || value.isArray() || + value.type() != ControlTypeBool) { + cerr << "Control type mismatch after setting to bool" << endl; + return TestFail; + } - if (integer.get() != 1234) { - cerr << "Failed to get Integer" << endl; + if (value.get() != true) { + cerr << "Control value mismatch after setting to bool" << endl; return TestFail; } - if (boolean.get() != true) { - cerr << "Failed to get Boolean" << endl; + if (value.toString() != "true") { + cerr << "Control string mismatch after setting to bool" << endl; return TestFail; } - /* Test an uninitialised value, and updating it. */ + /* + * Integer8 type. + */ + value.set(static_cast(42)); + if (value.isNone() || value.isArray() || + value.type() != ControlTypeInteger8) { + cerr << "Control type mismatch after setting to int8_t" << endl; + return TestFail; + } - ControlValue value; - if (!value.isNone()) { - cerr << "Empty value is non-null" << endl; + if (value.get() != 42) { + cerr << "Control value mismatch after setting to int8_t" << endl; return TestFail; } - value.set(true); - if (value.isNone()) { - cerr << "Failed to set an empty object" << endl; + if (value.toString() != "42") { + cerr << "Control string mismatch after setting to int8_t" << endl; return TestFail; } - if (value.get() != true) { - cerr << "Failed to get Booleans" << endl; + /* + * Integer32 type. + */ + value.set(0x42000000); + if (value.isNone() || value.isArray() || + value.type() != ControlTypeInteger32) { + cerr << "Control type mismatch after setting to int32_t" << endl; + return TestFail; + } + + if (value.get() != 0x42000000) { + cerr << "Control value mismatch after setting to int32_t" << endl; + return TestFail; + } + + if (value.toString() != "1107296256") { + cerr << "Control string mismatch after setting to int32_t" << endl; + return TestFail; + } + + /* + * Integer64 type. + */ + value.set(static_cast(-42)); + if (value.isNone() || value.isArray() || + value.type() != ControlTypeInteger64) { + cerr << "Control type mismatch after setting to int64_t" << endl; + return TestFail; + } + + if (value.get() != -42) { + cerr << "Control value mismatch after setting to int64_t" << endl; + return TestFail; + } + + if (value.toString() != "-42") { + cerr << "Control string mismatch after setting to int64_t" << endl; + return TestFail; + } + + /* + * Float type. + */ + value.set(-0.42f); + if (value.isNone() || value.isArray() || + value.type() != ControlTypeFloat) { + cerr << "Control type mismatch after setting to float" << endl; + return TestFail; + } + + if (value.get() != -0.42f) { + cerr << "Control value mismatch after setting to float" << endl; return TestFail; } - value.set(10); - if (value.get() != 10) { - cerr << "Failed to get Integer" << endl; + if (value.toString() != "-0.420000") { + cerr << "Control string mismatch after setting to float" << endl; return TestFail; }