From ba793f02a6167007a2bcacdb2c8c4cf8c0bb24f1 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Thu, 2 Oct 2014 12:57:18 +0200
Subject: Squish: Refactor and improve tst_CSUP01

Change-Id: I154ebcc01a870b0bf3912a69b37184fd2f37092a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
 tests/system/suite_CSUP/tst_CSUP01/test.py | 60 +++++++++++++++---------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/tests/system/suite_CSUP/tst_CSUP01/test.py b/tests/system/suite_CSUP/tst_CSUP01/test.py
index cfbf2ed4e5..8e953a6de8 100644
--- a/tests/system/suite_CSUP/tst_CSUP01/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP01/test.py
@@ -30,6 +30,21 @@
 source("../../shared/suites_qtta.py")
 source("../../shared/qtcreator.py")
 
+def resetLine(editorWidget):
+    if platform.system() == "Darwin":
+        type(editorWidget, "<Ctrl+Left>")
+        type(editorWidget, "<Meta+Shift+Right>")
+    else:
+        type(editorWidget, "<Home>")
+        type(editorWidget, "<Shift+End>")
+    type(editorWidget, "<Delete>")
+
+def triggerCompletion(editorWidget):
+    if platform.system() == "Darwin":
+        type(editorWidget, "<Meta+Space>")
+    else:
+        type(editorWidget, "<Ctrl+Space>")
+
 # entry of test
 def main():
     startApplication("qtcreator" + SettingsPath)
@@ -47,57 +62,42 @@ def main():
                 "Step 2: Verifying if: .cpp file is opened in Edit mode.")
 # Step 3: Insert text "re" to new line in Editor mode and press Ctrl+Space.
     editorWidget = findObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
-    mouseClick(editorWidget, 5, 5, 0, Qt.LeftButton)
+    if not placeCursorToLine(editorWidget, "QApplication app(argc, argv);"):
+        earlyExit("Did not find first line in function block.")
+        return
     type(editorWidget, "<Return>")
-    type(editorWidget, "<Up>")
     type(editorWidget, "re")
-    if platform.system() == "Darwin":
-        type(editorWidget, "<Meta+Space>")
-    else:
-        type(editorWidget, "<Ctrl+Space>")
+    triggerCompletion(editorWidget)
     waitForObjectItem(":popupFrame_Proposal_QListView", "register")
     doubleClickItem(":popupFrame_Proposal_QListView", "register", 5, 5, 0, Qt.LeftButton)
-    test.verify(str(editorWidget.plainText).startswith("register"),
-                "Step 3: Verifying if: The list of suggestions is opened. It is "
-                "possible to select one of the suggestions.")
+    test.compare(str(lineUnderCursor(editorWidget)).strip(), "register",
+                 "Step 3: Verifying if: The list of suggestions is opened. It is "
+                 "possible to select one of the suggestions.")
 # Step 4: Insert text "voi" to new line and press Tab.
-    mouseClick(editorWidget, 5, 5, 0, Qt.LeftButton)
-    if platform.system() == "Darwin":
-        type(editorWidget, "<Meta+Shift+Right>")
-    else:
-        type(editorWidget, "<Shift+End>")
-    type(editorWidget, "<Delete>")
+    resetLine(editorWidget)
     type(editorWidget, "voi")
     waitForObjectItem(":popupFrame_Proposal_QListView", "void")
     type(waitForObject(":popupFrame_Proposal_QListView"), "<Tab>")
-    test.verify(str(editorWidget.plainText).startswith("void"),
-                "Step 4: Verifying if: Word 'void' is completed because only one option is available.")
+    test.compare(str(lineUnderCursor(editorWidget)).strip(), "void",
+                 "Step 4: Verifying if: Word 'void' is completed because only one option is available.")
 # Step 5: From "Tools -> Options -> Text Editor -> Completion" select Activate completion Manually,
 # uncheck Autocomplete common prefix and press Apply and then Ok . Return to Edit mode.
     test.log("Step 5: Change Code Completion settings")
     changeAutocompleteToManual()
 # Step 6: Insert text "ret" and press Ctrl+Space.
     editorWidget = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
-    mouseClick(editorWidget, 5, 5, 0, Qt.LeftButton)
-    if platform.system() == "Darwin":
-        type(editorWidget, "<Meta+Shift+Right>")
-    else:
-        type(editorWidget, "<Shift+End>")
-    type(editorWidget, "<Delete>")
+    resetLine(editorWidget)
     type(editorWidget, "ret")
-    if platform.system() == "Darwin":
-        type(editorWidget, "<Meta+Space>")
-    else:
-        type(editorWidget, "<Ctrl+Space>")
+    triggerCompletion(editorWidget)
     try:
         waitForObjectItem(":popupFrame_Proposal_QListView", "return")
     except:
         test.fail("Could not find proposal popup.")
     type(editorWidget, "<Right>")
     type(editorWidget, "<Backspace>")
-    test.verify(str(editorWidget.plainText).startswith("ret#"),
-                "Step 6: Verifying if: Suggestion is displayed but text is not "
-                "completed automatically even there is only one suggestion.")
+    test.compare(str(lineUnderCursor(editorWidget)).strip(), "ret",
+                 "Step 6: Verifying if: Suggestion is displayed but text is not "
+                 "completed automatically even there is only one suggestion.")
     # exit qt creator
     invokeMenuItem("File", "Save All")
     invokeMenuItem("File", "Exit")
-- 
cgit v1.2.1