diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-28 12:49:50 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-28 12:49:50 (GMT) |
| commit | 8b2af7274e5dae4ae24752489815e4fd51e2f0ec (patch) | |
| tree | cb51ae1960fff56654f079aac48655444f938af4 /tests/auto/qscriptvalue | |
| parent | 9e6407ac53ffa62439a52beb1adc8169664c569a (diff) | |
| download | Qt-8b2af7274e5dae4ae24752489815e4fd51e2f0ec.zip Qt-8b2af7274e5dae4ae24752489815e4fd51e2f0ec.tar.gz Qt-8b2af7274e5dae4ae24752489815e4fd51e2f0ec.tar.bz2 | |
remove some of the output noise for UserRange property flags test
No need to repeatedly do a comparison that will fail.
Diffstat (limited to 'tests/auto/qscriptvalue')
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index ac72c29..401161d 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -1828,7 +1828,7 @@ void tst_QScriptValue::getSetProperty() QCOMPARE(object4.propertyFlags("foo") & ~QScriptValue::UserRange, QScriptValue::PropertyGetter ); - QEXPECT_FAIL("", "User-range flags are not retained", Continue); + QEXPECT_FAIL("", "User-range flags are not retained for getter/setter properties", Continue); QCOMPARE(object4.propertyFlags("foo"), QScriptValue::PropertyGetter | QScriptValue::UserRange); object4.setProperty("x", num); @@ -1836,13 +1836,12 @@ void tst_QScriptValue::getSetProperty() // setter() sets this.x object4.setProperty("foo", eng.newFunction(setter), - QScriptValue::PropertySetter | QScriptValue::UserRange); + QScriptValue::PropertySetter); QCOMPARE(object4.propertyFlags("foo") & ~QScriptValue::UserRange, QScriptValue::PropertySetter | QScriptValue::PropertyGetter); - QEXPECT_FAIL("", "User-range flags are not retained", Continue); QCOMPARE(object4.propertyFlags("foo"), - QScriptValue::PropertySetter | QScriptValue::PropertyGetter | QScriptValue::UserRange); + QScriptValue::PropertySetter | QScriptValue::PropertyGetter); object4.setProperty("foo", str); QCOMPARE(object4.property("x").strictlyEquals(str), true); QCOMPARE(object4.property("foo").strictlyEquals(str), true); @@ -1898,12 +1897,9 @@ void tst_QScriptValue::getSetProperty() // use a single function as both getter and setter object4.setProperty("foo", QScriptValue()); object4.setProperty("foo", eng.newFunction(getterSetter), - QScriptValue::PropertyGetter | QScriptValue::PropertySetter - | QScriptValue::UserRange); - QEXPECT_FAIL("", "User-range flags are not retained", Continue); + QScriptValue::PropertyGetter | QScriptValue::PropertySetter); QCOMPARE(object4.propertyFlags("foo"), - QScriptValue::PropertyGetter | QScriptValue::PropertySetter - | QScriptValue::UserRange); + QScriptValue::PropertyGetter | QScriptValue::PropertySetter); object4.setProperty("x", num); QCOMPARE(object4.property("foo").strictlyEquals(num), true); @@ -2075,7 +2071,7 @@ void tst_QScriptValue::getSetProperty() QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly | QScriptValue::Undeletable); object.setProperty("flagProperty", str, QScriptValue::UserRange); - QEXPECT_FAIL("", "User-range flags are not retained", Continue); + QEXPECT_FAIL("", "User-range flags are not retained for normal properties (JSC discards them?)", Continue); QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::UserRange); // using interned strings |