diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index 89c5fe30919..d01d5cbc966 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -35,7 +35,9 @@ def main(): analyzerTargets = Targets.desktopTargetClasses() checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=analyzerTargets) editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") - if placeCursorToLine(editor, "MouseArea.*", True): + if placeCursorToLine(editor, "}"): + type(editor, '') + type(editor, '') type(editor, '') type(editor, '') typeLines(editor, ['Timer {', diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv index 7e1b41e3422..cd25a9eb10b 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv +++ b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv @@ -3,18 +3,7 @@ "main.qml:15" "Handling Signal" "2" "onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }" "main.qml:15" "JavaScript" "2" "onTriggered" "main.qml:4" "Creating" "2" "QtQuick.Window/Window" -"main.qml:33" "Creating" "2" "QtQuick/TextEdit" "main.qml:1" "Compiling" "1" "main.qml" "main.qml:10" "Creating" "2" "QtQuick/Timer" -"main.qml:37" "Binding" "1" "anchors.top: parent.top" -"main.qml:40" "Creating" "2" "QtQuick/Rectangle" -"main.qml:37" "JavaScript" "1" "expression for top" "main.qml:14" "Binding" "3" "running: runCount < 2" -"main.qml:26" "Creating" "2" "QtQuick/MouseArea" -"main.qml:38" "Binding" "1" "anchors.horizontalCenter: parent.horizontalCenter" -"main.qml:38" "JavaScript" "1" "expression for horizontalCenter" -"main.qml:41" "Binding" "1" "anchors.fill: parent" -"main.qml:27" "Binding" "1" "anchors.fill: parent" "main.qml:14" "JavaScript" "3" "expression for running" -"main.qml:41" "JavaScript" "1" "expression for fill" -"main.qml:27" "JavaScript" "1" "expression for fill" diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index 54b0d652ee5..c726d6468bb 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -35,7 +35,9 @@ def main(): workingDir = tempDir() checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targets) editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") - if placeCursorToLine(editor, "MouseArea.*", True): + if placeCursorToLine(editor, "}"): + type(editor, '') + type(editor, '') type(editor, '') type(editor, '') typeLines(editor, ['Timer {', @@ -50,7 +52,7 @@ def main(): test.log("Setting breakpoints") result = setBreakpointsForCurrentProject(filesAndLines) if result: - expectedBreakpointsOrder = [{os.path.join(workingDir, projectName, "main.cpp"):8}, + expectedBreakpointsOrder = [{os.path.join(workingDir, projectName, "main.cpp"):10}, {os.path.join(workingDir, projectName, "main.qml"):13}] availableConfigs = iterateBuildConfigs(len(checkedTargets), "Debug") progressBarWait()