Fix regression in tst_maketestselftest::naming_convention.

Change tst_QScriptValueGenerated test to obey the naming_convention test

Reviewed-by: Kent Hansen

7 files changed, 120 insertions, 120 deletions

diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp
index 3856a6d..962a2af 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp
@@ -49,17 +49,17 @@ QT_BEGIN_NAMESPACE
 extern bool qt_script_isJITEnabled();
 QT_END_NAMESPACE
 
-tst_QScriptValue::tst_QScriptValue()
+tst_QScriptValueGenerated::tst_QScriptValueGenerated()
     : engine(0)
 {
 }
 
-tst_QScriptValue::~tst_QScriptValue()
+tst_QScriptValueGenerated::~tst_QScriptValueGenerated()
 {
     delete engine;
 }
 
-void tst_QScriptValue::dataHelper(InitDataFunction init, DefineDataFunction define)
+void tst_QScriptValueGenerated::dataHelper(InitDataFunction init, DefineDataFunction define)
 {
     QTest::addColumn<QString>("__expression__");
     (this->*init)();
@@ -71,30 +71,30 @@ void tst_QScriptValue::dataHelper(InitDataFunction init, DefineDataFunction defi
     m_currentExpression = QString();
 }
 
-QTestData &tst_QScriptValue::newRow(const char *tag)
+QTestData &tst_QScriptValueGenerated::newRow(const char *tag)
 {
     return QTest::newRow(tag) << m_currentExpression;
 }
 
-void tst_QScriptValue::testHelper(TestFunction fun)
+void tst_QScriptValueGenerated::testHelper(TestFunction fun)
 {
     QFETCH(QString, __expression__);
     QScriptValue value = m_values.value(__expression__);
     (this->*fun)(__expression__.toLatin1(), value);
 }
 
-void tst_QScriptValue::assignAndCopyConstruct_initData()
+void tst_QScriptValueGenerated::assignAndCopyConstruct_initData()
 {
     QTest::addColumn<int>("dummy");
     initScriptValues();
 }
 
-void tst_QScriptValue::assignAndCopyConstruct_makeData(const char *expr)
+void tst_QScriptValueGenerated::assignAndCopyConstruct_makeData(const char *expr)
 {
     newRow(expr) << 0;
 }
 
-void tst_QScriptValue::assignAndCopyConstruct_test(const char *, const QScriptValue &value)
+void tst_QScriptValueGenerated::assignAndCopyConstruct_test(const char *, const QScriptValue &value)
 {
     QScriptValue copy(value);
     QCOMPARE(copy.strictlyEquals(value), !value.isNumber() || !qIsNaN(value.toNumber()));
@@ -113,4 +113,4 @@ void tst_QScriptValue::assignAndCopyConstruct_test(const char *, const QScriptVa
 
 DEFINE_TEST_FUNCTION(assignAndCopyConstruct)
 
-QTEST_MAIN(tst_QScriptValue)
+QTEST_MAIN(tst_QScriptValueGenerated)
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h
index 50ab878..8248ef3 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h
@@ -54,13 +54,13 @@
 Q_DECLARE_METATYPE(QVariant)
 Q_DECLARE_METATYPE(QScriptValue)
 
-class tst_QScriptValue : public QObject
+class tst_QScriptValueGenerated : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QScriptValue();
-    virtual ~tst_QScriptValue();
+    tst_QScriptValueGenerated();
+    virtual ~tst_QScriptValueGenerated();
 
 private slots:
     // Generated test functions
@@ -185,12 +185,12 @@ private slots:
     void qscriptvalue_castquint16();
 
 private:
-    typedef void (tst_QScriptValue::*InitDataFunction)();
-    typedef void (tst_QScriptValue::*DefineDataFunction)(const char *);
+    typedef void (tst_QScriptValueGenerated::*InitDataFunction)();
+    typedef void (tst_QScriptValueGenerated::*DefineDataFunction)(const char *);
     void dataHelper(InitDataFunction init, DefineDataFunction define);
     QTestData &newRow(const char *tag);
 
-    typedef void (tst_QScriptValue::*TestFunction)(const char *, const QScriptValue &);
+    typedef void (tst_QScriptValueGenerated::*TestFunction)(const char *, const QScriptValue &);
     void testHelper(TestFunction fun);
 
     // Generated functions
@@ -364,7 +364,7 @@ private:
 };
 
 #define DEFINE_TEST_FUNCTION(name) \
-void tst_QScriptValue::name##_data() { dataHelper(&tst_QScriptValue::name##_initData, &tst_QScriptValue::name##_makeData); } \
-void tst_QScriptValue::name() { testHelper(&tst_QScriptValue::name##_test); }
+void tst_QScriptValueGenerated::name##_data() { dataHelper(&tst_QScriptValueGenerated::name##_initData, &tst_QScriptValueGenerated::name##_makeData); } \
+void tst_QScriptValueGenerated::name() { testHelper(&tst_QScriptValueGenerated::name##_test); }
 
 #endif
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
index e651810..90bc104 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
@@ -47,7 +47,7 @@
 
 
 
-void tst_QScriptValue::qscriptvalue_castQString_initData()
+void tst_QScriptValueGenerated::qscriptvalue_castQString_initData()
 {
     QTest::addColumn<QString>("expected");
     initScriptValues();
@@ -268,7 +268,7 @@ static QString qscriptvalue_castQString_valueArray [] = {
     "[object QMetaObject]", "undefined", 
     "123", "false", 
     "", "QScriptEngine(name = \"\")", };
-void tst_QScriptValue::qscriptvalue_castQString_makeData(const char* expr)
+void tst_QScriptValueGenerated::qscriptvalue_castQString_makeData(const char* expr)
 {
     static QHash<QString, QString> value;
     if (value.isEmpty()) {
@@ -279,7 +279,7 @@ void tst_QScriptValue::qscriptvalue_castQString_makeData(const char* expr)
     newRow(expr) << value.value(expr);
 }
 
-void tst_QScriptValue::qscriptvalue_castQString_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::qscriptvalue_castQString_test(const char*, const QScriptValue& value)
 {
     QFETCH(QString, expected);
     QCOMPARE(qscriptvalue_cast<QString>(value), expected);
@@ -289,7 +289,7 @@ void tst_QScriptValue::qscriptvalue_castQString_test(const char*, const QScriptV
 DEFINE_TEST_FUNCTION(qscriptvalue_castQString)
 
 
-void tst_QScriptValue::qscriptvalue_castqsreal_initData()
+void tst_QScriptValueGenerated::qscriptvalue_castqsreal_initData()
 {
     QTest::addColumn<qsreal>("expected");
     initScriptValues();
@@ -454,7 +454,7 @@ static qsreal qscriptvalue_castqsreal_valueArray [] = {
     65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4, 
     0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0, 
     0, qQNaN(), };
-void tst_QScriptValue::qscriptvalue_castqsreal_makeData(const char* expr)
+void tst_QScriptValueGenerated::qscriptvalue_castqsreal_makeData(const char* expr)
 {
     static QHash<QString, qsreal> value;
     if (value.isEmpty()) {
@@ -465,7 +465,7 @@ void tst_QScriptValue::qscriptvalue_castqsreal_makeData(const char* expr)
     newRow(expr) << value.value(expr);
 }
 
-void tst_QScriptValue::qscriptvalue_castqsreal_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::qscriptvalue_castqsreal_test(const char*, const QScriptValue& value)
 {
     QFETCH(qsreal, expected);
     if (qIsNaN(expected)) {
@@ -485,7 +485,7 @@ void tst_QScriptValue::qscriptvalue_castqsreal_test(const char*, const QScriptVa
 DEFINE_TEST_FUNCTION(qscriptvalue_castqsreal)
 
 
-void tst_QScriptValue::qscriptvalue_castbool_initData()
+void tst_QScriptValueGenerated::qscriptvalue_castbool_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -706,7 +706,7 @@ static bool qscriptvalue_castbool_valueArray [] = {
     true, true, 
     true, true, 
     false, true, };
-void tst_QScriptValue::qscriptvalue_castbool_makeData(const char* expr)
+void tst_QScriptValueGenerated::qscriptvalue_castbool_makeData(const char* expr)
 {
     static QHash<QString, bool> value;
     if (value.isEmpty()) {
@@ -717,7 +717,7 @@ void tst_QScriptValue::qscriptvalue_castbool_makeData(const char* expr)
     newRow(expr) << value.value(expr);
 }
 
-void tst_QScriptValue::qscriptvalue_castbool_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::qscriptvalue_castbool_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(qscriptvalue_cast<bool>(value), expected);
@@ -727,7 +727,7 @@ void tst_QScriptValue::qscriptvalue_castbool_test(const char*, const QScriptValu
 DEFINE_TEST_FUNCTION(qscriptvalue_castbool)
 
 
-void tst_QScriptValue::qscriptvalue_castqint32_initData()
+void tst_QScriptValueGenerated::qscriptvalue_castqint32_initData()
 {
     QTest::addColumn<qint32>("expected");
     initScriptValues();
@@ -948,7 +948,7 @@ static qint32 qscriptvalue_castqint32_valueArray [] = {
     0, 0, 
     123, 0, 
     0, 0, };
-void tst_QScriptValue::qscriptvalue_castqint32_makeData(const char* expr)
+void tst_QScriptValueGenerated::qscriptvalue_castqint32_makeData(const char* expr)
 {
     static QHash<QString, qint32> value;
     if (value.isEmpty()) {
@@ -959,7 +959,7 @@ void tst_QScriptValue::qscriptvalue_castqint32_makeData(const char* expr)
     newRow(expr) << value.value(expr);
 }
 
-void tst_QScriptValue::qscriptvalue_castqint32_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::qscriptvalue_castqint32_test(const char*, const QScriptValue& value)
 {
     QFETCH(qint32, expected);
     QCOMPARE(qscriptvalue_cast<qint32>(value), expected);
@@ -969,7 +969,7 @@ void tst_QScriptValue::qscriptvalue_castqint32_test(const char*, const QScriptVa
 DEFINE_TEST_FUNCTION(qscriptvalue_castqint32)
 
 
-void tst_QScriptValue::qscriptvalue_castquint32_initData()
+void tst_QScriptValueGenerated::qscriptvalue_castquint32_initData()
 {
     QTest::addColumn<quint32>("expected");
     initScriptValues();
@@ -1190,7 +1190,7 @@ static quint32 qscriptvalue_castquint32_valueArray [] = {
     0, 0, 
     123, 0, 
     0, 0, };
-void tst_QScriptValue::qscriptvalue_castquint32_makeData(const char* expr)
+void tst_QScriptValueGenerated::qscriptvalue_castquint32_makeData(const char* expr)
 {
     static QHash<QString, quint32> value;
     if (value.isEmpty()) {
@@ -1201,7 +1201,7 @@ void tst_QScriptValue::qscriptvalue_castquint32_makeData(const char* expr)
     newRow(expr) << value.value(expr);
 }
 
-void tst_QScriptValue::qscriptvalue_castquint32_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::qscriptvalue_castquint32_test(const char*, const QScriptValue& value)
 {
     QFETCH(quint32, expected);
     QCOMPARE(qscriptvalue_cast<quint32>(value), expected);
@@ -1211,7 +1211,7 @@ void tst_QScriptValue::qscriptvalue_castquint32_test(const char*, const QScriptV
 DEFINE_TEST_FUNCTION(qscriptvalue_castquint32)
 
 
-void tst_QScriptValue::qscriptvalue_castquint16_initData()
+void tst_QScriptValueGenerated::qscriptvalue_castquint16_initData()
 {
     QTest::addColumn<quint16>("expected");
     initScriptValues();
@@ -1432,7 +1432,7 @@ static quint16 qscriptvalue_castquint16_valueArray [] = {
     0, 0, 
     123, 0, 
     0, 0, };
-void tst_QScriptValue::qscriptvalue_castquint16_makeData(const char* expr)
+void tst_QScriptValueGenerated::qscriptvalue_castquint16_makeData(const char* expr)
 {
     static QHash<QString, quint16> value;
     if (value.isEmpty()) {
@@ -1443,7 +1443,7 @@ void tst_QScriptValue::qscriptvalue_castquint16_makeData(const char* expr)
     newRow(expr) << value.value(expr);
 }
 
-void tst_QScriptValue::qscriptvalue_castquint16_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::qscriptvalue_castquint16_test(const char*, const QScriptValue& value)
 {
     QFETCH(quint16, expected);
     QCOMPARE(qscriptvalue_cast<quint16>(value), expected);
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
index 6e1f8ee..02243de 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
@@ -47,7 +47,7 @@
 
 
 
-void tst_QScriptValue::equals_initData()
+void tst_QScriptValueGenerated::equals_initData()
 {
     QTest::addColumn<QScriptValue>("other");
     QTest::addColumn<bool>("expected");
@@ -1273,7 +1273,7 @@ static QString equals_array [] = {
     "engine->newQObject(0) <=> engine->newQObject(0)",
     "engine->newQObject(engine) <=> engine->newQObject(engine)",};
 
-void tst_QScriptValue::equals_makeData(const char *expr)
+void tst_QScriptValueGenerated::equals_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
@@ -1288,7 +1288,7 @@ void tst_QScriptValue::equals_makeData(const char *expr)
     }
 }
 
-void tst_QScriptValue::equals_test(const char *, const QScriptValue& value)
+void tst_QScriptValueGenerated::equals_test(const char *, const QScriptValue& value)
 {
     QFETCH(QScriptValue, other);
     QFETCH(bool, expected);
@@ -1298,7 +1298,7 @@ void tst_QScriptValue::equals_test(const char *, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(equals)
 
 
-void tst_QScriptValue::strictlyEquals_initData()
+void tst_QScriptValueGenerated::strictlyEquals_initData()
 {
     QTest::addColumn<QScriptValue>("other");
     QTest::addColumn<bool>("expected");
@@ -1830,7 +1830,7 @@ static QString strictlyEquals_array [] = {
     "engine->newQObject(0) <=> engine->newQObject(0)",
     "engine->newQObject(engine) <=> engine->newQObject(engine)",};
 
-void tst_QScriptValue::strictlyEquals_makeData(const char *expr)
+void tst_QScriptValueGenerated::strictlyEquals_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
@@ -1845,7 +1845,7 @@ void tst_QScriptValue::strictlyEquals_makeData(const char *expr)
     }
 }
 
-void tst_QScriptValue::strictlyEquals_test(const char *, const QScriptValue& value)
+void tst_QScriptValueGenerated::strictlyEquals_test(const char *, const QScriptValue& value)
 {
     QFETCH(QScriptValue, other);
     QFETCH(bool, expected);
@@ -1855,7 +1855,7 @@ void tst_QScriptValue::strictlyEquals_test(const char *, const QScriptValue& val
 DEFINE_TEST_FUNCTION(strictlyEquals)
 
 
-void tst_QScriptValue::lessThan_initData()
+void tst_QScriptValueGenerated::lessThan_initData()
 {
     QTest::addColumn<QScriptValue>("other");
     QTest::addColumn<bool>("expected");
@@ -6927,7 +6927,7 @@ static QString lessThan_array [] = {
     "engine->newQObject(engine) <=> engine->newObject()",
     "engine->newQObject(engine) <=> engine->newQMetaObject(&QObject::staticMetaObject)",};
 
-void tst_QScriptValue::lessThan_makeData(const char *expr)
+void tst_QScriptValueGenerated::lessThan_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
@@ -6942,7 +6942,7 @@ void tst_QScriptValue::lessThan_makeData(const char *expr)
     }
 }
 
-void tst_QScriptValue::lessThan_test(const char *, const QScriptValue& value)
+void tst_QScriptValueGenerated::lessThan_test(const char *, const QScriptValue& value)
 {
     QFETCH(QScriptValue, other);
     QFETCH(bool, expected);
@@ -6952,7 +6952,7 @@ void tst_QScriptValue::lessThan_test(const char *, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(lessThan)
 
 
-void tst_QScriptValue::instanceOf_initData()
+void tst_QScriptValueGenerated::instanceOf_initData()
 {
     QTest::addColumn<QScriptValue>("other");
     QTest::addColumn<bool>("expected");
@@ -7001,7 +7001,7 @@ static QString instanceOf_array [] = {
     "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"Object\")",
     "engine->newQObject(engine) <=> engine->evaluate(\"Object\")",};
 
-void tst_QScriptValue::instanceOf_makeData(const char *expr)
+void tst_QScriptValueGenerated::instanceOf_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
@@ -7016,7 +7016,7 @@ void tst_QScriptValue::instanceOf_makeData(const char *expr)
     }
 }
 
-void tst_QScriptValue::instanceOf_test(const char *, const QScriptValue& value)
+void tst_QScriptValueGenerated::instanceOf_test(const char *, const QScriptValue& value)
 {
     QFETCH(QScriptValue, other);
     QFETCH(bool, expected);
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
index a9eb2ca..8c8a7d1 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
@@ -46,7 +46,7 @@
 #include "tst_qscriptvalue.h"
 
 
-void tst_QScriptValue::initScriptValues()
+void tst_QScriptValueGenerated::initScriptValues()
 {
     m_values.clear();
     if (engine) 
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
index 106043b..71a5c1d 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
@@ -46,7 +46,7 @@
 #include "tst_qscriptvalue.h"
 
 
-void tst_QScriptValue::isValid_initData()
+void tst_QScriptValueGenerated::isValid_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -195,7 +195,7 @@ static QString isValid_array [] = {
     "engine->newQObject(0)",
     "engine->newQObject(engine)",};
 
-void tst_QScriptValue::isValid_makeData(const char* expr)
+void tst_QScriptValueGenerated::isValid_makeData(const char* expr)
 {
     static QSet<QString> isValid;
     if (isValid.isEmpty()) {
@@ -206,7 +206,7 @@ void tst_QScriptValue::isValid_makeData(const char* expr)
     newRow(expr) << isValid.contains(expr);
 }
 
-void tst_QScriptValue::isValid_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isValid_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isValid(), expected);
@@ -216,7 +216,7 @@ void tst_QScriptValue::isValid_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isValid)
 
 
-void tst_QScriptValue::isBool_initData()
+void tst_QScriptValueGenerated::isBool_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -232,7 +232,7 @@ static QString isBool_array [] = {
     "engine->evaluate(\"true\")",
     "engine->evaluate(\"false\")",};
 
-void tst_QScriptValue::isBool_makeData(const char* expr)
+void tst_QScriptValueGenerated::isBool_makeData(const char* expr)
 {
     static QSet<QString> isBool;
     if (isBool.isEmpty()) {
@@ -243,7 +243,7 @@ void tst_QScriptValue::isBool_makeData(const char* expr)
     newRow(expr) << isBool.contains(expr);
 }
 
-void tst_QScriptValue::isBool_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isBool_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isBool(), expected);
@@ -253,7 +253,7 @@ void tst_QScriptValue::isBool_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isBool)
 
 
-void tst_QScriptValue::isBoolean_initData()
+void tst_QScriptValueGenerated::isBoolean_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -269,7 +269,7 @@ static QString isBoolean_array [] = {
     "engine->evaluate(\"true\")",
     "engine->evaluate(\"false\")",};
 
-void tst_QScriptValue::isBoolean_makeData(const char* expr)
+void tst_QScriptValueGenerated::isBoolean_makeData(const char* expr)
 {
     static QSet<QString> isBoolean;
     if (isBoolean.isEmpty()) {
@@ -280,7 +280,7 @@ void tst_QScriptValue::isBoolean_makeData(const char* expr)
     newRow(expr) << isBoolean.contains(expr);
 }
 
-void tst_QScriptValue::isBoolean_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isBoolean_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isBoolean(), expected);
@@ -290,7 +290,7 @@ void tst_QScriptValue::isBoolean_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isBoolean)
 
 
-void tst_QScriptValue::isNumber_initData()
+void tst_QScriptValueGenerated::isNumber_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -354,7 +354,7 @@ static QString isNumber_array [] = {
     "engine->evaluate(\"Infinity\")",
     "engine->evaluate(\"-Infinity\")",};
 
-void tst_QScriptValue::isNumber_makeData(const char* expr)
+void tst_QScriptValueGenerated::isNumber_makeData(const char* expr)
 {
     static QSet<QString> isNumber;
     if (isNumber.isEmpty()) {
@@ -365,7 +365,7 @@ void tst_QScriptValue::isNumber_makeData(const char* expr)
     newRow(expr) << isNumber.contains(expr);
 }
 
-void tst_QScriptValue::isNumber_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isNumber_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isNumber(), expected);
@@ -375,7 +375,7 @@ void tst_QScriptValue::isNumber_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isNumber)
 
 
-void tst_QScriptValue::isFunction_initData()
+void tst_QScriptValueGenerated::isFunction_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -393,7 +393,7 @@ static QString isFunction_array [] = {
     "engine->evaluate(\"/foo/\")",
     "engine->newQMetaObject(&QObject::staticMetaObject)",};
 
-void tst_QScriptValue::isFunction_makeData(const char* expr)
+void tst_QScriptValueGenerated::isFunction_makeData(const char* expr)
 {
     static QSet<QString> isFunction;
     if (isFunction.isEmpty()) {
@@ -404,7 +404,7 @@ void tst_QScriptValue::isFunction_makeData(const char* expr)
     newRow(expr) << isFunction.contains(expr);
 }
 
-void tst_QScriptValue::isFunction_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isFunction_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isFunction(), expected);
@@ -414,7 +414,7 @@ void tst_QScriptValue::isFunction_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isFunction)
 
 
-void tst_QScriptValue::isNull_initData()
+void tst_QScriptValueGenerated::isNull_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -428,7 +428,7 @@ static QString isNull_array [] = {
     "engine->nullValue()",
     "engine->newQObject(0)",};
 
-void tst_QScriptValue::isNull_makeData(const char* expr)
+void tst_QScriptValueGenerated::isNull_makeData(const char* expr)
 {
     static QSet<QString> isNull;
     if (isNull.isEmpty()) {
@@ -439,7 +439,7 @@ void tst_QScriptValue::isNull_makeData(const char* expr)
     newRow(expr) << isNull.contains(expr);
 }
 
-void tst_QScriptValue::isNull_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isNull_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isNull(), expected);
@@ -449,7 +449,7 @@ void tst_QScriptValue::isNull_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isNull)
 
 
-void tst_QScriptValue::isString_initData()
+void tst_QScriptValueGenerated::isString_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -492,7 +492,7 @@ static QString isString_array [] = {
     "engine->evaluate(\"'123'\")",
     "engine->evaluate(\"'12.4'\")",};
 
-void tst_QScriptValue::isString_makeData(const char* expr)
+void tst_QScriptValueGenerated::isString_makeData(const char* expr)
 {
     static QSet<QString> isString;
     if (isString.isEmpty()) {
@@ -503,7 +503,7 @@ void tst_QScriptValue::isString_makeData(const char* expr)
     newRow(expr) << isString.contains(expr);
 }
 
-void tst_QScriptValue::isString_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isString_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isString(), expected);
@@ -513,7 +513,7 @@ void tst_QScriptValue::isString_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isString)
 
 
-void tst_QScriptValue::isUndefined_initData()
+void tst_QScriptValueGenerated::isUndefined_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -527,7 +527,7 @@ static QString isUndefined_array [] = {
     "engine->evaluate(\"undefined\")",
     "engine->undefinedValue()",};
 
-void tst_QScriptValue::isUndefined_makeData(const char* expr)
+void tst_QScriptValueGenerated::isUndefined_makeData(const char* expr)
 {
     static QSet<QString> isUndefined;
     if (isUndefined.isEmpty()) {
@@ -538,7 +538,7 @@ void tst_QScriptValue::isUndefined_makeData(const char* expr)
     newRow(expr) << isUndefined.contains(expr);
 }
 
-void tst_QScriptValue::isUndefined_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isUndefined_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isUndefined(), expected);
@@ -548,7 +548,7 @@ void tst_QScriptValue::isUndefined_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isUndefined)
 
 
-void tst_QScriptValue::isVariant_initData()
+void tst_QScriptValueGenerated::isVariant_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -559,7 +559,7 @@ static QString isVariant_array [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",};
 
-void tst_QScriptValue::isVariant_makeData(const char* expr)
+void tst_QScriptValueGenerated::isVariant_makeData(const char* expr)
 {
     static QSet<QString> isVariant;
     if (isVariant.isEmpty()) {
@@ -570,7 +570,7 @@ void tst_QScriptValue::isVariant_makeData(const char* expr)
     newRow(expr) << isVariant.contains(expr);
 }
 
-void tst_QScriptValue::isVariant_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isVariant_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isVariant(), expected);
@@ -580,7 +580,7 @@ void tst_QScriptValue::isVariant_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isVariant)
 
 
-void tst_QScriptValue::isQObject_initData()
+void tst_QScriptValueGenerated::isQObject_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -589,7 +589,7 @@ void tst_QScriptValue::isQObject_initData()
 static QString isQObject_array [] = {
     "engine->newQObject(engine)",};
 
-void tst_QScriptValue::isQObject_makeData(const char* expr)
+void tst_QScriptValueGenerated::isQObject_makeData(const char* expr)
 {
     static QSet<QString> isQObject;
     if (isQObject.isEmpty()) {
@@ -600,7 +600,7 @@ void tst_QScriptValue::isQObject_makeData(const char* expr)
     newRow(expr) << isQObject.contains(expr);
 }
 
-void tst_QScriptValue::isQObject_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isQObject_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isQObject(), expected);
@@ -610,7 +610,7 @@ void tst_QScriptValue::isQObject_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isQObject)
 
 
-void tst_QScriptValue::isQMetaObject_initData()
+void tst_QScriptValueGenerated::isQMetaObject_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -619,7 +619,7 @@ void tst_QScriptValue::isQMetaObject_initData()
 static QString isQMetaObject_array [] = {
     "engine->newQMetaObject(&QObject::staticMetaObject)",};
 
-void tst_QScriptValue::isQMetaObject_makeData(const char* expr)
+void tst_QScriptValueGenerated::isQMetaObject_makeData(const char* expr)
 {
     static QSet<QString> isQMetaObject;
     if (isQMetaObject.isEmpty()) {
@@ -630,7 +630,7 @@ void tst_QScriptValue::isQMetaObject_makeData(const char* expr)
     newRow(expr) << isQMetaObject.contains(expr);
 }
 
-void tst_QScriptValue::isQMetaObject_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isQMetaObject_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isQMetaObject(), expected);
@@ -640,7 +640,7 @@ void tst_QScriptValue::isQMetaObject_test(const char*, const QScriptValue& value
 DEFINE_TEST_FUNCTION(isQMetaObject)
 
 
-void tst_QScriptValue::isObject_initData()
+void tst_QScriptValueGenerated::isObject_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -678,7 +678,7 @@ static QString isObject_array [] = {
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(engine)",};
 
-void tst_QScriptValue::isObject_makeData(const char* expr)
+void tst_QScriptValueGenerated::isObject_makeData(const char* expr)
 {
     static QSet<QString> isObject;
     if (isObject.isEmpty()) {
@@ -689,7 +689,7 @@ void tst_QScriptValue::isObject_makeData(const char* expr)
     newRow(expr) << isObject.contains(expr);
 }
 
-void tst_QScriptValue::isObject_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isObject_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isObject(), expected);
@@ -699,7 +699,7 @@ void tst_QScriptValue::isObject_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isObject)
 
 
-void tst_QScriptValue::isDate_initData()
+void tst_QScriptValueGenerated::isDate_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -709,7 +709,7 @@ static QString isDate_array [] = {
     "engine->evaluate(\"Date.prototype\")",
     "engine->newDate(QDateTime())",};
 
-void tst_QScriptValue::isDate_makeData(const char* expr)
+void tst_QScriptValueGenerated::isDate_makeData(const char* expr)
 {
     static QSet<QString> isDate;
     if (isDate.isEmpty()) {
@@ -720,7 +720,7 @@ void tst_QScriptValue::isDate_makeData(const char* expr)
     newRow(expr) << isDate.contains(expr);
 }
 
-void tst_QScriptValue::isDate_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isDate_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isDate(), expected);
@@ -730,7 +730,7 @@ void tst_QScriptValue::isDate_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isDate)
 
 
-void tst_QScriptValue::isRegExp_initData()
+void tst_QScriptValueGenerated::isRegExp_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -739,7 +739,7 @@ void tst_QScriptValue::isRegExp_initData()
 static QString isRegExp_array [] = {
     "engine->evaluate(\"/foo/\")",};
 
-void tst_QScriptValue::isRegExp_makeData(const char* expr)
+void tst_QScriptValueGenerated::isRegExp_makeData(const char* expr)
 {
     static QSet<QString> isRegExp;
     if (isRegExp.isEmpty()) {
@@ -750,7 +750,7 @@ void tst_QScriptValue::isRegExp_makeData(const char* expr)
     newRow(expr) << isRegExp.contains(expr);
 }
 
-void tst_QScriptValue::isRegExp_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isRegExp_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isRegExp(), expected);
@@ -760,7 +760,7 @@ void tst_QScriptValue::isRegExp_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isRegExp)
 
 
-void tst_QScriptValue::isArray_initData()
+void tst_QScriptValueGenerated::isArray_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -773,7 +773,7 @@ static QString isArray_array [] = {
     "engine->newArray()",
     "engine->newArray(10)",};
 
-void tst_QScriptValue::isArray_makeData(const char* expr)
+void tst_QScriptValueGenerated::isArray_makeData(const char* expr)
 {
     static QSet<QString> isArray;
     if (isArray.isEmpty()) {
@@ -784,7 +784,7 @@ void tst_QScriptValue::isArray_makeData(const char* expr)
     newRow(expr) << isArray.contains(expr);
 }
 
-void tst_QScriptValue::isArray_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isArray_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isArray(), expected);
@@ -794,7 +794,7 @@ void tst_QScriptValue::isArray_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(isArray)
 
 
-void tst_QScriptValue::isError_initData()
+void tst_QScriptValueGenerated::isError_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -808,7 +808,7 @@ static QString isError_array [] = {
     "engine->evaluate(\"True\")",
     "engine->evaluate(\"False\")",};
 
-void tst_QScriptValue::isError_makeData(const char* expr)
+void tst_QScriptValueGenerated::isError_makeData(const char* expr)
 {
     static QSet<QString> isError;
     if (isError.isEmpty()) {
@@ -819,7 +819,7 @@ void tst_QScriptValue::isError_makeData(const char* expr)
     newRow(expr) << isError.contains(expr);
 }
 
-void tst_QScriptValue::isError_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::isError_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.isError(), expected);
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
index 754f4e0..cb75ded 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
@@ -47,7 +47,7 @@
 
 
 
-void tst_QScriptValue::toString_initData()
+void tst_QScriptValueGenerated::toString_initData()
 {
     QTest::addColumn<QString>("expected");
     initScriptValues();
@@ -270,7 +270,7 @@ static QString toString_valueArray [] = {
     "123", "false", 
     "null", "QScriptEngine(name = \"\")", };
 
-void tst_QScriptValue::toString_makeData(const char* expr)
+void tst_QScriptValueGenerated::toString_makeData(const char* expr)
 {
     static QHash<QString, QString> toString;
     if (toString.isEmpty()) {
@@ -281,7 +281,7 @@ void tst_QScriptValue::toString_makeData(const char* expr)
     newRow(expr) << toString.value(expr);
 }
 
-void tst_QScriptValue::toString_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toString_test(const char*, const QScriptValue& value)
 {
     QFETCH(QString, expected);
     QCOMPARE(value.toString(), expected);
@@ -291,7 +291,7 @@ void tst_QScriptValue::toString_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(toString)
 
 
-void tst_QScriptValue::toNumber_initData()
+void tst_QScriptValueGenerated::toNumber_initData()
 {
     QTest::addColumn<qsreal>("expected");
     initScriptValues();
@@ -456,7 +456,7 @@ static qsreal toNumber_valueArray [] = {
     65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4, 
     0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0, 
     0, qQNaN(), };
-void tst_QScriptValue::toNumber_makeData(const char* expr)
+void tst_QScriptValueGenerated::toNumber_makeData(const char* expr)
 {
     static QHash<QString, qsreal> toNumber;
     if (toNumber.isEmpty()) {
@@ -467,7 +467,7 @@ void tst_QScriptValue::toNumber_makeData(const char* expr)
     newRow(expr) << toNumber.value(expr);
 }
 
-void tst_QScriptValue::toNumber_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toNumber_test(const char*, const QScriptValue& value)
 {
     QFETCH(qsreal, expected);
     if (qIsNaN(expected)) {
@@ -486,7 +486,7 @@ void tst_QScriptValue::toNumber_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(toNumber)
 
 
-void tst_QScriptValue::toBool_initData()
+void tst_QScriptValueGenerated::toBool_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -709,7 +709,7 @@ static bool toBool_valueArray [] = {
     true, true, 
     false, true, };
 
-void tst_QScriptValue::toBool_makeData(const char* expr)
+void tst_QScriptValueGenerated::toBool_makeData(const char* expr)
 {
     static QHash<QString, bool> toBool;
     if (toBool.isEmpty()) {
@@ -720,7 +720,7 @@ void tst_QScriptValue::toBool_makeData(const char* expr)
     newRow(expr) << toBool.value(expr);
 }
 
-void tst_QScriptValue::toBool_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toBool_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.toBool(), expected);
@@ -730,7 +730,7 @@ void tst_QScriptValue::toBool_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(toBool)
 
 
-void tst_QScriptValue::toBoolean_initData()
+void tst_QScriptValueGenerated::toBoolean_initData()
 {
     QTest::addColumn<bool>("expected");
     initScriptValues();
@@ -953,7 +953,7 @@ static bool toBoolean_valueArray [] = {
     true, true, 
     false, true, };
 
-void tst_QScriptValue::toBoolean_makeData(const char* expr)
+void tst_QScriptValueGenerated::toBoolean_makeData(const char* expr)
 {
     static QHash<QString, bool> toBoolean;
     if (toBoolean.isEmpty()) {
@@ -964,7 +964,7 @@ void tst_QScriptValue::toBoolean_makeData(const char* expr)
     newRow(expr) << toBoolean.value(expr);
 }
 
-void tst_QScriptValue::toBoolean_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toBoolean_test(const char*, const QScriptValue& value)
 {
     QFETCH(bool, expected);
     QCOMPARE(value.toBoolean(), expected);
@@ -974,7 +974,7 @@ void tst_QScriptValue::toBoolean_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(toBoolean)
 
 
-void tst_QScriptValue::toInteger_initData()
+void tst_QScriptValueGenerated::toInteger_initData()
 {
     QTest::addColumn<qsreal>("expected");
     initScriptValues();
@@ -1139,7 +1139,7 @@ static qsreal toInteger_valueArray [] = {
     65536, 65537, 0, qInf(), qInf(), 0, 0, 0, 123, 12, 
     0, 0, 0, 0, 0, 0, 0, 0, 123, 0, 
     0, 0, };
-void tst_QScriptValue::toInteger_makeData(const char* expr)
+void tst_QScriptValueGenerated::toInteger_makeData(const char* expr)
 {
     static QHash<QString, qsreal> toInteger;
     if (toInteger.isEmpty()) {
@@ -1150,7 +1150,7 @@ void tst_QScriptValue::toInteger_makeData(const char* expr)
     newRow(expr) << toInteger.value(expr);
 }
 
-void tst_QScriptValue::toInteger_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toInteger_test(const char*, const QScriptValue& value)
 {
     QFETCH(qsreal, expected);
     if (qIsInf(expected)) {
@@ -1165,7 +1165,7 @@ void tst_QScriptValue::toInteger_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(toInteger)
 
 
-void tst_QScriptValue::toInt32_initData()
+void tst_QScriptValueGenerated::toInt32_initData()
 {
     QTest::addColumn<qint32>("expected");
     initScriptValues();
@@ -1388,7 +1388,7 @@ static qint32 toInt32_valueArray [] = {
     123, 0, 
     0, 0, };
 
-void tst_QScriptValue::toInt32_makeData(const char* expr)
+void tst_QScriptValueGenerated::toInt32_makeData(const char* expr)
 {
     static QHash<QString, qint32> toInt32;
     if (toInt32.isEmpty()) {
@@ -1399,7 +1399,7 @@ void tst_QScriptValue::toInt32_makeData(const char* expr)
     newRow(expr) << toInt32.value(expr);
 }
 
-void tst_QScriptValue::toInt32_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toInt32_test(const char*, const QScriptValue& value)
 {
     QFETCH(qint32, expected);
     QCOMPARE(value.toInt32(), expected);
@@ -1409,7 +1409,7 @@ void tst_QScriptValue::toInt32_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(toInt32)
 
 
-void tst_QScriptValue::toUInt32_initData()
+void tst_QScriptValueGenerated::toUInt32_initData()
 {
     QTest::addColumn<quint32>("expected");
     initScriptValues();
@@ -1632,7 +1632,7 @@ static quint32 toUInt32_valueArray [] = {
     123, 0, 
     0, 0, };
 
-void tst_QScriptValue::toUInt32_makeData(const char* expr)
+void tst_QScriptValueGenerated::toUInt32_makeData(const char* expr)
 {
     static QHash<QString, quint32> toUInt32;
     if (toUInt32.isEmpty()) {
@@ -1643,7 +1643,7 @@ void tst_QScriptValue::toUInt32_makeData(const char* expr)
     newRow(expr) << toUInt32.value(expr);
 }
 
-void tst_QScriptValue::toUInt32_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toUInt32_test(const char*, const QScriptValue& value)
 {
     QFETCH(quint32, expected);
     QCOMPARE(value.toUInt32(), expected);
@@ -1653,7 +1653,7 @@ void tst_QScriptValue::toUInt32_test(const char*, const QScriptValue& value)
 DEFINE_TEST_FUNCTION(toUInt32)
 
 
-void tst_QScriptValue::toUInt16_initData()
+void tst_QScriptValueGenerated::toUInt16_initData()
 {
     QTest::addColumn<quint16>("expected");
     initScriptValues();
@@ -1876,7 +1876,7 @@ static quint16 toUInt16_valueArray [] = {
     123, 0, 
     0, 0, };
 
-void tst_QScriptValue::toUInt16_makeData(const char* expr)
+void tst_QScriptValueGenerated::toUInt16_makeData(const char* expr)
 {
     static QHash<QString, quint16> toUInt16;
     if (toUInt16.isEmpty()) {
@@ -1887,7 +1887,7 @@ void tst_QScriptValue::toUInt16_makeData(const char* expr)
     newRow(expr) << toUInt16.value(expr);
 }
 
-void tst_QScriptValue::toUInt16_test(const char*, const QScriptValue& value)
+void tst_QScriptValueGenerated::toUInt16_test(const char*, const QScriptValue& value)
 {
     QFETCH(quint16, expected);
     QCOMPARE(value.toUInt16(), expected);