Fix variable replaceHEADdev

Variables can be defined inside '@' symbols, and are resolved by
runtime, like @HomeDir@. This enables the usage of the correct variable
value before its final set.
If the variable inside '@' was not an installer value, installer
replaced the variable with empty value. As the double '@' can be also
part of the value itself, installer should not replace it with empty
value if no real variable is found for it.

Task-number: QTIFW-2945
Change-Id: I83ca40db1e03a12ba51535766b054765071d09ad
Reviewed-by: Arttu Tarkiainen <[email protected]>

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
index f2f397021..b2104420c 100644
--- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
+++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
@@ -346,6 +346,48 @@ private slots:
         QCOMPARE(core.fromNativeSeparators(path), path);
 #endif
     }
+
+    void testReplaceVariablesStr_data()
+    {
+        QTest::addColumn<QString>("key");
+        QTest::addColumn<QString>("value");
+        QTest::addColumn<QString>("result");
+
+        QTest::newRow("Normal variables") << "myKey" << "myValue" << "myValue";
+        QTest::newRow("Nonreplaced variables") << "myNonreplaceKey" << "@myValue1@" << "@myValue1@";
+    }
+
+    void testReplaceVariablesStr()
+    {
+        QFETCH(QString, key);
+        QFETCH(QString, value);
+        QFETCH(QString, result);
+
+        PackageManagerCore core;
+        core.setValue(key, value);
+        QCOMPARE(core.replaceVariables(value), result);
+    }
+
+    void testReplaceVariablesBytearray_data()
+    {
+        QTest::addColumn<QString>("key");
+        QTest::addColumn<QByteArray>("value");
+        QTest::addColumn<QByteArray>("result");
+
+        QTest::newRow("Normal variables") << "myKey" << QByteArray("myValue") << QByteArray("myValue");
+        QTest::newRow("Nonreplaced variables") << "myNonreplaceKey" << QByteArray("@myValue1@") << QByteArray("@myValue1@");
+    }
+
+    void testReplaceVariablesBytearray()
+    {
+        QFETCH(QString, key);
+        QFETCH(QByteArray, value);
+        QFETCH(QByteArray, result);
+
+        PackageManagerCore core;
+        core.setValue(key, value);
+        QCOMPARE(core.replaceVariables(value), result);
+    }
 };