Squish: Don't close files before exiting Creator

It's not needed and it's fragile since
the menu item is disabled at times.

Change-Id: I0c72c5072374462d99740e7eaa752f91e019c6ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

7 files changed, 1 insertions, 16 deletions

diff --git a/tests/system/suite_CSUP/tst_CSUP02/test.py b/tests/system/suite_CSUP/tst_CSUP02/test.py
index f5e7894d62..ba8fce83c1 100644
--- a/tests/system/suite_CSUP/tst_CSUP02/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP02/test.py
@@ -88,9 +88,5 @@ def main():
                           "- Content of editor:\n%s" % editorWidget.plainText)
             invokeMenuItem('File', 'Revert "main.cpp" to Saved')
             clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
-            snooze(1)   # 'Close "main.cpp"' might still be disabled
-            # editor must be closed to get the second code model applied on re-opening the file
-            invokeMenuItem('File', 'Close "main.cpp"')
-            # exit qt creator
             invokeMenuItem("File", "Exit")
             waitForCleanShutdown()
diff --git a/tests/system/suite_CSUP/tst_CSUP03/test.py b/tests/system/suite_CSUP/tst_CSUP03/test.py
index 3fb713e74b..441c14f354 100644
--- a/tests/system/suite_CSUP/tst_CSUP03/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP03/test.py
@@ -120,7 +120,5 @@ def main():
                 test.compare(modifiedCode, expectedCode, "Verifying whether code matches expected.")
                 # reverting to initial state of main.cpp
                 revertMainCpp()
-            snooze(1)   # "Close All" might be disabled
-            invokeMenuItem('File', 'Close All')
             invokeMenuItem('File', 'Exit')
             waitForCleanShutdown()
diff --git a/tests/system/suite_CSUP/tst_CSUP04/test.py b/tests/system/suite_CSUP/tst_CSUP04/test.py
index 99ec6ae8db..167db47f51 100644
--- a/tests/system/suite_CSUP/tst_CSUP04/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP04/test.py
@@ -76,6 +76,5 @@ def main():
             # wait until search finished and verify search results
             waitForSearchResults()
             validateSearchResult(5 if JIRA.isBugStillOpen(2863) else 3)
-            invokeMenuItem("File", "Close All")
             invokeMenuItem("File", "Exit")
             waitForCleanShutdown()
diff --git a/tests/system/suite_CSUP/tst_CSUP05/test.py b/tests/system/suite_CSUP/tst_CSUP05/test.py
index 2bd3dd846c..f784a15cd3 100644
--- a/tests/system/suite_CSUP/tst_CSUP05/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP05/test.py
@@ -91,7 +91,6 @@ def main():
             clickButton(waitForObject(":Qt Creator.CloseFind_QToolButton"))
             test.verify(checkIfObjectExists(":*Qt Creator.Find_Find::Internal::FindToolBar", False),
                         "Verifying if: Find/Replace tab is closed.")
-            invokeMenuItem("File", "Close All")
-            clickButton(waitForObject(":Save Changes.Do not Save_QPushButton"))
             invokeMenuItem("File", "Exit")
+            clickButton(waitForObject(":Save Changes.Do not Save_QPushButton"))
             waitForCleanShutdown()
diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py
index 3ac5208842..7f6afe7af0 100644
--- a/tests/system/suite_CSUP/tst_CSUP06/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP06/test.py
@@ -172,8 +172,5 @@ def main():
                 checkSymbolCompletion(editor, useClang)
                 invokeMenuItem('File', 'Revert "main.cpp" to Saved')
                 clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
-            snooze(1)   # 'Close "main.cpp"' might still be disabled
-            # editor must be closed to get the second code model applied on re-opening the file
-            invokeMenuItem('File', 'Close "main.cpp"')
             invokeMenuItem("File", "Exit")
             waitForCleanShutdown()
diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py
index f7e7ed6737..3c3625b61b 100644
--- a/tests/system/suite_editors/tst_memberoperator/test.py
+++ b/tests/system/suite_editors/tst_memberoperator/test.py
@@ -96,7 +96,5 @@ def main():
                     __verifyLineUnderCursor__(cppwindow, record)
                 invokeMenuItem("File", 'Revert "main.cpp" to Saved')
                 clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
-            snooze(1)
-            invokeMenuItem("File", "Close All")
             invokeMenuItem("File", "Exit")
             waitForCleanShutdown()
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index 0b2331926e..d5f99f6ea6 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/tests/system/suite_tools/tst_git_local/test.py
@@ -226,8 +226,6 @@ def main():
     waitFor('str(changed.plainText) != "Waiting for data..."', 5000)
     test.compare(str(changed.plainText), "Retrieving data failed.",
                  "Showing an invalid commit can't succeed but Creator survived.")
-
-    invokeMenuItem("File", "Close All Projects and Editors")
     invokeMenuItem("File", "Exit")
 
 def deleteProject():