aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlmoduleplugin
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-06-09 15:42:01 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-06-17 17:09:33 +0200
commit9d40cc4b63d633c3d657fd78cc5d2ca37a5de3b7 (patch)
tree15adcf650042812719d6cf7416a63eeb876631c0 /tests/auto/qml/qqmlmoduleplugin
parente6107060fe5a1dc898466330c9b4f61d7f804576 (diff)
Drop the "plugin cannot be loaded" extension to error messages
This message adds very little extra value, and it complicates the tests that check for specific errors. Change-Id: I58553a8cbc56c3333c8e9815518cca5fa01fdde1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin')
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
index 3590eeb768..b197bed54d 100644
--- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
@@ -279,7 +279,7 @@ void tst_qqmlmoduleplugin::incorrectPluginCase()
QString libname = "PluGin.dll";
#endif
if (!caseSensitive) {
- expectedError = QLatin1String("plugin cannot be loaded for module \"org.qtproject.WrongCase\": File name case mismatch for \"")
+ expectedError = QLatin1String("File name case mismatch for \"")
+ QDir(m_importsDirectory).filePath("org/qtproject/WrongCase/" + libname)
+ QLatin1Char('"');
}
@@ -631,20 +631,20 @@ void tst_qqmlmoduleplugin::importStrictModule_data()
<< "import org.qtproject.NonstrictModule 1.0\n"
"MyPluginType {}"
<< "Module 'org.qtproject.NonstrictModule' does not contain a module identifier directive - it cannot be protected from external registrations."
- << ":1:1: plugin cannot be loaded for module \"org.qtproject.NonstrictModule\": Cannot install element 'MyPluginType' into protected module 'org.qtproject.StrictModule' version '1'";
+ << ":1:1: Cannot install element 'MyPluginType' into protected module 'org.qtproject.StrictModule' version '1'";
QTest::newRow("non-strict preemption")
<< "import org.qtproject.PreemptiveModule 1.0\n"
"import org.qtproject.PreemptedStrictModule 1.0\n"
"MyPluginType {}"
<< "Module 'org.qtproject.PreemptiveModule' does not contain a module identifier directive - it cannot be protected from external registrations."
- << ":2:1: plugin cannot be loaded for module \"org.qtproject.PreemptedStrictModule\": Namespace 'org.qtproject.PreemptedStrictModule' has already been used for type registration";
+ << ":2:1: Namespace 'org.qtproject.PreemptedStrictModule' has already been used for type registration";
QTest::newRow("invalid namespace")
<< "import org.qtproject.InvalidNamespaceModule 1.0\n"
"MyPluginType {}"
<< QString()
- << ":1:1: plugin cannot be loaded for module \"org.qtproject.InvalidNamespaceModule\": Module namespace 'org.qtproject.AwesomeModule' does not match import URI 'org.qtproject.InvalidNamespaceModule'";
+ << ":1:1: Module namespace 'org.qtproject.AwesomeModule' does not match import URI 'org.qtproject.InvalidNamespaceModule'";
QTest::newRow("module directive must be first")
<< "import org.qtproject.InvalidFirstCommandModule 1.0\n"