Changeset 54340 in webkit
- Timestamp:
- Feb 4, 2010 3:15:34 AM (14 years ago)
- Location:
- trunk/JavaScriptCore
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r54320 r54340 1 2010-02-04 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 Increase test coverage for the QScriptValue. 6 7 https://bugs.webkit.org/show_bug.cgi?id=34533 8 9 * qt/tests/qscriptvalue/qscriptvalue.pro: 10 * qt/tests/qscriptvalue/tst_qscriptvalue.cpp: 11 (tst_QScriptValue::tst_QScriptValue): 12 (tst_QScriptValue::~tst_QScriptValue): 13 (tst_QScriptValue::dataHelper): 14 (tst_QScriptValue::newRow): 15 (tst_QScriptValue::testHelper): 16 (tst_QScriptValue::ctor): 17 * qt/tests/qscriptvalue/tst_qscriptvalue.h: Added. 18 * qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp: Added. 19 (tst_QScriptValue::initScriptValues): 20 (tst_QScriptValue::isValid_initData): 21 (tst_QScriptValue::isValid_makeData): 22 (tst_QScriptValue::isValid_test): 23 (tst_QScriptValue::isBool_initData): 24 (tst_QScriptValue::isBool_makeData): 25 (tst_QScriptValue::isBool_test): 26 (tst_QScriptValue::isBoolean_initData): 27 (tst_QScriptValue::isBoolean_makeData): 28 (tst_QScriptValue::isBoolean_test): 29 (tst_QScriptValue::isFunction_initData): 30 (tst_QScriptValue::isFunction_makeData): 31 (tst_QScriptValue::isFunction_test): 32 (tst_QScriptValue::isNull_initData): 33 (tst_QScriptValue::isNull_makeData): 34 (tst_QScriptValue::isNull_test): 35 (tst_QScriptValue::isString_initData): 36 (tst_QScriptValue::isString_makeData): 37 (tst_QScriptValue::isString_test): 38 (tst_QScriptValue::isUndefined_initData): 39 (tst_QScriptValue::isUndefined_makeData): 40 (tst_QScriptValue::isUndefined_test): 41 (tst_QScriptValue::isObject_initData): 42 (tst_QScriptValue::isObject_makeData): 43 (tst_QScriptValue::isObject_test): 44 1 45 2010-02-03 Kwang Yul Seo <skyul@company100.net> 2 46 -
trunk/JavaScriptCore/qt/tests/qscriptvalue/qscriptvalue.pro
r53850 r54340 4 4 include(../tests.pri) 5 5 6 SOURCES += tst_qscriptvalue.cpp 6 SOURCES += \ 7 tst_qscriptvalue.cpp \ 8 tst_qscriptvalue_generated.cpp 7 9 10 HEADERS += \ 11 tst_qscriptvalue.h -
trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.cpp
r53850 r54340 18 18 */ 19 19 20 #include "qscriptengine.h" 21 #include "qscriptvalue.h" 22 #include <QtTest/qtest.h> 23 24 Q_DECLARE_METATYPE(QScriptValue*); 25 Q_DECLARE_METATYPE(QScriptValue); 26 27 class tst_QScriptValue : public QObject { 28 Q_OBJECT 29 30 public: 31 tst_QScriptValue() {} 32 virtual ~tst_QScriptValue() {} 33 34 private slots: 35 void toString_data(); 36 void toString(); 37 void copyConstructor_data(); 38 void copyConstructor(); 39 void assignOperator_data(); 40 void assignOperator(); 41 void dataSharing(); 42 void constructors_data(); 43 void constructors(); 44 void call(); 45 46 // copied from Qt's QtScript. 47 void ctor(); 48 }; 20 #include "tst_qscriptvalue.h" 21 #include <QtCore/qnumeric.h> 22 23 tst_QScriptValue::tst_QScriptValue() 24 : engine(0) 25 { 26 } 27 28 tst_QScriptValue::~tst_QScriptValue() 29 { 30 delete engine; 31 } 32 33 void tst_QScriptValue::dataHelper(InitDataFunction init, DefineDataFunction define) 34 { 35 QTest::addColumn<QString>("__expression__"); 36 (this->*init)(); 37 QHash<QString, QScriptValue>::const_iterator it; 38 for (it = m_values.constBegin(); it != m_values.constEnd(); ++it) { 39 m_currentExpression = it.key(); 40 (this->*define)(it.key().toLatin1()); 41 } 42 m_currentExpression = QString(); 43 } 44 45 QTestData& tst_QScriptValue::newRow(const char* tag) 46 { 47 return QTest::newRow(tag) << m_currentExpression; 48 } 49 50 void tst_QScriptValue::testHelper(TestFunction fun) 51 { 52 QFETCH(QString, __expression__); 53 QScriptValue value = m_values.value(__expression__); 54 (this->*fun)(__expression__.toLatin1(), value); 55 } 56 49 57 50 58 void tst_QScriptValue::ctor() … … 54 62 QScriptValue v; 55 63 QCOMPARE(v.isValid(), false); 56 QCOMPARE(v.engine(), (QScriptEngine 64 QCOMPARE(v.engine(), (QScriptEngine*)0); 57 65 } 58 66 { … … 169 177 QCOMPARE(v.isUndefined(), true); 170 178 QCOMPARE(v.isObject(), false); 171 QCOMPARE(v.engine(), (QScriptEngine 179 QCOMPARE(v.engine(), (QScriptEngine*)0); 172 180 } 173 181 { … … 176 184 QCOMPARE(v.isNull(), true); 177 185 QCOMPARE(v.isObject(), false); 178 QCOMPARE(v.engine(), (QScriptEngine 186 QCOMPARE(v.engine(), (QScriptEngine*)0); 179 187 } 180 188 { … … 185 193 QCOMPARE(v.isObject(), false); 186 194 QCOMPARE(v.toBoolean(), false); 187 QCOMPARE(v.engine(), (QScriptEngine 195 QCOMPARE(v.engine(), (QScriptEngine*)0); 188 196 } 189 197 { … … 193 201 QCOMPARE(v.isObject(), false); 194 202 QCOMPARE(v.toNumber(), 1.0); 195 QCOMPARE(v.engine(), (QScriptEngine 203 QCOMPARE(v.engine(), (QScriptEngine*)0); 196 204 } 197 205 { … … 201 209 QCOMPARE(v.isObject(), false); 202 210 QCOMPARE(v.toNumber(), 1.0); 203 QCOMPARE(v.engine(), (QScriptEngine 211 QCOMPARE(v.engine(), (QScriptEngine*)0); 204 212 } 205 213 { … … 209 217 QCOMPARE(v.isObject(), false); 210 218 QCOMPARE(v.toNumber(), 1.0); 211 QCOMPARE(v.engine(), (QScriptEngine 219 QCOMPARE(v.engine(), (QScriptEngine*)0); 212 220 } 213 221 { … … 217 225 QCOMPARE(v.isObject(), false); 218 226 QCOMPARE(v.toString(), QLatin1String("ciao")); 219 QCOMPARE(v.engine(), (QScriptEngine 227 QCOMPARE(v.engine(), (QScriptEngine*)0); 220 228 } 221 229 { … … 225 233 QCOMPARE(v.isObject(), false); 226 234 QCOMPARE(v.toString(), QLatin1String("ciao")); 227 QCOMPARE(v.engine(), (QScriptEngine 235 QCOMPARE(v.engine(), (QScriptEngine*)0); 228 236 } 229 237 // copy constructor, operator= … … 232 240 QScriptValue v2(v); 233 241 QCOMPARE(v2.strictlyEquals(v), true); 234 QCOMPARE(v2.engine(), (QScriptEngine 242 QCOMPARE(v2.engine(), (QScriptEngine*)0); 235 243 236 244 QScriptValue v3(v); 237 245 QCOMPARE(v3.strictlyEquals(v), true); 238 246 QCOMPARE(v3.strictlyEquals(v2), true); 239 QCOMPARE(v3.engine(), (QScriptEngine 247 QCOMPARE(v3.engine(), (QScriptEngine*)0); 240 248 241 249 QScriptValue v4(2.0); … … 424 432 } 425 433 434 426 435 QTEST_MAIN(tst_QScriptValue) 427 #include "tst_qscriptvalue.moc"
Note: See TracChangeset
for help on using the changeset viewer.