From c9081c0c783bdb737e2d45f0d3ee4f0aee3a8064 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 7 Jun 2013 20:35:42 +0200 Subject: [PATCH] Remove failing test This test doesn't seem to make sense anymore, as it tested an implementation aspect of the previous engine with the expression rewriter and v8 compilation. Change-Id: I17a83b82080ab567431d8dc403f14f5266a81ba4 Reviewed-by: Lars Knoll --- .../auto/qml/qqmlecmascript/data/v8functionException.qml | 15 --------------- tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 14 -------------- 2 files changed, 29 deletions(-) delete mode 100644 tests/auto/qml/qqmlecmascript/data/v8functionException.qml diff --git a/tests/auto/qml/qqmlecmascript/data/v8functionException.qml b/tests/auto/qml/qqmlecmascript/data/v8functionException.qml deleted file mode 100644 index 51df1c6..0000000 --- a/tests/auto/qml/qqmlecmascript/data/v8functionException.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 - -// This test uses a multi-line string which has \r-terminated -// string fragments. The expression rewriter deliberately doesn't -// handle \r-terminated string fragments (see QTBUG-24064) and thus -// this test ensures that we don't crash when the client attempts -// to invoke a non-compiled dynamic slot. - -Item { - id: root - - function dynamicSlot() { - var someString = "Hello, this is a multiline string"; - } -} diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index ba47957..f486df5 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -219,7 +219,6 @@ private slots: void functionAssignment_afterBinding(); void eval(); void function(); - void functionException(); void qtbug_10696(); void qtbug_11606(); void qtbug_11600(); @@ -5770,19 +5769,6 @@ void tst_qqmlecmascript::function() delete o; } -void tst_qqmlecmascript::functionException() -{ - // QTBUG-24037 - shouldn't crash. - QString errstr = testFileUrl("v8functionException.qml").toString() + QLatin1String(":13: SyntaxError: Unexpected token ILLEGAL"); - QTest::ignoreMessage(QtWarningMsg, qPrintable(errstr)); - QTest::ignoreMessage(QtWarningMsg, ": Exception occurred during compilation of function: dynamicSlot()"); - QQmlComponent component(&engine, testFileUrl("v8functionException.qml")); - QObject *o = component.create(); - QVERIFY(o != 0); - QMetaObject::invokeMethod(o, "dynamicSlot"); - delete o; -} - // Test the "Qt.include" method void tst_qqmlecmascript::include() { -- 2.7.4