{"id":11233,"url":"https://patchwork.libcamera.org/api/patches/11233/?format=json","web_url":"https://patchwork.libcamera.org/patch/11233/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210211072121.35229-5-paul.elder@ideasonboard.com>","date":"2021-02-11T07:21:21","name":"[libcamera-devel,v7,4/4] tests: Test IPA serializer generation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e854aa86f50eb17ebce0e119423076fd26ab9a3f","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11233/mbox/","series":[{"id":1677,"url":"https://patchwork.libcamera.org/api/series/1677/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1677","date":"2021-02-11T07:21:17","name":"IPA isolation: Part 3: Tests and documentation","version":7,"mbox":"https://patchwork.libcamera.org/series/1677/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11233/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11233/checks/","tags":{},"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 A8F57BD160\n\tfor ;\n\tThu, 11 Feb 2021 07:21:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 76A8E6373D;\n\tThu, 11 Feb 2021 08:21:39 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5D02161661\n\tfor ;\n\tThu, 11 Feb 2021 08:21:38 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E9EAABB8;\n\tThu, 11 Feb 2021 08:21:36 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"DrnyB0sp\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613028098;\n\tbh=vpIu3wI3RzkUS9iU4Ey+JkrYNIHDB55Ka69+ArXVHUw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=DrnyB0spnyY8FTafU91HPxsWOxTHIHqAA9nl6hPOKf+CsD+cnZVjEz2i+JNRbjWWE\n\tgxA7nPMhEubajrRW8BobHl5vIVIT8diOjoj8w2HR1tnwO4rKxgh+o73LorP9prEUhs\n\tfI9KDR+63x9FKwMGMRAT3LM/v2rViSgCrN4Hch6M=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 11 Feb 2021 16:21:21 +0900","Message-Id":"<20210211072121.35229-5-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210211072121.35229-1-paul.elder@ideasonboard.com>","References":"<20210211072121.35229-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v7 4/4] tests: Test IPA serializer\n\tgeneration","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a test to confirm that serializer and header generation works\nproperly for mojom definition files, and that the serializer works\nproperly.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v7:\n- add test to test serdes of a vector of *generated* structs\n\nChanges in v6:\n- use namespacing in the mojom file, and in the test\n- add the enum to the test mojom file, as vimc.h no longer exists\n\nChanges in v5:\n- add dummy event to event interface\n\nNew in v4\n---\n .../generated_serializer_test.cpp | 156 ++++++++++++++++++\n .../generated_serializer/meson.build | 49 ++++++\n .../generated_serializer/vimc.mojom | 33 ++++\n test/serialization/meson.build | 2 +\n 4 files changed, 240 insertions(+)\n create mode 100644 test/serialization/generated_serializer/generated_serializer_test.cpp\n create mode 100644 test/serialization/generated_serializer/meson.build\n create mode 100644 test/serialization/generated_serializer/vimc.mojom","diff":"diff --git a/test/serialization/generated_serializer/generated_serializer_test.cpp b/test/serialization/generated_serializer/generated_serializer_test.cpp\nnew file mode 100644\nindex 00000000..471d0731\n--- /dev/null\n+++ b/test/serialization/generated_serializer/generated_serializer_test.cpp\n@@ -0,0 +1,156 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * generated_serializer_test.cpp - Test generated serializer\n+ */\n+\n+#include \n+#include \n+#include \n+\n+#include \"test.h\"\n+\n+#include \"vimc_test_ipa_interface.h\"\n+#include \"vimc_test_ipa_serializer.h\"\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class IPAGeneratedSerializerTest : public Test\n+{\n+protected:\n+\tint init() override\n+\t{\n+\t\treturn TestPass;\n+\t}\n+\n+\tint run() override\n+\t{\n+\n+#define TEST_FIELD_EQUALITY(struct1, struct2, field)\t\t\\\n+if (struct1.field != struct2.field) {\t\t\t\t\\\n+\tcerr << #field << \" field incorrect: expected \\\"\"\t\\\n+\t << t.field << \"\\\", got \\\"\" << u.field << \"\\\"\" << endl;\\\n+\treturn TestFail;\t\t\t\t\t\\\n+}\n+\n+\t\tipa::test::TestStruct t, u;\n+\n+\t\tt.m = {\n+\t\t\t{ \"a\", \"z\" },\n+\t\t\t{ \"b\", \"z\" },\n+\t\t\t{ \"c\", \"z\" },\n+\t\t\t{ \"d\", \"z\" },\n+\t\t\t{ \"e\", \"z\" },\n+\t\t};\n+\n+\t\tt.a = { \"a\", \"b\", \"c\", \"d\", \"e\" };\n+\n+\t\tt.s1 = \"hello world\";\n+\t\tt.s2 = \"goodbye\";\n+\t\tt.s3 = \"lorem ipsum\";\n+\t\tt.i = 58527;\n+\n+\t\tvector serialized;\n+\n+\t\ttie(serialized, ignore) =\n+\t\t\tIPADataSerializer::serialize(t);\n+\n+\t\tu = IPADataSerializer::deserialize(serialized);\n+\n+\t\tif (!equals(t.m, u.m))\n+\t\t\treturn TestFail;\n+\n+\t\tif (!equals(t.a, u.a))\n+\t\t\treturn TestFail;\n+\n+\t\tTEST_FIELD_EQUALITY(t, u, s1);\n+\t\tTEST_FIELD_EQUALITY(t, u, s2);\n+\t\tTEST_FIELD_EQUALITY(t, u, s3);\n+\t\tTEST_FIELD_EQUALITY(t, u, i);\n+\n+\n+\t\t/* Test vector of generated structs */\n+\t\tvector v = { t, u };\n+\t\tvector w;\n+\n+\t\ttie(serialized, ignore) =\n+\t\t\tIPADataSerializer>::serialize(v);\n+\n+\t\tw = IPADataSerializer>::deserialize(serialized);\n+\n+\t\tif (!equals(v[0].m, w[0].m) ||\n+\t\t !equals(v[1].m, w[1].m))\n+\t\t\treturn TestFail;\n+\n+\t\tif (!equals(v[0].a, w[0].a) ||\n+\t\t !equals(v[1].a, w[1].a))\n+\t\t\treturn TestFail;\n+\n+\t\tTEST_FIELD_EQUALITY(v[0], w[0], s1);\n+\t\tTEST_FIELD_EQUALITY(v[0], w[0], s2);\n+\t\tTEST_FIELD_EQUALITY(v[0], w[0], s3);\n+\t\tTEST_FIELD_EQUALITY(v[0], w[0], i);\n+\n+\t\tTEST_FIELD_EQUALITY(v[1], w[1], s1);\n+\t\tTEST_FIELD_EQUALITY(v[1], w[1], s2);\n+\t\tTEST_FIELD_EQUALITY(v[1], w[1], s3);\n+\t\tTEST_FIELD_EQUALITY(v[1], w[1], i);\n+\n+\t\treturn TestPass;\n+\t}\n+\n+private:\n+\tbool equals(const map &lhs, const map &rhs)\n+\t{\n+\t\tbool eq = lhs.size() == rhs.size() &&\n+\t\t\t equal(lhs.begin(), lhs.end(), rhs.begin(),\n+\t\t\t\t[](auto &a, auto &b) { return a.first == b.first &&\n+\t\t\t\t\t\t\t a.second == b.second; });\n+\n+\t\tif (eq)\n+\t\t\treturn true;\n+\n+\t\tcerr << \"lhs:\" << endl;\n+\t\tfor (const auto &pair : lhs)\n+\t\t\tcerr << \"- \" << pair.first << \": \"\n+\t\t\t << pair.second << endl;\n+\n+\t\tcerr << \"rhs:\" << endl;\n+\t\tfor (const auto &pair : rhs)\n+\t\t\tcerr << \"- \" << pair.first << \": \"\n+\t\t\t << pair.second << endl;\n+\n+\t\treturn false;\n+\t}\n+\n+\tbool equals(const vector &lhs, const vector &rhs)\n+\t{\n+\t\tbool eq = lhs.size() == rhs.size();\n+\n+\t\tif (!eq) {\n+\t\t\tcerr << \"sizes not equal\" << endl;\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\tfor (unsigned int i = 0; i < lhs.size(); i++)\n+\t\t\tif (lhs[i] != rhs[i])\n+\t\t\t\teq = false;\n+\n+\t\tif (eq)\n+\t\t\treturn true;\n+\n+\t\tcerr << \"lhs:\" << endl;\n+\t\tfor (const auto &str : lhs)\n+\t\t\tcerr << \"- \" << str << endl;\n+\n+\t\tcerr << \"rhs:\" << endl;\n+\t\tfor (const auto &str : rhs)\n+\t\t\tcerr << \"- \" << str << endl;\n+\n+\t\treturn false;\n+\t}\n+};\n+\n+TEST_REGISTER(IPAGeneratedSerializerTest)\ndiff --git a/test/serialization/generated_serializer/meson.build b/test/serialization/generated_serializer/meson.build\nnew file mode 100644\nindex 00000000..68bcf23d\n--- /dev/null\n+++ b/test/serialization/generated_serializer/meson.build\n@@ -0,0 +1,49 @@\n+# SPDX-License-Identifier: CC0-1.0\n+\n+# vimc.mojom-module\n+mojom = custom_target('vimc_test_mojom_module',\n+ input : 'vimc.mojom',\n+ output : 'vimc.mojom-module',\n+ command : [\n+ mojom_parser,\n+ '--output-root', meson.build_root(),\n+ '--input-root', meson.source_root(),\n+ '--mojoms', '@INPUT@'\n+ ])\n+\n+# vimc_test_ipa_interface.h\n+header = custom_target('vimc_test_ipa_interface_h',\n+ input : mojom,\n+ output : 'vimc_test_ipa_interface.h',\n+ depends : mojom_templates,\n+ command : [\n+ mojom_generator, 'generate',\n+ '-g', 'libcamera',\n+ '--bytecode_path', mojom_templates_dir,\n+ '--libcamera_generate_header',\n+ '--libcamera_output_path=@OUTPUT@',\n+ './' +'@INPUT@'\n+ ])\n+\n+# vimc_test_ipa_serializer.h\n+serializer = custom_target('vimc_test_ipa_serializer_h',\n+ input : mojom,\n+ output : 'vimc_test_ipa_serializer.h',\n+ depends : mojom_templates,\n+ command : [\n+ mojom_generator, 'generate',\n+ '-g', 'libcamera',\n+ '--bytecode_path', mojom_templates_dir,\n+ '--libcamera_generate_serializer',\n+ '--libcamera_output_path=@OUTPUT@',\n+ './' +'@INPUT@'\n+ ])\n+\n+exe = executable('generated_serializer_test',\n+ ['generated_serializer_test.cpp', header, serializer],\n+ dependencies : libcamera_dep,\n+ link_with : test_libraries,\n+ include_directories : test_includes_internal)\n+\n+test('generated_serializer_test', exe,\n+ suite : 'generated_serializer', is_parallel : false)\ndiff --git a/test/serialization/generated_serializer/vimc.mojom b/test/serialization/generated_serializer/vimc.mojom\nnew file mode 100644\nindex 00000000..2fd973e9\n--- /dev/null\n+++ b/test/serialization/generated_serializer/vimc.mojom\n@@ -0,0 +1,33 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+\n+module ipa.test;\n+\n+enum IPAOperationCode {\n+\tIPAOperationNone,\n+\tIPAOperationInit,\n+\tIPAOperationStart,\n+\tIPAOperationStop,\n+};\n+\n+struct IPASettings {};\n+\n+struct TestStruct {\n+\tmap m;\n+\tarray a;\n+\tstring s1;\n+\tstring s2;\n+\tint32 i;\n+\tstring s3;\n+};\n+\n+interface IPAVimcInterface {\n+\tinit(IPASettings settings) => (int32 ret);\n+\tstart() => (int32 ret);\n+\tstop();\n+\n+\ttest(TestStruct s);\n+};\n+\n+interface IPAVimcEventInterface {\n+\tdummyEvent(uint32 val);\n+};\ndiff --git a/test/serialization/meson.build b/test/serialization/meson.build\nindex c140a31c..57726b12 100644\n--- a/test/serialization/meson.build\n+++ b/test/serialization/meson.build\n@@ -1,5 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n+subdir('generated_serializer')\n+\n serialization_tests = [\n [ 'control_serialization', 'control_serialization.cpp' ],\n [ 'ipa_data_serializer_test', 'ipa_data_serializer_test.cpp' ],\n","prefixes":["libcamera-devel","v7","4/4"]}