From b999161b7de5641733dae35ca12e1aa9796108e0 Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Thu, 3 Oct 2019 17:20:34 +0200
Subject: test: ipa: Rename the ipa_test to ipa_module_test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update the IPA test to match the test class name in prevision of adding
more IPA tests. Also update the description comment in the test unit, as
the old name for the test was still used.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 test/ipa/ipa_module_test.cpp | 74 ++++++++++++++++++++++++++++++++++++++++++++
 test/ipa/ipa_test.cpp        | 74 --------------------------------------------
 test/ipa/meson.build         |  2 +-
 3 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 test/ipa/ipa_module_test.cpp
 delete mode 100644 test/ipa/ipa_test.cpp

diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp
new file mode 100644
index 00000000..3a634099
--- /dev/null
+++ b/test/ipa/ipa_module_test.cpp
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2019, Google Inc.
+ *
+ * ipa_module_test.cpp - Test loading of the VIMC IPA module and verify its info
+ */
+
+#include <iostream>
+#include <string.h>
+
+#include "ipa_module.h"
+
+#include "test.h"
+
+using namespace std;
+using namespace libcamera;
+
+class IPAModuleTest : public Test
+{
+protected:
+	int runTest(const string &path, const struct IPAModuleInfo &testInfo)
+	{
+		int ret = 0;
+
+		IPAModule *ll = new IPAModule(path);
+
+		if (!ll->isValid()) {
+			cerr << "test IPA module " << path << " is invalid"
+			     << endl;
+			delete ll;
+			return -1;
+		}
+
+		const struct IPAModuleInfo &info = ll->info();
+
+		if (memcmp(&info, &testInfo, sizeof(info))) {
+			cerr << "IPA module information mismatch: expected:" << endl
+			     << "moduleAPIVersion = "     << testInfo.moduleAPIVersion << endl
+			     << "pipelineVersion = "      << testInfo.pipelineVersion << endl
+			     << "pipelineName = "         << testInfo.pipelineName << endl
+			     << "name = "                 << testInfo.name
+			     << "got: " << endl
+			     << "moduleAPIVersion = "     << info.moduleAPIVersion << endl
+			     << "pipelineVersion = "      << info.pipelineVersion << endl
+			     << "pipelineName = "         << info.pipelineName << endl
+			     << "name = "                 << info.name << endl;
+		}
+
+		delete ll;
+		return ret;
+	}
+
+	int run() override
+	{
+		int count = 0;
+
+		const struct IPAModuleInfo testInfo = {
+			IPA_MODULE_API_VERSION,
+			0,
+			"PipelineHandlerVimc",
+			"Dummy IPA for Vimc",
+			"GPL-2.0-or-later",
+		};
+
+		count += runTest("src/ipa/ipa_vimc.so", testInfo);
+
+		if (count < 0)
+			return TestFail;
+
+		return TestPass;
+	}
+};
+
+TEST_REGISTER(IPAModuleTest)
diff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp
deleted file mode 100644
index 8f9b2d80..00000000
--- a/test/ipa/ipa_test.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2019, Google Inc.
- *
- * load-so.cpp - loading .so tests
- */
-
-#include <iostream>
-#include <string.h>
-
-#include "ipa_module.h"
-
-#include "test.h"
-
-using namespace std;
-using namespace libcamera;
-
-class IPAModuleTest : public Test
-{
-protected:
-	int runTest(const string &path, const struct IPAModuleInfo &testInfo)
-	{
-		int ret = 0;
-
-		IPAModule *ll = new IPAModule(path);
-
-		if (!ll->isValid()) {
-			cerr << "test IPA module " << path << " is invalid"
-			     << endl;
-			delete ll;
-			return -1;
-		}
-
-		const struct IPAModuleInfo &info = ll->info();
-
-		if (memcmp(&info, &testInfo, sizeof(info))) {
-			cerr << "IPA module information mismatch: expected:" << endl
-			     << "moduleAPIVersion = "     << testInfo.moduleAPIVersion << endl
-			     << "pipelineVersion = "      << testInfo.pipelineVersion << endl
-			     << "pipelineName = "         << testInfo.pipelineName << endl
-			     << "name = "                 << testInfo.name
-			     << "got: " << endl
-			     << "moduleAPIVersion = "     << info.moduleAPIVersion << endl
-			     << "pipelineVersion = "      << info.pipelineVersion << endl
-			     << "pipelineName = "         << info.pipelineName << endl
-			     << "name = "                 << info.name << endl;
-		}
-
-		delete ll;
-		return ret;
-	}
-
-	int run() override
-	{
-		int count = 0;
-
-		const struct IPAModuleInfo testInfo = {
-			IPA_MODULE_API_VERSION,
-			0,
-			"PipelineHandlerVimc",
-			"Dummy IPA for Vimc",
-			"GPL-2.0-or-later",
-		};
-
-		count += runTest("src/ipa/ipa_vimc.so", testInfo);
-
-		if (count < 0)
-			return TestFail;
-
-		return TestPass;
-	}
-};
-
-TEST_REGISTER(IPAModuleTest)
diff --git a/test/ipa/meson.build b/test/ipa/meson.build
index 1749ab7d..e174671d 100644
--- a/test/ipa/meson.build
+++ b/test/ipa/meson.build
@@ -1,5 +1,5 @@
 ipa_test = [
-    ['ipa_test', 'ipa_test.cpp'],
+    ['ipa_module_test', 'ipa_module_test.cpp'],
 ]
 
 foreach t : ipa_test
-- 
cgit v1.2.1