diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2014-04-03 08:58:19 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-04-04 12:18:00 +0200 |
| commit | 0369e2a11437a96b8c1c41ffacc1ea4e82ec97d4 (patch) | |
| tree | c48b72971a644873780cdb775ebd58342b39c2c0 /tests/system/suite_QMLS/tst_QMLS04/test.py | |
| parent | 5d76b4339a717cd944c4a3c27eac860b8111d645 (diff) | |
| download | qt-creator-0369e2a11437a96b8c1c41ffacc1ea4e82ec97d4.tar.gz | |
Squish: Remove workaround
QTCREATORBUG-11548 has a quick fix now.
Change-Id: Ia9f38f58bf5d11d5ece4779fd7527fbf8ae65fb1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Diffstat (limited to 'tests/system/suite_QMLS/tst_QMLS04/test.py')
| -rw-r--r-- | tests/system/suite_QMLS/tst_QMLS04/test.py | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/tests/system/suite_QMLS/tst_QMLS04/test.py b/tests/system/suite_QMLS/tst_QMLS04/test.py index 59011f90c1..2c57f9b368 100644 --- a/tests/system/suite_QMLS/tst_QMLS04/test.py +++ b/tests/system/suite_QMLS/tst_QMLS04/test.py @@ -57,7 +57,6 @@ def main(): 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" - filePath = os.path.join(projectDir, "SampleApp", "qml", "MyComponent.qml") # there should be new QML file generated with name "MyComponent.qml" try: waitForObjectItem(":Qt Creator_Utils::NavigationTreeView", myCompTE, 3000) @@ -65,23 +64,18 @@ def main(): try: waitForObjectItem(":Qt Creator_Utils::NavigationTreeView", addBranchWildcardToRoot(myCompTE), 1000) except: - test.xverify(False, "Refactoring failed - file MyComponent.qml was not generated " - "properly in project explorer (QTCREATORBUG-11548") - try: - JIRA.performWorkaroundForBug(11548, JIRA.Bug.CREATOR, projectDir, "SampleApp", filePath) - except JIRA.JiraException: - #save and exit - invokeMenuItem("File", "Save All") - invokeMenuItem("File", "Exit") - return -# following section is done by the workaround for 11548 already - uncomment when removing workaround -# test.passes("Refactoring - file MyComponent.qml was generated properly in project explorer") -# # open MyComponent.qml file for verification -# if not openDocument(myCompTE): -# test.fatal("Could not open MyComponent.qml.") -# invokeMenuItem("File", "Save All") -# invokeMenuItem("File", "Exit") -# return + test.fail("Refactoring failed - file MyComponent.qml was not generated properly in project explorer") + #save and exit + invokeMenuItem("File", "Save All") + invokeMenuItem("File", "Exit") + return + test.passes("Refactoring - file MyComponent.qml was generated properly in project explorer") + # open MyComponent.qml file for verification + if not openDocument(myCompTE): + test.fatal("Could not open MyComponent.qml.") + invokeMenuItem("File", "Save All") + invokeMenuItem("File", "Exit") + return editorArea = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") codeText = str(editorArea.plainText) # there should be Text item in new file @@ -92,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(filePath), + test.verify(os.path.exists(os.path.join(projectDir, "SampleApp", "qml", "MyComponent.qml")), "Verifying if MyComponent.qml exists in file system after save") invokeMenuItem("File", "Exit") |