From 68e38b89e38668a5570b4fc9194288abf5c86bee Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@qt.io>
Date: Thu, 11 Aug 2016 16:54:18 +0200
Subject: [PATCH] Squish: Update suite_QMLS

Project template was changed in
b18e084fc040f20804f22d127783060d2efe14e0

Change-Id: I89bf518756cd7d7859ffc6e9a56f1aed2e7e435f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 tests/system/suite_QMLS/tst_QMLS01/test.py | 8 ++++----
 tests/system/suite_QMLS/tst_QMLS02/test.py | 2 +-
 tests/system/suite_QMLS/tst_QMLS04/test.py | 8 ++++----
 tests/system/suite_QMLS/tst_QMLS05/test.py | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/system/suite_QMLS/tst_QMLS01/test.py b/tests/system/suite_QMLS/tst_QMLS01/test.py
index 49892cdec4d..cb8f6447a2a 100644
--- a/tests/system/suite_QMLS/tst_QMLS01/test.py
+++ b/tests/system/suite_QMLS/tst_QMLS01/test.py
@@ -116,23 +116,23 @@ def main():
     if not startQtCreatorWithNewAppAtQMLEditor(tempDir(), "SampleApp"):
         return
     # test "color: " suggestion usage with Enter key
-    if not testSuggestionsAuto("Text {", "col", "color:", "<Return>"):
+    if not testSuggestionsAuto("TextEdit {", "col", "color:", "<Return>"):
         saveAndExit()
         return
     # test "color: " suggestion usage with Tab key
-    if not testSuggestionsAuto("Text {", "col", "color:", "<Tab>"):
+    if not testSuggestionsAuto("TextEdit {", "col", "color:", "<Tab>"):
         saveAndExit()
         return
     # test "textChanged: " suggestion - automatic insert, because only one suggestion available
     shortcutToSuggestions = "<Ctrl+Space>"
     if platform.system() == "Darwin":
         shortcutToSuggestions = "<Meta+Space>"
-    if not testSuggestionsAuto("Text {","textChan", "textChanged:", shortcutToSuggestions):
+    if not testSuggestionsAuto("TextEdit {","baseu", "baseUrl:", shortcutToSuggestions):
         saveAndExit()
         return
     # change settings to manual insertion of suggestions
     changeAutocompleteToManual()
     # test manual suggestions
-    testSuggestionsManual("Text {", "col", "color:")
+    testSuggestionsManual("TextEdit {", "col", "color:")
     # exit qt creator
     saveAndExit()
diff --git a/tests/system/suite_QMLS/tst_QMLS02/test.py b/tests/system/suite_QMLS/tst_QMLS02/test.py
index 0672239e217..78101fc08fe 100644
--- a/tests/system/suite_QMLS/tst_QMLS02/test.py
+++ b/tests/system/suite_QMLS/tst_QMLS02/test.py
@@ -27,7 +27,7 @@ source("../shared/qmls.py")
 source("../../shared/suites_qtta.py")
 
 def main():
-    editorArea = startQtCreatorWithNewAppAtQMLEditor(tempDir(), "SampleApp", "Text {")
+    editorArea = startQtCreatorWithNewAppAtQMLEditor(tempDir(), "SampleApp", "TextEdit {")
     if not editorArea:
         return
     # write code with error (C should be lower case)
diff --git a/tests/system/suite_QMLS/tst_QMLS04/test.py b/tests/system/suite_QMLS/tst_QMLS04/test.py
index e387ecfd0eb..5dabdf7f0f2 100644
--- a/tests/system/suite_QMLS/tst_QMLS04/test.py
+++ b/tests/system/suite_QMLS/tst_QMLS04/test.py
@@ -27,7 +27,7 @@ source("../shared/qmls.py")
 
 def main():
     projectDir = tempDir()
-    editorArea = startQtCreatorWithNewAppAtQMLEditor(projectDir, "SampleApp", "Text {")
+    editorArea = startQtCreatorWithNewAppAtQMLEditor(projectDir, "SampleApp", "TextEdit {")
     if not editorArea:
         return
     for i in range(5):
@@ -45,9 +45,9 @@ def main():
     # verify if refactoring is done correctly
     waitFor("'MyComponent' in str(editorArea.plainText)", 2000)
     codeText = str(editorArea.plainText)
-    patternCodeToAdd = "MyComponent\s+\{\s*\}"
-    patternCodeToMove = "Text\s+\{.*\}"
-    # there should be empty MyComponent item instead of Text item
+    patternCodeToAdd = "MyComponent\s+\{\s*id: textEdit\s*\}"
+    patternCodeToMove = "TextEdit\s+\{.*\}"
+    # there should be empty MyComponent item instead of TextEdit item
     if re.search(patternCodeToAdd, codeText, re.DOTALL) and not re.search(patternCodeToMove, codeText, re.DOTALL):
         test.passes("Refactoring was properly applied in source file")
     else:
diff --git a/tests/system/suite_QMLS/tst_QMLS05/test.py b/tests/system/suite_QMLS/tst_QMLS05/test.py
index 58860c27a6e..3db2f02f015 100644
--- a/tests/system/suite_QMLS/tst_QMLS05/test.py
+++ b/tests/system/suite_QMLS/tst_QMLS05/test.py
@@ -26,7 +26,7 @@
 source("../shared/qmls.py")
 
 def main():
-    editorArea = startQtCreatorWithNewAppAtQMLEditor(tempDir(), "SampleApp", "Text {")
+    editorArea = startQtCreatorWithNewAppAtQMLEditor(tempDir(), "SampleApp", "TextEdit {")
     if not editorArea:
         return
     homeKey = "<Home>"