summaryrefslogtreecommitdiff
path: root/tests/auto/language/tst_language.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-10-02 16:00:10 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-10-11 14:34:36 +0000
commit37d602bf6744fa5a3f2b4687da77fe1fc2fe1ff8 (patch)
treeaa11cce892f5d0697ab2b00e897925eacca4157e /tests/auto/language/tst_language.cpp
parent61ddc0685e0edc35b5fc39fdebacf08c64dbc991 (diff)
downloadqbs-37d602bf6744fa5a3f2b4687da77fe1fc2fe1ff8.tar.gz
Remove bogus assertion from Properties item handler
It does not appear to serve a purpose, and it prevented deriving from the Properties item. Change-Id: Icf71e3358299ea7a0f697637967e65dd0fb9b743 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/language/tst_language.cpp')
-rw-r--r--tests/auto/language/tst_language.cpp31
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 9aa92229e..3a9325c29 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -1357,6 +1357,37 @@ void TestLanguage::importCollection()
QVERIFY(!exceptionCaught);
}
+void TestLanguage::inheritedPropertiesItems_data()
+{
+ QTest::addColumn<QString>("buildVariant");
+ QTest::addColumn<QString>("productName");
+ QTest::newRow("debug build") << "debug" << "product_debug";
+ QTest::newRow("release build") << "release" << "product_release";
+}
+
+void TestLanguage::inheritedPropertiesItems()
+{
+ bool exceptionCaught = false;
+ try {
+ SetupProjectParameters params = defaultParameters;
+ QFETCH(QString, buildVariant);
+ QFETCH(QString, productName);
+ params.setProjectFilePath
+ (testProject("inherited-properties-items/inherited-properties-items.qbs"));
+ params.setOverriddenValues(QVariantMap{std::make_pair("qbs.buildVariant", buildVariant)});
+ TopLevelProjectPtr project = loader->loadProject(params);
+ QVERIFY(!!project);
+ QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
+ QCOMPARE(products.size(), 1);
+ QVERIFY(!!products.value(productName));
+ }
+ catch (const ErrorInfo &e) {
+ exceptionCaught = true;
+ qDebug() << e.toString();
+ }
+ QVERIFY(!exceptionCaught);
+}
+
void TestLanguage::invalidBindingInDisabledItem()
{
bool exceptionCaught = false;