diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-06-02 21:30:09 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-06-06 09:42:00 +0000 |
| commit | edfb2cfb0a1c369d3ee70e406ba36cbd0af72260 (patch) | |
| tree | 2ee0cdb29e6af82d6d93609d40954e5ab2ae2f36 | |
| parent | b0e4f2a5322a61636ceb9b856c04c55c97e2c6a8 (diff) | |
Add failing test for QBS-1016
Task-number: QBS-1016
Change-Id: I78632b31eb72ae5bd7d19d5d262fee66a96a1671
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/language/tst_language.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/language/testdata/idusage.qbs | 5 | ||||
| -rw-r--r-- | tests/auto/language/testdata/idusagebase.qbs | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp index 79acf5583..f0ebc9702 100644 --- a/src/lib/corelib/language/tst_language.cpp +++ b/src/lib/corelib/language/tst_language.cpp @@ -1003,10 +1003,14 @@ void TestLanguage::idUsage() TopLevelProjectPtr project = loader->loadProject(defaultParameters); QVERIFY(project); QHash<QString, ResolvedProductPtr> products = productsFromProject(project); - QCOMPARE(products.count(), 3); + QCOMPARE(products.count(), 4); QVERIFY(products.contains("product1_1")); QVERIFY(products.contains("product2_2")); QVERIFY(products.contains("product3_3")); + ResolvedProductPtr product4 = products.value("product4_4"); + QVERIFY(product4); + QEXPECT_FAIL("", "QBS-1016", Continue); + QCOMPARE(product4->productProperties.value("productName").toString(), product4->name); } catch (const ErrorInfo &e) { exceptionCaught = true; diff --git a/tests/auto/language/testdata/idusage.qbs b/tests/auto/language/testdata/idusage.qbs index 42dc43ad5..6677c3386 100644 --- a/tests/auto/language/testdata/idusage.qbs +++ b/tests/auto/language/testdata/idusage.qbs @@ -17,4 +17,9 @@ Project { property int nr: product2.nr + 1 name: "product3_" + nr } + DerivedProduct { + id: product4 + nr: product3.nr + 1 + name: "product4_" + nr + } } diff --git a/tests/auto/language/testdata/idusagebase.qbs b/tests/auto/language/testdata/idusagebase.qbs index 483a00ccf..0606ded16 100644 --- a/tests/auto/language/testdata/idusagebase.qbs +++ b/tests/auto/language/testdata/idusagebase.qbs @@ -2,4 +2,5 @@ Product { id: baseProduct property int nr: theProject.initialNr + 1 name: "product1_" + nr + property string productName: baseProduct.name } |