Commit f3f1edfa authored by Christian Stenger's avatar Christian Stenger
Browse files

Squish: Fix Qt Quick / QML related tests



Adjust expected files to slightly changed layout.

Change-Id: I4b5ab838558b2e1b3a0c13fafcc37efebb014c19
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent 864d3aa9
......@@ -38,7 +38,7 @@ def main():
# create qt quick application
createNewQtQuickApplication(tempDir(), "SampleApp")
# create syntax error in qml file
openDocument("SampleApp.QML.qml/SampleApp.main\\.qml")
openDocument("SampleApp.QML.qml.main\\.qml")
if not appendToLine(waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget"), "Text {", "SyntaxError"):
invokeMenuItem("File", "Exit")
return
......
......@@ -52,14 +52,14 @@ def main():
'onTriggered: console.log("Break here")'])
invokeMenuItem("File", "Save All")
filesAndLines = [
{ "%s.QML.qml/%s.main\\.qml" % (projectName,projectName) : 'onTriggered.*' },
{ "%s.QML.qml.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", projectName, "main.qml"):13}]
{os.path.join(workingDir, projectName, "qml", "main.qml"):13}]
# Only use 4.7.4 to work around QTBUG-25187
availableConfigs = iterateBuildConfigs(len(checkedTargets), "Debug")
progressBarWait()
......
......@@ -44,7 +44,7 @@ def main():
invokeMenuItem("File", "Exit")
def prepareQmlFile():
if not openDocument("untitled.QML.qml/untitled.main\\.qml"):
if not openDocument("untitled.QML.qml.main\\.qml"):
test.fatal("Could not open main.qml")
return False
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment