Changeset 54577 in webkit

Timestamp:

Feb 9, 2010 6:19:29 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-09 Jedrzej Nowacki <​jedrzej.nowacki@nokia.com>

Reviewed by Simon Hausmann.

Fix QScriptValue::isNumber().

The isNumber() should return 'true' if the value is in the CNumber
state.

[Qt] QScriptValue::isNumber() returns an incorrect value
​https://bugs.webkit.org/show_bug.cgi?id=34575

• qt/api/qscriptvalue_p.h: (QScriptValuePrivate::isNumber):
• qt/tests/qscriptvalue/tst_qscriptvalue.h:
• qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp: (tst_QScriptValue::isNumber_initData): (tst_QScriptValue::isNumber_makeData): (tst_QScriptValue::isNumber_test):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qscriptvalue_p.h (modified) (1 diff)
• qt/tests/qscriptvalue/tst_qscriptvalue.h (modified) (2 diffs)
• qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-02-09  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Fix QScriptValue::isNumber().
+
+        The isNumber() should return 'true' if the value is in the CNumber
+        state.
+
+        [Qt] QScriptValue::isNumber() returns an incorrect value
+        https://bugs.webkit.org/show_bug.cgi?id=34575
+
+        * qt/api/qscriptvalue_p.h:
+        (QScriptValuePrivate::isNumber):
+        * qt/tests/qscriptvalue/tst_qscriptvalue.h:
+        * qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp:
+        (tst_QScriptValue::isNumber_initData):
+        (tst_QScriptValue::isNumber_makeData):
+        (tst_QScriptValue::isNumber_test):
+
 2010-02-09  Geoffrey Garen  <ggaren@apple.com>
 

trunk/JavaScriptCore/qt/api/qscriptvalue_p.h

@@ -338 +338 @@
     switch (m_state) {
     case CNumber:
-        return m_number;
+        return true;
     case JSValue:
         if (isObject())

trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.h

@@ -56 +56 @@
     void isBoolean();
 
+    void isNumber_data();
+    void isNumber();
+
     void isFunction_data();
     void isFunction();
@@ -95 +98 @@
     void isBoolean_test(const char* expr, const QScriptValue& value);
 
+    void isNumber_initData();
+    void isNumber_makeData(const char* expr);
+    void isNumber_test(const char* expr, const QScriptValue&);
+
     void isFunction_initData();
     void isFunction_makeData(const char* expr);

trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp

@@ -316 +316 @@
 DEFINE_TEST_FUNCTION(isBoolean)
 
+void tst_QScriptValue::isNumber_initData()
+{
+    QTest::addColumn<bool>("expected");
+    initScriptValues();
+}
+
+void tst_QScriptValue::isNumber_makeData(const char* expr)
+{
+    static QSet<QString> isNumber;
+    if (isNumber.isEmpty()) {
+        isNumber << "QScriptValue(int(122))"
+                << "QScriptValue(uint(124))"
+                << "QScriptValue(0)"
+                << "QScriptValue(0.0)"
+                << "QScriptValue(123.0)"
+                << "QScriptValue(6.37e-8)"
+                << "QScriptValue(-6.37e-8)"
+                << "QScriptValue(0x43211234)"
+                << "QScriptValue(0x10000)"
+                << "QScriptValue(0x10001)"
+                << "QScriptValue(qSNaN())"
+                << "QScriptValue(qQNaN())"
+                << "QScriptValue(qInf())"
+                << "QScriptValue(-qInf())"
+                << "QScriptValue(0, int(122))"
+                << "QScriptValue(0, uint(124))"
+                << "QScriptValue(0, 0)"
+                << "QScriptValue(0, 0.0)"
+                << "QScriptValue(0, 123.0)"
+                << "QScriptValue(0, 6.37e-8)"
+                << "QScriptValue(0, -6.37e-8)"
+                << "QScriptValue(0, 0x43211234)"
+                << "QScriptValue(0, 0x10000)"
+                << "QScriptValue(0, 0x10001)"
+                << "QScriptValue(0, qSNaN())"
+                << "QScriptValue(0, qQNaN())"
+                << "QScriptValue(0, qInf())"
+                << "QScriptValue(0, -qInf())"
+                << "QScriptValue(engine, int(122))"
+                << "QScriptValue(engine, uint(124))"
+                << "QScriptValue(engine, 0)"
+                << "QScriptValue(engine, 0.0)"
+                << "QScriptValue(engine, 123.0)"
+                << "QScriptValue(engine, 6.37e-8)"
+                << "QScriptValue(engine, -6.37e-8)"
+                << "QScriptValue(engine, 0x43211234)"
+                << "QScriptValue(engine, 0x10000)"
+                << "QScriptValue(engine, 0x10001)"
+                << "QScriptValue(engine, qSNaN())"
+                << "QScriptValue(engine, qQNaN())"
+                << "QScriptValue(engine, qInf())"
+                << "QScriptValue(engine, -qInf())";
+    }
+    newRow(expr) << isNumber.contains(expr);
+}
+
+void tst_QScriptValue::isNumber_test(const char*, const QScriptValue& value)
+{
+    QFETCH(bool, expected);
+    QCOMPARE(value.isNumber(), expected);
+}
+
+DEFINE_TEST_FUNCTION(isNumber)
+
 
 void tst_QScriptValue::isFunction_initData()
@@ -493 +557 @@
 DEFINE_TEST_FUNCTION(isObject)
 
-