summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2012-10-01 17:01:25 +0200
committerRobert Loehning <robert.loehning@digia.com>2012-10-02 12:17:27 +0200
commit4df4d1c0c4aa61d0177c44c4f62cb3f19328bbb9 (patch)
tree8d9331f850e419f545cfd8786db6d95884a88ed4
parent37a95617f23bf6bcb2ed61ac192d3f2b40827b49 (diff)
downloadqt-creator-4df4d1c0c4aa61d0177c44c4f62cb3f19328bbb9.tar.gz
Squish: Added test for automatic conversion from "." to "->"
Change-Id: Ib1cd24818b691fc4ccd43b60ff4afdd4e0394fde Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--tests/system/objects.map2
-rw-r--r--tests/system/suite_editors/suite.conf12
-rw-r--r--tests/system/suite_editors/tst_memberoperator/test.py26
-rw-r--r--tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv23
4 files changed, 63 insertions, 0 deletions
diff --git a/tests/system/objects.map b/tests/system/objects.map
index ce30f1bdaf..98896e6c4f 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -105,6 +105,8 @@
:QtSupport__Internal__QtVersionManager.QLabel {container=':qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget' type='QLabel' unnamed='1' visible='1'}
:QtSupport__Internal__QtVersionManager.qmake_QLabel {container=':qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget' name='qmakePath' type='QLabel' visible='1'}
:QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget {container=':qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget' name='qtdirList' type='QTreeWidget' visible='1'}
+:Revert to Saved.Proceed_QPushButton {text='Proceed' type='QPushButton' unnamed='1' visible='1' window=':Revert to Saved_QMessageBox'}
+:Revert to Saved_QMessageBox {text?='You will lose your current changes if you proceed reverting*' type='QMessageBox' unnamed='1' visible='1'}
:Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
:Symbol Server_Utils::CheckableMessageBox {type='Utils::CheckableMessageBox' unnamed='1' visible='1' windowTitle='Symbol Server'}
:addToVersionControlComboBox_QComboBox {name='addToVersionControlComboBox' type='QComboBox' visible='1'}
diff --git a/tests/system/suite_editors/suite.conf b/tests/system/suite_editors/suite.conf
new file mode 100644
index 0000000000..717453e22d
--- /dev/null
+++ b/tests/system/suite_editors/suite.conf
@@ -0,0 +1,12 @@
+AUT=qtcreator
+CLASS=
+CLASSPATH=
+CWD=
+ENVVARS=envvars
+HOOK_SUB_PROCESSES=false
+IMPLICITAUTSTART=0
+LANGUAGE=Python
+OBJECTMAP=../objects.map
+TEST_CASES=tst_memberoperator
+VERSION=2
+WRAPPERS=Qt
diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py
new file mode 100644
index 0000000000..7e329ba900
--- /dev/null
+++ b/tests/system/suite_editors/tst_memberoperator/test.py
@@ -0,0 +1,26 @@
+source("../../shared/qtcreator.py")
+
+def main():
+ startApplication("qtcreator" + SettingsPath)
+ createProject_Qt_Console(tempDir(), "SquishProject")
+ selectFromLocator("main.cpp")
+ cppwindow = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
+
+ for record in testData.dataset("usages.tsv"):
+ include = testData.field(record, "include")
+ if include:
+ placeCursorToLine(cppwindow, "#include <QCoreApplication>")
+ typeLines(cppwindow, ("", "#include " + include))
+ placeCursorToLine(cppwindow, "return a.exec();")
+ typeLines(cppwindow, ("<Up>", testData.field(record, "declaration")))
+ type(cppwindow, testData.field(record, "usage"))
+ waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}",
+ "sourceFilesRefreshed(QStringList)")
+ type(cppwindow, testData.field(record, "operator"))
+ waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}",
+ "sourceFilesRefreshed(QStringList)")
+ test.compare(str(lineUnderCursor(cppwindow)).strip(), testData.field(record, "expected"))
+ invokeMenuItem("File", 'Revert "main.cpp" to Saved')
+ clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
+
+ invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv b/tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv
new file mode 100644
index 0000000000..a1e21767bf
--- /dev/null
+++ b/tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv
@@ -0,0 +1,23 @@
+"include" "declaration" "usage" "operator" "expected"
+"" "" "syntaxError" "." "syntaxError."
+"" "" "argc" "." "argc."
+"" "" "argv[0]" "." "argv[0]."
+"" "QCoreApplication qa;" "qa" "." "qa."
+"" "QCoreApplication *p;" "p" "." "p->"
+"" "QCoreApplication &ref = a;" "ref" "." "ref."
+"<QPointer>" "QPointer p;" "p" "." "p."
+"<QPointer>" "QPointer *poi;" "poi" "." "poi->"
+"<QPointer>" "QPointer &poi;" "poi" "." "poi."
+"<QPointer>" "QPointer poi[5];" "poi[2]" "." "poi[2]."
+"<QPointer>" "QPointer *poi[5];" "poi[2]" "." "poi[2]->"
+"<memory>" "std::auto_ptr sap;" "sap" "." "sap."
+"<memory>" "std::auto_ptr *sap;" "sap" "." "sap->"
+"<memory>" "std::auto_ptr &sap;" "sap" "." "sap."
+"<memory>" "std::auto_ptr sap[10];" "sap[2]" "." "sap[2]."
+"<memory>" "std::auto_ptr *sap[10];" "sap[2]" "." "sap[2]->"
+"<QVector>" "QVector<QCoreApplication> vec;" "vec" "." "vec."
+"<QVector>" "QVector<QCoreApplication *> vec;" "vec" "." "vec."
+"<QVector>" "QVector<QCoreApplication> *vec;" "vec" "." "vec->"
+"<QVector>" "QVector<QCoreApplication *> *vec;" "vec" "." "vec->"
+"<QVector>" "QVector<QCoreApplication> vec;" "vec[0]" "." "vec[0]."
+"<QVector>" "QVector<QCoreApplication *> vec;" "vec[0]" "." "vec[0]->"