aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-08-01 21:39:35 +0200
committerLars Knoll <lars.knoll@qt.io>2018-08-02 20:25:18 +0000
commit245cb6b6a3e5a04dc43a3c4ce15831f68309e97f (patch)
treeda8e49f1110967f28a8f37dcd3e5a373297b0297 /tests/auto/qml
parentf289141524d9331bdafd9f88d95e0fa9b29ccdee (diff)
Fix a couple of test failures related to error objects
Set up the prototype chain for error objects correctly, and make them inherit from the right classes. Change-Id: I7bb12b3bb285950a1bff25e5c62954287a95970a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml')
-rw-r--r--tests/auto/qml/ecmascripttests/TestExpectations19
-rw-r--r--tests/auto/qml/qjsvalue/tst_qjsvalue.cpp2
2 files changed, 1 insertions, 20 deletions
diff --git a/tests/auto/qml/ecmascripttests/TestExpectations b/tests/auto/qml/ecmascripttests/TestExpectations
index 186e4f6320..5ddfc02b44 100644
--- a/tests/auto/qml/ecmascripttests/TestExpectations
+++ b/tests/auto/qml/ecmascripttests/TestExpectations
@@ -378,7 +378,6 @@ built-ins/Date/prototype/toUTCString/format.js fails
built-ins/Date/prototype/toUTCString/month-names.js fails
built-ins/Date/subclassing.js fails
built-ins/Error/proto-from-ctor-realm.js fails
-built-ins/Error/prototype/S15.11.4_A2.js fails
built-ins/Function/call-bind-this-realm-undef.js fails
built-ins/Function/call-bind-this-realm-value.js fails
built-ins/Function/internals/Call/class-ctor-realm.js fails
@@ -446,18 +445,6 @@ built-ins/Map/prototype/size/returns-count-of-present-values-by-iterable.js fail
built-ins/Map/prototype/values/does-not-have-mapdata-internal-slot-weakmap.js fails
built-ins/Math/max/zeros.js fails
built-ins/Math/round/S15.8.2.15_A7.js fails
-built-ins/NativeErrors/EvalError/proto.js fails
-built-ins/NativeErrors/EvalError/prototype/not-error-object.js fails
-built-ins/NativeErrors/RangeError/proto.js fails
-built-ins/NativeErrors/RangeError/prototype/not-error-object.js fails
-built-ins/NativeErrors/ReferenceError/proto.js fails
-built-ins/NativeErrors/ReferenceError/prototype/not-error-object.js fails
-built-ins/NativeErrors/SyntaxError/proto.js fails
-built-ins/NativeErrors/SyntaxError/prototype/not-error-object.js fails
-built-ins/NativeErrors/TypeError/proto.js fails
-built-ins/NativeErrors/TypeError/prototype/not-error-object.js fails
-built-ins/NativeErrors/URIError/proto.js fails
-built-ins/NativeErrors/URIError/prototype/not-error-object.js fails
built-ins/Number/isFinite/arg-is-not-number.js fails
built-ins/Number/isNaN/arg-is-not-number.js fails
built-ins/Number/proto-from-ctor-realm.js fails
@@ -510,12 +497,6 @@ built-ins/Object/getOwnPropertyDescriptors/proxy-undefined-descriptor.js fails
built-ins/Object/getOwnPropertyDescriptors/symbols-included.js fails
built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js fails
built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js fails
-built-ins/Object/getPrototypeOf/15.2.3.2-2-12.js fails
-built-ins/Object/getPrototypeOf/15.2.3.2-2-13.js fails
-built-ins/Object/getPrototypeOf/15.2.3.2-2-14.js fails
-built-ins/Object/getPrototypeOf/15.2.3.2-2-15.js fails
-built-ins/Object/getPrototypeOf/15.2.3.2-2-16.js fails
-built-ins/Object/getPrototypeOf/15.2.3.2-2-17.js fails
built-ins/Object/isExtensible/15.2.3.13-1-1.js fails
built-ins/Object/isExtensible/15.2.3.13-1-2.js fails
built-ins/Object/isFrozen/15.2.3.12-1-1.js fails
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
index 6384369ef0..f9718e3699 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
@@ -1259,7 +1259,7 @@ void tst_QJSValue::isError_propertiesOfGlobalObject()
for (int i = 0; i < errors.size(); ++i) {
QJSValue ctor = eng.globalObject().property(errors.at(i));
QVERIFY(ctor.isCallable());
- QVERIFY(ctor.property("prototype").isError());
+ QVERIFY(ctor.property("prototype").isObject());
}
}