[Ktutorial-commits] SF.net SVN: ktutorial:[350] trunk/ktutorial/ktutorial-library/tests/view/ Windo
Status: Alpha
Brought to you by:
danxuliu
From: <dan...@us...> - 2012-06-29 15:58:06
|
Revision: 350 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=350&view=rev Author: danxuliu Date: 2012-06-29 15:57:55 +0000 (Fri, 29 Jun 2012) Log Message: ----------- Set the window title to widgets and dialogs to ease debugging failures. Modified Paths: -------------- trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp Modified: trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp 2012-06-27 21:37:57 UTC (rev 349) +++ trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp 2012-06-29 15:57:55 UTC (rev 350) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -77,9 +77,11 @@ void WindowOnTopEnforcerTest::testBaseWindow() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -103,9 +105,11 @@ void WindowOnTopEnforcerTest::testChildWindow() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -113,6 +117,7 @@ enforcer->setBaseWindow(window); QWidget* childWindow = new QWidget(window); + childWindow->setWindowTitle("Child window"); childWindow->setWindowFlags(Qt::Window); childWindow->show(); @@ -137,9 +142,11 @@ void WindowOnTopEnforcerTest::testModalDialog() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -147,6 +154,7 @@ enforcer->setBaseWindow(window); QDialog* modalDialog = new QDialog(window); + modalDialog->setWindowTitle("Modal dialog"); QTimer timerAccept; timerAccept.setSingleShot(true); @@ -168,9 +176,11 @@ void WindowOnTopEnforcerTest::testNestedModalDialog() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -178,7 +188,9 @@ enforcer->setBaseWindow(window); QDialog* modalDialog = new QDialog(window); + modalDialog->setWindowTitle("Modal dialog"); QDialog* nestedModalDialog = new QDialog(modalDialog); + nestedModalDialog->setWindowTitle("Nested modal dialog"); QTimer timerAccept; timerAccept.setSingleShot(true); @@ -216,9 +228,11 @@ void WindowOnTopEnforcerTest::testSeveralModalDialogs() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -226,8 +240,11 @@ enforcer->setBaseWindow(window); QDialog* modalDialog = new QDialog(window); + modalDialog->setWindowTitle("Modal dialog"); QDialog* nestedModalDialog = new QDialog(modalDialog); + nestedModalDialog->setWindowTitle("Nested modal dialog"); QDialog* nestedModalDialog2 = new QDialog(modalDialog); + nestedModalDialog2->setWindowTitle("Nested modal dialog 2"); QTimer timerAccept; timerAccept.setSingleShot(true); @@ -277,7 +294,9 @@ assertWindow(windowToKeepOnTop, window); QDialog* modalDialog2 = new QDialog(window); + modalDialog2->setWindowTitle("Modal dialog 2"); QDialog* nestedModalDialog3 = new QDialog(modalDialog); + nestedModalDialog3->setWindowTitle("Nested modal dialog 3"); QTimer timerAccept2; timerAccept2.setSingleShot(true); @@ -315,9 +334,11 @@ void WindowOnTopEnforcerTest::testNestedModalDialogOnChildWindow() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -325,10 +346,12 @@ enforcer->setBaseWindow(window); QWidget* childWindow = new QWidget(window); + childWindow->setWindowTitle("Child window"); childWindow->setWindowFlags(Qt::Window); childWindow->show(); QDialog* nestedModalDialog = new QDialog(childWindow); + nestedModalDialog->setWindowTitle("Nested modal dialog"); QTimer timerAccept; timerAccept.setSingleShot(true); @@ -350,9 +373,11 @@ void WindowOnTopEnforcerTest::testModalWidget() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -360,6 +385,7 @@ enforcer->setBaseWindow(window); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); @@ -397,9 +423,11 @@ //Hopefully I'll get enough information about this weird behavior to fill a bug. void WindowOnTopEnforcerTest::testModalWidgetSiblingOfParent() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -407,11 +435,13 @@ enforcer->setBaseWindow(window); QWidget* siblingModalWidget = new QWidget(window); + siblingModalWidget->setWindowTitle("Sibling modal widget"); siblingModalWidget->setWindowFlags(Qt::Window); siblingModalWidget->setWindowModality(Qt::ApplicationModal); siblingModalWidget->show(); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); @@ -478,9 +508,11 @@ //This test is a synthesized version of all the things explained above. void WindowOnTopEnforcerTest::testShowModalWidgetTwice() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -488,6 +520,7 @@ enforcer->setBaseWindow(window); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); @@ -508,9 +541,11 @@ void WindowOnTopEnforcerTest::testHideNestedModalWidgetsInOrder() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -518,11 +553,13 @@ enforcer->setBaseWindow(window); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); QWidget* nestedModalWidget = new QWidget(modalWidget); + nestedModalWidget->setWindowTitle("Nested modal widget"); nestedModalWidget->setWindowFlags(Qt::Window); nestedModalWidget->setWindowModality(Qt::ApplicationModal); nestedModalWidget->show(); @@ -548,9 +585,11 @@ void WindowOnTopEnforcerTest::testHideNestedModalWidgetsInReverseOrder() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -558,11 +597,13 @@ enforcer->setBaseWindow(window); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); QWidget* nestedModalWidget = new QWidget(modalWidget); + nestedModalWidget->setWindowTitle("Nested modal widget"); nestedModalWidget->setWindowFlags(Qt::Window); nestedModalWidget->setWindowModality(Qt::ApplicationModal); nestedModalWidget->show(); @@ -588,9 +629,11 @@ void WindowOnTopEnforcerTest::testShowNestedModalWidgetsInOrder() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -598,11 +641,13 @@ enforcer->setBaseWindow(window); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); QWidget* nestedModalWidget = new QWidget(modalWidget); + nestedModalWidget->setWindowTitle("Nested modal widget"); nestedModalWidget->setWindowFlags(Qt::Window); nestedModalWidget->setWindowModality(Qt::ApplicationModal); nestedModalWidget->show(); @@ -640,9 +685,11 @@ void WindowOnTopEnforcerTest::testShowNestedModalWidgetsInReverseOrder() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -650,11 +697,13 @@ enforcer->setBaseWindow(window); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); QWidget* nestedModalWidget = new QWidget(modalWidget); + nestedModalWidget->setWindowTitle("Nested modal widget"); nestedModalWidget->setWindowFlags(Qt::Window); nestedModalWidget->setWindowModality(Qt::ApplicationModal); nestedModalWidget->show(); @@ -692,9 +741,11 @@ void WindowOnTopEnforcerTest::testShowNestedModalWidgetsInMixedOrder() { QWidget* window = new QWidget(); + window->setWindowTitle("Window"); window->show(); QPointer<QWidget> windowToKeepOnTop = new QWidget(window); + windowToKeepOnTop->setWindowTitle("Window to keep on top"); windowToKeepOnTop->setWindowFlags(Qt::Window); windowToKeepOnTop->show(); @@ -702,22 +753,26 @@ enforcer->setBaseWindow(window); QWidget* modalWidget = new QWidget(window); + modalWidget->setWindowTitle("Modal widget"); modalWidget->setWindowFlags(Qt::Window); modalWidget->setWindowModality(Qt::ApplicationModal); modalWidget->show(); QWidget* nestedModalWidget = new QWidget(modalWidget); + nestedModalWidget->setWindowTitle("Nested modal widget"); nestedModalWidget->setWindowFlags(Qt::Window); nestedModalWidget->setWindowModality(Qt::ApplicationModal); nestedModalWidget->show(); QWidget* nestedNestedModalWidget = new QWidget(nestedModalWidget); + nestedNestedModalWidget->setWindowTitle("Nested nested modal widget"); nestedNestedModalWidget->setWindowFlags(Qt::Window); nestedNestedModalWidget->setWindowModality(Qt::ApplicationModal); nestedNestedModalWidget->show(); QWidget* nestedNestedNestedModalWidget = new QWidget(nestedNestedModalWidget); + nestedNestedNestedModalWidget->setWindowTitle("Nested nested nested modal widget"); nestedNestedNestedModalWidget->setWindowFlags(Qt::Window); nestedNestedNestedModalWidget->setWindowModality(Qt::ApplicationModal); nestedNestedNestedModalWidget->show(); @@ -794,7 +849,12 @@ public slots: void assertParent() { - QCOMPARE(mAssertWidget->parentWidget(), mAssertParent); + QString message = "\nActual: " + + mAssertWidget->parentWidget()->windowTitle() + + "\nExpected: " + mAssertParent->windowTitle() + + "\n"; + QVERIFY2(mAssertWidget->parentWidget() == mAssertParent, + message.toStdString().c_str()); } void assertIsVisibleWindow() { @@ -828,7 +888,10 @@ void WindowOnTopEnforcerTest::assertWindow(QWidget* window, QWidget* expectedParent) const { QVERIFY(window); - QCOMPARE(window->parentWidget(), expectedParent); + QString message = "\nActual: " + window->parentWidget()->windowTitle() + + "\nExpected: " + expectedParent->windowTitle() + "\n"; + QVERIFY2(window->parentWidget() == expectedParent, + message.toStdString().c_str()); QVERIFY(window->isVisible()); QVERIFY(window->windowFlags() & Qt::Window); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |