From 422e2998364d6aae14e65823b315c5e2ae529a62 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Mon, 16 Jan 2012 15:13:51 +0100 Subject: Remove QJSValue::toUInt16() function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jędrzej Nowacki --- tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp | 157 ----------------------- tests/auto/declarative/qjsvalue/tst_qjsvalue.h | 1 - 2 files changed, 158 deletions(-) (limited to 'tests/auto') 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(inv), quint32(0)); } -void tst_QJSValue::toUInt16() -{ - QJSEngine eng; - - { - QJSValue zer0 = QJSValue(&eng, 0.0); - QCOMPARE(zer0.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(zer0), quint16(0)); - - QJSValue number = QJSValue(&eng, 123.0); - QCOMPARE(number.toUInt16(), quint16(123)); - QCOMPARE(qjsvalue_cast(number), quint16(123)); - - QJSValue number2 = QJSValue(&eng, qSNaN()); - QCOMPARE(number2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(number2), quint16(0)); - - QJSValue number3 = QJSValue(&eng, +qInf()); - QCOMPARE(number3.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(number3), quint16(0)); - - QJSValue number3_2 = QJSValue(&eng, -qInf()); - QCOMPARE(number3_2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(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(number6), quint16(-456)); - - QJSValue number7 = QJSValue(&eng, 0x10000); - QCOMPARE(number7.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(number7), quint16(0)); - - QJSValue number8 = QJSValue(&eng, 0x10001); - QCOMPARE(number8.toUInt16(), quint16(1)); - QCOMPARE(qjsvalue_cast(number8), quint16(1)); - - QJSValue str = QJSValue(&eng, QLatin1String("123.0")); - QCOMPARE(str.toUInt16(), quint16(123)); - QCOMPARE(qjsvalue_cast(str), quint16(123)); - - QJSValue str2 = QJSValue(&eng, QLatin1String("NaN")); - QCOMPARE(str2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(str2), quint16(0)); - - QJSValue str3 = QJSValue(&eng, QLatin1String("Infinity")); - QCOMPARE(str3.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(str3), quint16(0)); - - QJSValue str3_2 = QJSValue(&eng, QLatin1String("-Infinity")); - QCOMPARE(str3_2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(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(str6), quint16(-456)); - - QJSValue str7 = QJSValue(&eng, QLatin1String("0x10000")); - QCOMPARE(str7.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(str7), quint16(0)); - - QJSValue str8 = QJSValue(&eng, QLatin1String("0x10001")); - QCOMPARE(str8.toUInt16(), quint16(1)); - QCOMPARE(qjsvalue_cast(str8), quint16(1)); - } - // V2 constructors - { - QJSValue zer0 = QJSValue(0.0); - QCOMPARE(zer0.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(zer0), quint16(0)); - - QJSValue number = QJSValue(123.0); - QCOMPARE(number.toUInt16(), quint16(123)); - QCOMPARE(qjsvalue_cast(number), quint16(123)); - - QJSValue number2 = QJSValue(qSNaN()); - QCOMPARE(number2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(number2), quint16(0)); - - QJSValue number3 = QJSValue(+qInf()); - QCOMPARE(number3.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(number3), quint16(0)); - - QJSValue number3_2 = QJSValue(-qInf()); - QCOMPARE(number3_2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(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(number6), quint16(-456)); - - QJSValue number7 = QJSValue(0x10000); - QCOMPARE(number7.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(number7), quint16(0)); - - QJSValue number8 = QJSValue(0x10001); - QCOMPARE(number8.toUInt16(), quint16(1)); - QCOMPARE(qjsvalue_cast(number8), quint16(1)); - - QJSValue str = QJSValue(QLatin1String("123.0")); - QCOMPARE(str.toUInt16(), quint16(123)); - QCOMPARE(qjsvalue_cast(str), quint16(123)); - - QJSValue str2 = QJSValue(QLatin1String("NaN")); - QCOMPARE(str2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(str2), quint16(0)); - - QJSValue str3 = QJSValue(QLatin1String("Infinity")); - QCOMPARE(str3.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(str3), quint16(0)); - - QJSValue str3_2 = QJSValue(QLatin1String("-Infinity")); - QCOMPARE(str3_2.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(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(str6), quint16(-456)); - - QJSValue str7 = QJSValue("0x10000"); - QCOMPARE(str7.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(str7), quint16(0)); - - QJSValue str8 = QJSValue("0x10001"); - QCOMPARE(str8.toUInt16(), quint16(1)); - QCOMPARE(qjsvalue_cast(str8), quint16(1)); - } - - QJSValue inv; - QCOMPARE(inv.toUInt16(), quint16(0)); - QCOMPARE(qjsvalue_cast(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(); -- cgit v1.2.3