From 8eefc3441968402dc12fa8a8183e1cb3739d7b4f Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Tue, 8 Apr 2014 15:34:46 +0200
Subject: [PATCH] Squish: Update paths to QML files

Reaction to 96367b6253c09d77b6600ba2d334c00e03cc1180

Change-Id: I9651f9cac2b6c48158fa9094ef86ef04460e8a16
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
 tests/system/suite_QMLS/shared/qmls.py               | 2 +-
 tests/system/suite_QMLS/tst_QMLS04/test.py           | 4 ++--
 tests/system/suite_SCOM/tst_SCOM02/test.py           | 2 +-
 tests/system/suite_debugger/tst_simple_debug/test.py | 4 ++--
 tests/system/suite_editors/tst_qml_indent/test.py    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/system/suite_QMLS/shared/qmls.py b/tests/system/suite_QMLS/shared/qmls.py
index 264395c090b..f4842f457d9 100644
--- a/tests/system/suite_QMLS/shared/qmls.py
+++ b/tests/system/suite_QMLS/shared/qmls.py
@@ -37,7 +37,7 @@ def startQtCreatorWithNewAppAtQMLEditor(projectDir, projectName, line = None):
     # create qt quick application
     createNewQtQuickApplication(projectDir, projectName)
     # open qml file
-    qmlFile = projectName + ".Resources.qml\.qrc./.qml/main\\.qml"
+    qmlFile = projectName + ".Resources.qml\.qrc./.main\\.qml"
     if not openDocument(qmlFile):
         test.fatal("Could not open %s" % qmlFile)
         invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_QMLS/tst_QMLS04/test.py b/tests/system/suite_QMLS/tst_QMLS04/test.py
index 2c57f9b368b..a14d43a7c0a 100644
--- a/tests/system/suite_QMLS/tst_QMLS04/test.py
+++ b/tests/system/suite_QMLS/tst_QMLS04/test.py
@@ -56,7 +56,7 @@ def main():
         test.passes("Refactoring was properly applied in source file")
     else:
         test.fail("Refactoring of Text to MyComponent failed in source file. Content of editor:\n%s" % codeText)
-    myCompTE = "SampleApp.Resources.qml\\.qrc./.qml/MyComponent\\.qml"
+    myCompTE = "SampleApp.Resources.qml\\.qrc./.MyComponent\\.qml"
     # there should be new QML file generated with name "MyComponent.qml"
     try:
         waitForObjectItem(":Qt Creator_Utils::NavigationTreeView", myCompTE, 3000)
@@ -86,6 +86,6 @@ def main():
     #save and exit
     invokeMenuItem("File", "Save All")
     # check if new file was created in file system
-    test.verify(os.path.exists(os.path.join(projectDir, "SampleApp", "qml", "MyComponent.qml")),
+    test.verify(os.path.exists(os.path.join(projectDir, "SampleApp", "MyComponent.qml")),
                 "Verifying if MyComponent.qml exists in file system after save")
     invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_SCOM/tst_SCOM02/test.py b/tests/system/suite_SCOM/tst_SCOM02/test.py
index a72d4f9b5dc..cb799f88464 100644
--- a/tests/system/suite_SCOM/tst_SCOM02/test.py
+++ b/tests/system/suite_SCOM/tst_SCOM02/test.py
@@ -38,7 +38,7 @@ def main():
     # create qt quick application
     createNewQtQuickApplication(tempDir(), "SampleApp")
     # create syntax error in qml file
-    openDocument("SampleApp.Resources.qml\.qrc./.qml/main\\.qml")
+    openDocument("SampleApp.Resources.qml\.qrc./.main\\.qml")
     if not appendToLine(waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget"), "Text {", "SyntaxError"):
         invokeMenuItem("File", "Exit")
         return
diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py
index 963f0b000d8..1af223bf116 100644
--- a/tests/system/suite_debugger/tst_simple_debug/test.py
+++ b/tests/system/suite_debugger/tst_simple_debug/test.py
@@ -48,14 +48,14 @@ def main():
                            'onTriggered: console.log("Break here")'])
         invokeMenuItem("File", "Save All")
         filesAndLines = [
-                        { "%s.Resources.qml\.qrc./.qml/main\\.qml" % projectName : 'onTriggered.*' },
+                        { "%s.Resources.qml\.qrc./.main\\.qml" % projectName : 'onTriggered.*' },
                         { "%s.Sources.main\\.cpp" % projectName : "viewer.setOrientation\\(.+\\);" }
                         ]
         test.log("Setting breakpoints")
         result = setBreakpointsForCurrentProject(filesAndLines)
         if result:
             expectedBreakpointsOrder = [{os.path.join(workingDir, projectName, "main.cpp"):10},
-                                        {os.path.join(workingDir, projectName, "qml", "main.qml"):10}]
+                                        {os.path.join(workingDir, projectName, "main.qml"):10}]
             # Only use 4.7.4 to work around QTBUG-25187
             availableConfigs = iterateBuildConfigs(len(checkedTargets), "Debug")
             progressBarWait()
diff --git a/tests/system/suite_editors/tst_qml_indent/test.py b/tests/system/suite_editors/tst_qml_indent/test.py
index e490983d1c3..9f163542892 100644
--- a/tests/system/suite_editors/tst_qml_indent/test.py
+++ b/tests/system/suite_editors/tst_qml_indent/test.py
@@ -45,7 +45,7 @@ def main():
     invokeMenuItem("File", "Exit")
 
 def prepareQmlFile():
-    if not openDocument("untitled.Resources.qml\.qrc./.qml/main\\.qml"):
+    if not openDocument("untitled.Resources.qml\.qrc./.main\\.qml"):
         test.fatal("Could not open main.qml")
         return None
     editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
-- 
GitLab