aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-01-16 15:13:51 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-01 08:37:49 +0100
commit422e2998364d6aae14e65823b315c5e2ae529a62 (patch)
treef7f721bf46684de287b7b3bac3859638444a0673 /tests/auto/declarative
parent24bf48e3dd305dbc4fdcae5f8751792835ffd46a (diff)
Remove QJSValue::toUInt16() function
Rationale: Remnant from QtScript. The implementation is just zeroing the upper 16 bits of the 32-bit integer conversion. Task-number: QTBUG-23604 Change-Id: I6b4b40883da01713d2a946eb028264f3a351276b Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp157
-rw-r--r--tests/auto/declarative/qjsvalue/tst_qjsvalue.h1
2 files changed, 0 insertions, 158 deletions
diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
index eeae7a3054..8e6e012db3 100644
--- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
@@ -999,163 +999,6 @@ void tst_QJSValue::toUInt()
QCOMPARE(qjsvalue_cast<quint32>(inv), quint32(0));
}
-void tst_QJSValue::toUInt16()
-{
- QJSEngine eng;
-
- {
- QJSValue zer0 = QJSValue(&eng, 0.0);
- QCOMPARE(zer0.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(zer0), quint16(0));
-
- QJSValue number = QJSValue(&eng, 123.0);
- QCOMPARE(number.toUInt16(), quint16(123));
- QCOMPARE(qjsvalue_cast<quint16>(number), quint16(123));
-
- QJSValue number2 = QJSValue(&eng, qSNaN());
- QCOMPARE(number2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number2), quint16(0));
-
- QJSValue number3 = QJSValue(&eng, +qInf());
- QCOMPARE(number3.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number3), quint16(0));
-
- QJSValue number3_2 = QJSValue(&eng, -qInf());
- QCOMPARE(number3_2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number3_2), quint16(0));
-
- QJSValue number4 = QJSValue(&eng, 0.5);
- QCOMPARE(number4.toUInt16(), quint16(0));
-
- QJSValue number5 = QJSValue(&eng, 123.5);
- QCOMPARE(number5.toUInt16(), quint16(123));
-
- QJSValue number6 = QJSValue(&eng, -456.5);
- QCOMPARE(number6.toUInt16(), quint16(-456));
- QCOMPARE(qjsvalue_cast<quint16>(number6), quint16(-456));
-
- QJSValue number7 = QJSValue(&eng, 0x10000);
- QCOMPARE(number7.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number7), quint16(0));
-
- QJSValue number8 = QJSValue(&eng, 0x10001);
- QCOMPARE(number8.toUInt16(), quint16(1));
- QCOMPARE(qjsvalue_cast<quint16>(number8), quint16(1));
-
- QJSValue str = QJSValue(&eng, QLatin1String("123.0"));
- QCOMPARE(str.toUInt16(), quint16(123));
- QCOMPARE(qjsvalue_cast<quint16>(str), quint16(123));
-
- QJSValue str2 = QJSValue(&eng, QLatin1String("NaN"));
- QCOMPARE(str2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str2), quint16(0));
-
- QJSValue str3 = QJSValue(&eng, QLatin1String("Infinity"));
- QCOMPARE(str3.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str3), quint16(0));
-
- QJSValue str3_2 = QJSValue(&eng, QLatin1String("-Infinity"));
- QCOMPARE(str3_2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str3_2), quint16(0));
-
- QJSValue str4 = QJSValue(&eng, QLatin1String("0.5"));
- QCOMPARE(str4.toUInt16(), quint16(0));
-
- QJSValue str5 = QJSValue(&eng, QLatin1String("123.5"));
- QCOMPARE(str5.toUInt16(), quint16(123));
-
- QJSValue str6 = QJSValue(&eng, QLatin1String("-456.5"));
- QCOMPARE(str6.toUInt16(), quint16(-456));
- QCOMPARE(qjsvalue_cast<quint16>(str6), quint16(-456));
-
- QJSValue str7 = QJSValue(&eng, QLatin1String("0x10000"));
- QCOMPARE(str7.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str7), quint16(0));
-
- QJSValue str8 = QJSValue(&eng, QLatin1String("0x10001"));
- QCOMPARE(str8.toUInt16(), quint16(1));
- QCOMPARE(qjsvalue_cast<quint16>(str8), quint16(1));
- }
- // V2 constructors
- {
- QJSValue zer0 = QJSValue(0.0);
- QCOMPARE(zer0.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(zer0), quint16(0));
-
- QJSValue number = QJSValue(123.0);
- QCOMPARE(number.toUInt16(), quint16(123));
- QCOMPARE(qjsvalue_cast<quint16>(number), quint16(123));
-
- QJSValue number2 = QJSValue(qSNaN());
- QCOMPARE(number2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number2), quint16(0));
-
- QJSValue number3 = QJSValue(+qInf());
- QCOMPARE(number3.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number3), quint16(0));
-
- QJSValue number3_2 = QJSValue(-qInf());
- QCOMPARE(number3_2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number3_2), quint16(0));
-
- QJSValue number4 = QJSValue(0.5);
- QCOMPARE(number4.toUInt16(), quint16(0));
-
- QJSValue number5 = QJSValue(123.5);
- QCOMPARE(number5.toUInt16(), quint16(123));
-
- QJSValue number6 = QJSValue(-456.5);
- QCOMPARE(number6.toUInt16(), quint16(-456));
- QCOMPARE(qjsvalue_cast<quint16>(number6), quint16(-456));
-
- QJSValue number7 = QJSValue(0x10000);
- QCOMPARE(number7.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(number7), quint16(0));
-
- QJSValue number8 = QJSValue(0x10001);
- QCOMPARE(number8.toUInt16(), quint16(1));
- QCOMPARE(qjsvalue_cast<quint16>(number8), quint16(1));
-
- QJSValue str = QJSValue(QLatin1String("123.0"));
- QCOMPARE(str.toUInt16(), quint16(123));
- QCOMPARE(qjsvalue_cast<quint16>(str), quint16(123));
-
- QJSValue str2 = QJSValue(QLatin1String("NaN"));
- QCOMPARE(str2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str2), quint16(0));
-
- QJSValue str3 = QJSValue(QLatin1String("Infinity"));
- QCOMPARE(str3.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str3), quint16(0));
-
- QJSValue str3_2 = QJSValue(QLatin1String("-Infinity"));
- QCOMPARE(str3_2.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str3_2), quint16(0));
-
- QJSValue str4 = QJSValue("0.5");
- QCOMPARE(str4.toUInt16(), quint16(0));
-
- QJSValue str5 = QJSValue("123.5");
- QCOMPARE(str5.toUInt16(), quint16(123));
-
- QJSValue str6 = QJSValue("-456.5");
- QCOMPARE(str6.toUInt16(), quint16(-456));
- QCOMPARE(qjsvalue_cast<quint16>(str6), quint16(-456));
-
- QJSValue str7 = QJSValue("0x10000");
- QCOMPARE(str7.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(str7), quint16(0));
-
- QJSValue str8 = QJSValue("0x10001");
- QCOMPARE(str8.toUInt16(), quint16(1));
- QCOMPARE(qjsvalue_cast<quint16>(str8), quint16(1));
- }
-
- QJSValue inv;
- QCOMPARE(inv.toUInt16(), quint16(0));
- QCOMPARE(qjsvalue_cast<quint16>(inv), quint16(0));
-}
-
#if defined Q_CC_MSVC && _MSC_VER < 1300
Q_DECLARE_METATYPE(QVariant)
#endif
diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.h b/tests/auto/declarative/qjsvalue/tst_qjsvalue.h
index 0750766f06..b008377170 100644
--- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.h
+++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.h
@@ -85,7 +85,6 @@ private slots:
void toBool();
void toInt();
void toUInt();
- void toUInt16();
void toVariant();
void toQObject_nonQObject_data();
void toQObject_nonQObject();