diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-22 10:37:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-29 06:56:49 +0000 |
| commit | 91394cccb942df1b5699b0d9d69de9ecc6ced86a (patch) | |
| tree | 0a30b77289af8d64f6148828555181bfaaa35070 /tests | |
| parent | 994cbd0de54f66abd6f10fe8fdfb36e2ef4f1350 (diff) | |
Reanimate tests/auto/declarative/qdeclarativewebviewv5.5.0-rc1v5.5.0
Add CONFIG += testcase to qdeclarativewebview.pro.
Use QTRY_VERIFY in multipleWindows().
Before this change, the test was not executed at all because "make check"
was an empty target due to missing CONFIG += testcase.
Add QEXPECT_FAIL to tst_QDeclarativeWebView::multipleWindows().
Change-Id: I7395876466f6d3b4c326336e47fb40bb6a60838e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro | 1 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro index cf38fa78..2dc69d7d 100644 --- a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro +++ b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro @@ -1,5 +1,6 @@ TEMPLATE = app +CONFIG += testcase TARGET = tst_qdeclarativewebview SOURCES += $${TARGET}.cpp diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp index 51bf3859..d2b53dba 100644 --- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp +++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp @@ -278,6 +278,7 @@ void tst_QDeclarativeWebView::multipleWindows() QDeclarativeProperty prop(rootItem, "firstPageOpened"); QObject* firstPageOpened = qvariant_cast<QObject*>(prop.read()); + QEXPECT_FAIL("", "Test is known to fail.", Abort); QVERIFY(firstPageOpened); QDeclarativeProperty xProp(firstPageOpened, "x"); |