From patchwork Tue Mar 2 09:33:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11430 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 90A67BD808 for ; Tue, 2 Mar 2021 09:33:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5EBCB68A9A; Tue, 2 Mar 2021 10:33:31 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="pf8aMMli"; dkim-atps=neutral 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 C4CB960106 for ; Tue, 2 Mar 2021 10:33:30 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 286A645D; Tue, 2 Mar 2021 10:33:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1614677610; bh=8sgtLgL4swxuvakYSLDf/s2zyJZvBRFOChk+6ltursk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pf8aMMli6vDauEcl6LCaHj5OdYz2LWFx0t+l2wn475M+GS0JpsMWe2Ol8lRhiHhcq fsS1xZaJIaljQo2qhdugSKUK0vafCcuH7i8+1865FyiuZPuiGRm9yIfGP6d37jauSQ FTL2NbUlW0HwK002Ppr9K3tkHCmPb2KO+Mp6PhSk= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 2 Mar 2021 18:33:16 +0900 Message-Id: <20210302093318.437308-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210302093318.437308-1-paul.elder@ideasonboard.com> References: <20210302093318.437308-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v10 1/3] tests: Add IPADataSerializer test 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Test the IPADataSerializer for controls, vectors, maps, and PODs of built-in types. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- Changes in v10: - add all std:: for real - remove #include Changes in v9: - convert C-style macros to C++ templates - simplify (aka remove) the custom map/vector comparators - remove dependency on the raspberrypi header, and create our own testing ControlInfoMap - reduce the size of the string for testing serializing big objects No change in v8 Changes in v7: - remove printing values of vectors/maps - simplify map and vector equality check - return immediately on the first failure Changes in v6: - no longer need to initialize rpi ControlInfoMap - no longer need to pass ControlInfoMap to the ControlList serializer Changes in v5: - use ControlInfoMap serializer instead of const ControlInfoMap serializer Changes in v4: - use RPi::controls instead RPi::Controls Changes in v3: - use re-namespaced RPi::Controls New in v2 --- .../ipa_data_serializer_test.cpp | 439 ++++++++++++++++++ test/serialization/meson.build | 1 + 2 files changed, 440 insertions(+) create mode 100644 test/serialization/ipa_data_serializer_test.cpp diff --git a/test/serialization/ipa_data_serializer_test.cpp b/test/serialization/ipa_data_serializer_test.cpp new file mode 100644 index 00000000..dbbba891 --- /dev/null +++ b/test/serialization/ipa_data_serializer_test.cpp @@ -0,0 +1,439 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2020, Google Inc. + * + * ipa_data_serializer_test.cpp - Test serializing/deserializing with IPADataSerializer + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_data_serializer.h" +#include "libcamera/internal/ipa_manager.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" + +#include "serialization_test.h" +#include "test.h" + +using namespace std; +using namespace libcamera; + +static const ControlInfoMap Controls = { + { &controls::AeEnable, ControlInfo(false, true) }, + { &controls::ExposureTime, ControlInfo(0, 999999) }, + { &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) }, + { &controls::ColourGains, ControlInfo(0.0f, 32.0f) }, + { &controls::Brightness, ControlInfo(-1.0f, 1.0f) }, +}; + +namespace libcamera { + +static bool operator==(const ControlInfoMap &lhs, const ControlInfoMap &rhs) +{ + return SerializationTest::equals(lhs, rhs); +} + +} /* namespace libcamera */ + +template +int testPodSerdes(T in) +{ + std::vector buf; + std::vector fds; + + std::tie(buf, fds) = IPADataSerializer::serialize(in); + T out = IPADataSerializer::deserialize(buf, fds); + if (in == out) + return TestPass; + + char *name = abi::__cxa_demangle(typeid(T).name(), nullptr, + nullptr, nullptr); + cerr << "Deserialized " << name << " doesn't match original" << endl; + free(name); + return TestFail; +} + +template +int testVectorSerdes(const std::vector &in, + ControlSerializer *cs = nullptr) +{ + std::vector buf; + std::vector fds; + + std::tie(buf, fds) = IPADataSerializer>::serialize(in, cs); + std::vector out = IPADataSerializer>::deserialize(buf, fds, cs); + if (in == out) + return TestPass; + + char *name = abi::__cxa_demangle(typeid(T).name(), nullptr, + nullptr, nullptr); + cerr << "Deserialized std::vector<" << name + << "> doesn't match original" << endl; + free(name); + return TestFail; +} + +template +int testMapSerdes(const std::map &in, + ControlSerializer *cs = nullptr) +{ + std::vector buf; + std::vector fds; + + std::tie(buf, fds) = IPADataSerializer>::serialize(in, cs); + std::map out = IPADataSerializer>::deserialize(buf, fds, cs); + if (in == out) + return TestPass; + + char *nameK = abi::__cxa_demangle(typeid(K).name(), nullptr, + nullptr, nullptr); + char *nameV = abi::__cxa_demangle(typeid(V).name(), nullptr, + nullptr, nullptr); + cerr << "Deserialized std::map<" << nameK << ", " << nameV + << "> doesn't match original" << endl; + free(nameK); + free(nameV); + return TestFail; +} + +class IPADataSerializerTest : public CameraTest, public Test +{ +public: + IPADataSerializerTest() + : CameraTest("platform/vimc.0 Sensor B") + { + } + +protected: + int init() override + { + return status_; + } + + int run() override + { + int ret; + + ret = testControls(); + if (ret != TestPass) + return ret; + + ret = testVector(); + if (ret != TestPass) + return ret; + + ret = testMap(); + if (ret != TestPass) + return ret; + + ret = testPod(); + if (ret != TestPass) + return ret; + + return TestPass; + } + +private: + ControlList generateControlList(const ControlInfoMap &infoMap) + { + /* Create a control list with three controls. */ + ControlList list(infoMap); + + list.set(controls::Brightness, 0.5f); + list.set(controls::Contrast, 1.2f); + list.set(controls::Saturation, 0.2f); + + return list; + } + + int testControls() + { + ControlSerializer cs; + + const ControlInfoMap &infoMap = camera_->controls(); + ControlList list = generateControlList(infoMap); + + std::vector infoMapBuf; + std::tie(infoMapBuf, std::ignore) = + IPADataSerializer::serialize(infoMap, &cs); + + std::vector listBuf; + std::tie(listBuf, std::ignore) = + IPADataSerializer::serialize(list, &cs); + + const ControlInfoMap infoMapOut = + IPADataSerializer::deserialize(infoMapBuf, &cs); + + ControlList listOut = IPADataSerializer::deserialize(listBuf, &cs); + + if (!SerializationTest::equals(infoMap, infoMapOut)) { + cerr << "Deserialized map doesn't match original" << endl; + return TestFail; + } + + if (!SerializationTest::equals(list, listOut)) { + cerr << "Deserialized list doesn't match original" << endl; + return TestFail; + } + + return TestPass; + } + + int testVector() + { + ControlSerializer cs; + + /* + * We don't test FileDescriptor serdes because it dup()s, so we + * can't check for equality. + */ + std::vector vecUint8 = { 1, 2, 3, 4, 5, 6 }; + std::vector vecUint16 = { 1, 2, 3, 4, 5, 6 }; + std::vector vecUint32 = { 1, 2, 3, 4, 5, 6 }; + std::vector vecUint64 = { 1, 2, 3, 4, 5, 6 }; + std::vector vecInt8 = { 1, 2, 3, -4, 5, -6 }; + std::vector vecInt16 = { 1, 2, 3, -4, 5, -6 }; + std::vector vecInt32 = { 1, 2, 3, -4, 5, -6 }; + std::vector vecInt64 = { 1, 2, 3, -4, 5, -6 }; + std::vector vecFloat = { 1.1, 2.2, 3.3, -4.4, 5.5, -6.6 }; + std::vector vecDouble = { 1.1, 2.2, 3.3, -4.4, 5.5, -6.6 }; + std::vector vecBool = { true, true, false, false, true, false }; + std::vector vecString = { "foo", "bar", "baz" }; + std::vector vecControlInfoMap = { + camera_->controls(), + Controls, + }; + + std::vector buf; + std::vector fds; + + if (testVectorSerdes(vecUint8) != TestPass) + return TestFail; + + if (testVectorSerdes(vecUint16) != TestPass) + return TestFail; + + if (testVectorSerdes(vecUint32) != TestPass) + return TestFail; + + if (testVectorSerdes(vecUint64) != TestPass) + return TestFail; + + if (testVectorSerdes(vecInt8) != TestPass) + return TestFail; + + if (testVectorSerdes(vecInt16) != TestPass) + return TestFail; + + if (testVectorSerdes(vecInt32) != TestPass) + return TestFail; + + if (testVectorSerdes(vecInt64) != TestPass) + return TestFail; + + if (testVectorSerdes(vecFloat) != TestPass) + return TestFail; + + if (testVectorSerdes(vecDouble) != TestPass) + return TestFail; + + if (testVectorSerdes(vecBool) != TestPass) + return TestFail; + + if (testVectorSerdes(vecString) != TestPass) + return TestFail; + + if (testVectorSerdes(vecControlInfoMap, &cs) != TestPass) + return TestFail; + + return TestPass; + } + + int testMap() + { + ControlSerializer cs; + + /* + * Realistically, only string and integral keys. + * Test simple, complex, and nested compound value. + */ + std::map mapUintStr = + { { 101, "foo" }, { 102, "bar" }, { 103, "baz" } }; + std::map mapIntStr = + { { 101, "foo" }, { -102, "bar" }, { -103, "baz" } }; + std::map mapStrStr = + { { "a", "foo" }, { "b", "bar" }, { "c", "baz" } }; + std::map mapUintCIM = + { { 201, camera_->controls() }, { 202, Controls } }; + std::map mapIntCIM = + { { 201, camera_->controls() }, { -202, Controls } }; + std::map mapStrCIM = + { { "a", camera_->controls() }, { "b", Controls } }; + std::map> mapUintBVec = + { { 301, { 1, 2, 3 } }, { 302, { 4, 5, 6 } }, { 303, { 7, 8, 9 } } }; + std::map> mapIntBVec = + { { 301, { 1, 2, 3 } }, { -302, { 4, 5, 6} }, { -303, { 7, 8, 9 } } }; + std::map> mapStrBVec = + { { "a", { 1, 2, 3 } }, { "b", { 4, 5, 6 } }, { "c", { 7, 8, 9 } } }; + + std::vector buf; + std::vector fds; + + if (testMapSerdes(mapUintStr) != TestPass) + return TestFail; + + if (testMapSerdes(mapIntStr) != TestPass) + return TestFail; + + if (testMapSerdes(mapStrStr) != TestPass) + return TestFail; + + if (testMapSerdes(mapUintCIM, &cs) != TestPass) + return TestFail; + + if (testMapSerdes(mapIntCIM, &cs) != TestPass) + return TestFail; + + if (testMapSerdes(mapStrCIM, &cs) != TestPass) + return TestFail; + + if (testMapSerdes(mapUintBVec) != TestPass) + return TestFail; + + if (testMapSerdes(mapIntBVec) != TestPass) + return TestFail; + + if (testMapSerdes(mapStrBVec) != TestPass) + return TestFail; + + return TestPass; + } + + int testPod() + { + uint32_t u32min = std::numeric_limits::min(); + uint32_t u32max = std::numeric_limits::max(); + uint32_t u32one = 1; + int32_t i32min = std::numeric_limits::min(); + int32_t i32max = std::numeric_limits::max(); + int32_t i32one = 1; + + uint64_t u64min = std::numeric_limits::min(); + uint64_t u64max = std::numeric_limits::max(); + uint64_t u64one = 1; + int64_t i64min = std::numeric_limits::min(); + int64_t i64max = std::numeric_limits::max(); + int64_t i64one = 1; + + float flow = std::numeric_limits::lowest(); + float fmin = std::numeric_limits::min(); + float fmax = std::numeric_limits::max(); + float falmostOne = 1 + 1.0e-37; + double dlow = std::numeric_limits::lowest(); + double dmin = std::numeric_limits::min(); + double dmax = std::numeric_limits::max(); + double dalmostOne = 1 + 1.0e-307; + + bool t = true; + bool f = false; + + std::stringstream ss; + for (unsigned int i = 0; i < (1 << 11); i++) + ss << "0123456789"; + + std::string strLong = ss.str(); + std::string strEmpty = ""; + + std::vector buf; + std::vector fds; + + if (testPodSerdes(u32min) != TestPass) + return TestFail; + + if (testPodSerdes(u32max) != TestPass) + return TestFail; + + if (testPodSerdes(u32one) != TestPass) + return TestFail; + + if (testPodSerdes(i32min) != TestPass) + return TestFail; + + if (testPodSerdes(i32max) != TestPass) + return TestFail; + + if (testPodSerdes(i32one) != TestPass) + return TestFail; + + if (testPodSerdes(u64min) != TestPass) + return TestFail; + + if (testPodSerdes(u64max) != TestPass) + return TestFail; + + if (testPodSerdes(u64one) != TestPass) + return TestFail; + + if (testPodSerdes(i64min) != TestPass) + return TestFail; + + if (testPodSerdes(i64max) != TestPass) + return TestFail; + + if (testPodSerdes(i64one) != TestPass) + return TestFail; + + if (testPodSerdes(flow) != TestPass) + return TestFail; + + if (testPodSerdes(fmin) != TestPass) + return TestFail; + + if (testPodSerdes(fmax) != TestPass) + return TestFail; + + if (testPodSerdes(falmostOne) != TestPass) + return TestFail; + + if (testPodSerdes(dlow) != TestPass) + return TestFail; + + if (testPodSerdes(dmin) != TestPass) + return TestFail; + + if (testPodSerdes(dmax) != TestPass) + return TestFail; + + if (testPodSerdes(dalmostOne) != TestPass) + return TestFail; + + if (testPodSerdes(t) != TestPass) + return TestFail; + + if (testPodSerdes(f) != TestPass) + return TestFail; + + if (testPodSerdes(strLong) != TestPass) + return TestFail; + + if (testPodSerdes(strEmpty) != TestPass) + return TestFail; + + return TestPass; + } +}; + +TEST_REGISTER(IPADataSerializerTest) diff --git a/test/serialization/meson.build b/test/serialization/meson.build index 6fc54f6b..a4636337 100644 --- a/test/serialization/meson.build +++ b/test/serialization/meson.build @@ -2,6 +2,7 @@ serialization_tests = [ ['control_serialization', 'control_serialization.cpp'], + ['ipa_data_serializer_test', 'ipa_data_serializer_test.cpp'], ] foreach t : serialization_tests From patchwork Tue Mar 2 09:33:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11431 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 783E2BD808 for ; Tue, 2 Mar 2021 09:33:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4357768A97; Tue, 2 Mar 2021 10:33:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MKzKcrRh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3B62860106 for ; Tue, 2 Mar 2021 10:33:35 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7A4398F3; Tue, 2 Mar 2021 10:33:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1614677614; bh=SHTTcwqtT5hWucqeGCz52gCAq7U5+I7JBrqJrb2Qytk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MKzKcrRhOciqnfC7ZZjYtZcNRuc/yGJ1d5eoBPkanivFopfA5c4Ie95S2rdY06t1U 69QjwOn56gyHLXyfwRT+x0JjnAQphVGfX1UQdq1hClml8rCgEEk4/VIUPymNK7e/Ka snQnXgzWsEj1sinr/x0WtMLwAqih4bXgs6Zx6B9s= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 2 Mar 2021 18:33:18 +0900 Message-Id: <20210302093318.437308-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210302093318.437308-1-paul.elder@ideasonboard.com> References: <20210302093318.437308-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v10 3/3] tests: Test IPA serializer generation 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a test to confirm that serializer and header generation works properly for mojom definition files, and that the serializer works properly. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- Changes in v10: - move test.mojom to a subdirectory in the test directory for clean including - rename everything vimc to test (for real) Changes in v9: - rename everything vimc to test - add std:: to vectors and ties No change in v8 Changes in v7: - add test to test serdes of a vector of *generated* structs Changes in v6: - use namespacing in the mojom file, and in the test - add the enum to the test mojom file, as vimc.h no longer exists Changes in v5: - add dummy event to event interface New in v4 --- .../generated_serializer_test.cpp | 156 ++++++++++++++++++ .../include/libcamera/ipa/meson.build | 40 +++++ .../include/libcamera/ipa/test.mojom | 33 ++++ .../generated_serializer/meson.build | 19 +++ test/serialization/meson.build | 2 + 5 files changed, 250 insertions(+) create mode 100644 test/serialization/generated_serializer/generated_serializer_test.cpp create mode 100644 test/serialization/generated_serializer/include/libcamera/ipa/meson.build create mode 100644 test/serialization/generated_serializer/include/libcamera/ipa/test.mojom create mode 100644 test/serialization/generated_serializer/meson.build diff --git a/test/serialization/generated_serializer/generated_serializer_test.cpp b/test/serialization/generated_serializer/generated_serializer_test.cpp new file mode 100644 index 00000000..698c81d6 --- /dev/null +++ b/test/serialization/generated_serializer/generated_serializer_test.cpp @@ -0,0 +1,156 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2020, Google Inc. + * + * generated_serializer_test.cpp - Test generated serializer + */ + +#include +#include +#include + +#include "test.h" + +#include "test_ipa_interface.h" +#include "test_ipa_serializer.h" + +using namespace std; +using namespace libcamera; + +class IPAGeneratedSerializerTest : public Test +{ +protected: + int init() override + { + return TestPass; + } + + int run() override + { + +#define TEST_FIELD_EQUALITY(struct1, struct2, field) \ +if (struct1.field != struct2.field) { \ + cerr << #field << " field incorrect: expected \"" \ + << t.field << "\", got \"" << u.field << "\"" << endl;\ + return TestFail; \ +} + + ipa::test::TestStruct t, u; + + t.m = { + { "a", "z" }, + { "b", "z" }, + { "c", "z" }, + { "d", "z" }, + { "e", "z" }, + }; + + t.a = { "a", "b", "c", "d", "e" }; + + t.s1 = "hello world"; + t.s2 = "goodbye"; + t.s3 = "lorem ipsum"; + t.i = 58527; + + std::vector serialized; + + std::tie(serialized, ignore) = + IPADataSerializer::serialize(t); + + u = IPADataSerializer::deserialize(serialized); + + if (!equals(t.m, u.m)) + return TestFail; + + if (!equals(t.a, u.a)) + return TestFail; + + TEST_FIELD_EQUALITY(t, u, s1); + TEST_FIELD_EQUALITY(t, u, s2); + TEST_FIELD_EQUALITY(t, u, s3); + TEST_FIELD_EQUALITY(t, u, i); + + + /* Test vector of generated structs */ + std::vector v = { t, u }; + std::vector w; + + std::tie(serialized, ignore) = + IPADataSerializer>::serialize(v); + + w = IPADataSerializer>::deserialize(serialized); + + if (!equals(v[0].m, w[0].m) || + !equals(v[1].m, w[1].m)) + return TestFail; + + if (!equals(v[0].a, w[0].a) || + !equals(v[1].a, w[1].a)) + return TestFail; + + TEST_FIELD_EQUALITY(v[0], w[0], s1); + TEST_FIELD_EQUALITY(v[0], w[0], s2); + TEST_FIELD_EQUALITY(v[0], w[0], s3); + TEST_FIELD_EQUALITY(v[0], w[0], i); + + TEST_FIELD_EQUALITY(v[1], w[1], s1); + TEST_FIELD_EQUALITY(v[1], w[1], s2); + TEST_FIELD_EQUALITY(v[1], w[1], s3); + TEST_FIELD_EQUALITY(v[1], w[1], i); + + return TestPass; + } + +private: + bool equals(const map &lhs, const map &rhs) + { + bool eq = lhs.size() == rhs.size() && + equal(lhs.begin(), lhs.end(), rhs.begin(), + [](auto &a, auto &b) { return a.first == b.first && + a.second == b.second; }); + + if (eq) + return true; + + cerr << "lhs:" << endl; + for (const auto &pair : lhs) + cerr << "- " << pair.first << ": " + << pair.second << endl; + + cerr << "rhs:" << endl; + for (const auto &pair : rhs) + cerr << "- " << pair.first << ": " + << pair.second << endl; + + return false; + } + + bool equals(const vector &lhs, const vector &rhs) + { + bool eq = lhs.size() == rhs.size(); + + if (!eq) { + cerr << "sizes not equal" << endl; + return false; + } + + for (unsigned int i = 0; i < lhs.size(); i++) + if (lhs[i] != rhs[i]) + eq = false; + + if (eq) + return true; + + cerr << "lhs:" << endl; + for (const auto &str : lhs) + cerr << "- " << str << endl; + + cerr << "rhs:" << endl; + for (const auto &str : rhs) + cerr << "- " << str << endl; + + return false; + } +}; + +TEST_REGISTER(IPAGeneratedSerializerTest) diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build new file mode 100644 index 00000000..ba198f7a --- /dev/null +++ b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: CC0-1.0 + +# test.mojom-module +mojom = custom_target('test_mojom_module', + input : 'test.mojom', + output : 'test.mojom-module', + command : [ + mojom_parser, + '--output-root', meson.build_root(), + '--input-root', meson.source_root(), + '--mojoms', '@INPUT@' + ]) + +# test_ipa_interface.h +generated_test_header = custom_target('test_ipa_interface_h', + input : mojom, + output : 'test_ipa_interface.h', + depends : mojom_templates, + command : [ + mojom_generator, 'generate', + '-g', 'libcamera', + '--bytecode_path', mojom_templates_dir, + '--libcamera_generate_header', + '--libcamera_output_path=@OUTPUT@', + './' +'@INPUT@' + ]) + +# test_ipa_serializer.h +generated_test_serializer = custom_target('test_ipa_serializer_h', + input : mojom, + output : 'test_ipa_serializer.h', + depends : mojom_templates, + command : [ + mojom_generator, 'generate', + '-g', 'libcamera', + '--bytecode_path', mojom_templates_dir, + '--libcamera_generate_serializer', + '--libcamera_output_path=@OUTPUT@', + './' +'@INPUT@' + ]) diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom b/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom new file mode 100644 index 00000000..5f200885 --- /dev/null +++ b/test/serialization/generated_serializer/include/libcamera/ipa/test.mojom @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ + +module ipa.test; + +enum IPAOperationCode { + IPAOperationNone, + IPAOperationInit, + IPAOperationStart, + IPAOperationStop, +}; + +struct IPASettings {}; + +struct TestStruct { + map m; + array a; + string s1; + string s2; + int32 i; + string s3; +}; + +interface IPATestInterface { + init(IPASettings settings) => (int32 ret); + start() => (int32 ret); + stop(); + + test(TestStruct s); +}; + +interface IPATestEventInterface { + dummyEvent(uint32 val); +}; diff --git a/test/serialization/generated_serializer/meson.build b/test/serialization/generated_serializer/meson.build new file mode 100644 index 00000000..2460e0b1 --- /dev/null +++ b/test/serialization/generated_serializer/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: CC0-1.0 + +subdir('include/libcamera/ipa') + +exe = executable('generated_serializer_test', + [ + 'generated_serializer_test.cpp', + generated_test_header, + generated_test_serializer, + ], + dependencies : libcamera_dep, + link_with : test_libraries, + include_directories : [ + test_includes_internal, + './include', + ]) + +test('generated_serializer_test', exe, + suite : 'generated_serializer', is_parallel : false) diff --git a/test/serialization/meson.build b/test/serialization/meson.build index a4636337..60ebf325 100644 --- a/test/serialization/meson.build +++ b/test/serialization/meson.build @@ -1,5 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 +subdir('generated_serializer') + serialization_tests = [ ['control_serialization', 'control_serialization.cpp'], ['ipa_data_serializer_test', 'ipa_data_serializer_test.cpp'],