[Ktutorial-commits] SF.net SVN: ktutorial:[339] trunk/ktutorial
Status: Alpha
Brought to you by:
danxuliu
Menu
▾
▴
[Ktutorial-commits] SF.net SVN: ktutorial:[339] trunk/ktutorial
|
From: <dan...@us...> - 2011-10-13 12:48:34
|
Revision: 339
http://ktutorial.svn.sourceforge.net/ktutorial/?rev=339&view=rev
Author: danxuliu
Date: 2011-10-13 12:48:24 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Use QTest::qWaitForWindowShown instead of waiting a fixed time.
Modified Paths:
--------------
trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp
trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp
Modified: trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp 2011-10-13 09:13:34 UTC (rev 338)
+++ trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectNameWidgetTest.cpp 2011-10-13 12:48:24 UTC (rev 339)
@@ -382,8 +382,7 @@
//Focus is not set in hidden widgets until they are shown
parent.show();
- //Give the parent widget time to be shown
- QTest::qWait(500);
+ QTest::qWaitForWindowShown(&parent);
otherLineEdit->setFocus();
@@ -409,8 +408,7 @@
//Focus is not set in hidden widgets until they are shown
parent.show();
- //Give the parent widget time to be shown
- QTest::qWait(500);
+ QTest::qWaitForWindowShown(&parent);
otherLineEdit->setFocus();
Modified: trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp 2011-10-13 09:13:34 UTC (rev 338)
+++ trunk/ktutorial/ktutorial-library/tests/view/StepTextWidgetTest.cpp 2011-10-13 12:48:24 UTC (rev 339)
@@ -133,9 +133,11 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
+ QTest::qWaitForWindowShown(&widget);
+
QPoint position = centerOfText(widget, "widget to highlight");
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
- position, 500);
+ position);
QVERIFY(widgetToHighlight->findChild<WidgetHighlighter*>(""));
}
@@ -150,9 +152,11 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
+ QTest::qWaitForWindowShown(&widget);
+
QPoint position = centerOfText(widget, "widget to highlight");
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
- position, 500);
+ position);
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
position, 500);
@@ -172,8 +176,7 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
- //Give the widget time to be shown
- QTest::qWait(500);
+ QTest::qWaitForWindowShown(&widget);
QPoint position = centerOfText(widget, "widget to highlight");
showContextMenuAndSelectFirstOption(widget, position);
@@ -191,8 +194,7 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
- //Give the widget time to be shown
- QTest::qWait(500);
+ QTest::qWaitForWindowShown(&widget);
QPoint position = centerOfText(widget, "widget to highlight");
showContextMenuAndSelectFirstOption(widget, position);
@@ -215,8 +217,7 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
- //Give the widget time to be shown
- QTest::qWait(500);
+ QTest::qWaitForWindowShown(&widget);
QPoint position = centerOfText(widget, "widget to highlight");
showContextMenuCheckFirstOptionAndCancel(widget, position,
@@ -255,12 +256,14 @@
"<a href=\"widget:widget3\">third widget</a>");
widget.show();
+ QTest::qWaitForWindowShown(&widget);
+
QPoint position1 = centerOfText(widget, "first widget");
QPoint position2 = centerOfText(widget, "second widget");
QPoint position3 = centerOfText(widget, "third widget");
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
- position1, 500);
+ position1);
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
position2, 500);
@@ -320,9 +323,11 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
+ QTest::qWaitForWindowShown(&widget);
+
QPoint position = centerOfText(widget, "widget to highlight");
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
- position, 500);
+ position);
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
position, 500);
@@ -341,9 +346,11 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
+ QTest::qWaitForWindowShown(&widget);
+
QPoint position = centerOfText(widget, "widget to highlight");
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
- position, 500);
+ position);
//To get the focus, the parent window of the widget must be active
mainWindow.activateWindow();
@@ -365,9 +372,11 @@
widget.setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget.show();
+ QTest::qWaitForWindowShown(&widget);
+
QPoint position = centerOfText(widget, "widget to highlight");
QTest::mouseClick(widget.viewport(), Qt::LeftButton, Qt::NoModifier,
- position, 500);
+ position);
widget.setText("Another text");
@@ -384,9 +393,11 @@
widget->setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget->show();
+ QTest::qWaitForWindowShown(widget);
+
QPoint position = centerOfText(*widget, "widget to highlight");
QTest::mouseClick(widget->viewport(), Qt::LeftButton, Qt::NoModifier,
- position, 500);
+ position);
delete widget;
@@ -403,9 +414,11 @@
widget->setText("The <a href=\"widget:widgetName\">widget to highlight</a>");
widget->show();
+ QTest::qWaitForWindowShown(widget);
+
QPoint position = centerOfText(*widget, "widget to highlight");
QTest::mouseClick(widget->viewport(), Qt::LeftButton, Qt::NoModifier,
- position, 500);
+ position);
delete widgetToHighlight;
Modified: trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp 2011-10-13 09:13:34 UTC (rev 338)
+++ trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp 2011-10-13 12:48:24 UTC (rev 339)
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2010 by Daniel Calviño Sánchez *
+ * Copyright (C) 2009-2011 by Daniel Calviño Sánchez *
* dan...@gm... *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -215,7 +215,8 @@
StepWidget stepWidget("Test tutorial");
stepWidget.show();
- QTest::qWait(500);
+ QTest::qWaitForWindowShown(&stepWidget);
+
QPoint previousPosition = stepWidget.pos();
QPoint widgetCenter(stepWidget.size().width()/2,
@@ -229,7 +230,7 @@
//isn't enabled
stepWidget.setMouseTracking(true);
QTest::mousePress(&stepWidget, Qt::LeftButton,
- Qt::NoModifier, QPoint(), 500);
+ Qt::NoModifier, QPoint());
QCursor::setPos(previousPosition + widgetCenter + QPoint(42, 23));
QTest::mouseRelease(&stepWidget, Qt::LeftButton,
Qt::NoModifier, QPoint(), 500);
@@ -245,7 +246,8 @@
StepWidget stepWidget("Test tutorial");
stepWidget.show();
- QTest::qWait(500);
+ QTest::qWaitForWindowShown(&stepWidget);
+
QPoint previousPosition = stepWidget.pos();
QPoint widgetCenter(stepWidget.size().width()/2,
@@ -259,7 +261,7 @@
//isn't enabled
stepWidget.setMouseTracking(true);
QTest::mousePress(&stepWidget, Qt::LeftButton,
- Qt::NoModifier, QPoint(), 500);
+ Qt::NoModifier, QPoint());
QCursor::setPos(previousPosition + widgetCenter + QPoint(42, 23));
QTest::mouseRelease(&stepWidget, Qt::LeftButton,
Qt::NoModifier, QPoint(), 500);
@@ -278,8 +280,10 @@
StepWidget stepWidget("Test tutorial");
stepWidget.show();
- QTest::keyClick(&stepWidget, Qt::Key_F1, Qt::ShiftModifier, 500);
+ QTest::qWaitForWindowShown(&stepWidget);
+ QTest::keyClick(&stepWidget, Qt::Key_F1, Qt::ShiftModifier);
+
QVERIFY(QWhatsThis::inWhatsThisMode());
QWhatsThis::leaveWhatsThisMode();
}
@@ -288,10 +292,12 @@
StepWidget* stepWidget = new StepWidget("Test tutorial");
stepWidget->show();
+ QTest::qWaitForWindowShown(stepWidget);
+
QSignalSpy destroyedSpy(stepWidget, SIGNAL(destroyed(QObject*)));
QTest::mouseClick(closeButton(stepWidget), Qt::LeftButton,
- Qt::NoModifier, QPoint(), 500);
+ Qt::NoModifier, QPoint());
//Give it time to die
QTest::qWait(500);
@@ -302,12 +308,10 @@
StepWidget* stepWidget = new StepWidget("Test tutorial");
stepWidget->show();
+ QTest::qWaitForWindowShown(stepWidget);
+
QSignalSpy destroyedSpy(stepWidget, SIGNAL(destroyed(QObject*)));
- //The wait can't be made in the keyClick itself as, oddly, a crash happens
- //in that case. It seems that the widget is tried to be used (I don't know
- //for what) after being deleted if the wait is made in the keyClick.
- QTest::qWait(500);
QTest::keyClick(stepWidget, Qt::Key_Escape);
//Give it time to die
QTest::qWait(500);
Modified: trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp 2011-10-13 09:13:34 UTC (rev 338)
+++ trunk/ktutorial/ktutorial-library/tests/view/TutorialManagerDialogTest.cpp 2011-10-13 12:48:24 UTC (rev 339)
@@ -173,10 +173,12 @@
mTutorialManagerDialog->show();
+ QTest::qWaitForWindowShown(mTutorialManagerDialog);
+
tutorialList(mTutorialManagerDialog)->setFocus();
QTest::keyClick(tutorialList(mTutorialManagerDialog), Qt::Key_Space,
- Qt::NoModifier, 500);
+ Qt::NoModifier);
QItemSelectionModel* selectionModel =
tutorialList(mTutorialManagerDialog)->selectionModel();
@@ -213,10 +215,12 @@
mTutorialManagerDialog->show();
+ QTest::qWaitForWindowShown(mTutorialManagerDialog);
+
tutorialList(mTutorialManagerDialog)->setFocus();
QTest::keyClick(tutorialList(mTutorialManagerDialog), Qt::Key_Space,
- Qt::NoModifier, 500);
+ Qt::NoModifier);
QItemSelectionModel* selectionModel =
tutorialList(mTutorialManagerDialog)->selectionModel();
@@ -255,13 +259,15 @@
mTutorialManagerDialog->show();
+ QTest::qWaitForWindowShown(mTutorialManagerDialog);
+
QItemSelectionModel* selectionModel =
tutorialList(mTutorialManagerDialog)->selectionModel();
selectionModel->select(selectionModel->model()->index(1, 0),
QItemSelectionModel::Select);
QTest::mouseClick(startButton(mTutorialManagerDialog), Qt::LeftButton,
- Qt::NoModifier, QPoint(), 500);
+ Qt::NoModifier, QPoint());
QVERIFY(mTutorialManagerDialog->isHidden());
QVERIFY(mStartStep2->isActive());
@@ -304,7 +310,7 @@
QItemSelectionModel::Select);
QTest::keyClick(tutorialList(mTutorialManagerDialog), Qt::Key_Enter,
- Qt::NoModifier, 500);
+ Qt::NoModifier);
QVERIFY(mTutorialManagerDialog->isHidden());
QVERIFY(mStartStep2->isActive());
@@ -327,9 +333,14 @@
TutorialManagerDialog tutorialManagerDialog(mTutorialManager);
mTutorialManagerDialog->show();
+ QTest::qWaitForWindowShown(mTutorialManagerDialog);
+
QTest::keyClick(tutorialList(mTutorialManagerDialog), Qt::Key_Escape,
- Qt::NoModifier, 500);
+ Qt::NoModifier);
+ //Give Close button time to complete the press animation
+ QTest::qWait(500);
+
QVERIFY(mTutorialManagerDialog->isHidden());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
