diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testabstractmetatype.cpp | 4 | ||||
| -rw-r--r-- | tests/testaddfunction.cpp | 2 | ||||
| -rw-r--r-- | tests/testcodeinjection.cpp | 4 | ||||
| -rw-r--r-- | tests/testenum.cpp | 2 | ||||
| -rw-r--r-- | tests/testmodifyfunction.cpp | 4 | ||||
| -rw-r--r-- | tests/testrefcounttag.cpp | 2 | ||||
| -rw-r--r-- | tests/testutil.h | 5 |
7 files changed, 12 insertions, 11 deletions
diff --git a/tests/testabstractmetatype.cpp b/tests/testabstractmetatype.cpp index 207ec88f0..17e5278a9 100644 --- a/tests/testabstractmetatype.cpp +++ b/tests/testabstractmetatype.cpp @@ -64,7 +64,7 @@ void TestAbstractMetaType::testApiVersionSupported() <function signature='justAtest2()' since='1.1'/>\ <function signature='justAtest3()'/>\ </typesystem>"; - TestUtil t(cppCode, xmlCode, false, 1.0); + TestUtil t(cppCode, xmlCode, false, "1.0"); AbstractMetaClassList classes = t.builder()->classes(); QCOMPARE(classes.size(), 2); @@ -81,7 +81,7 @@ void TestAbstractMetaType::testApiVersionNotSupported() const char* xmlCode = "<typesystem package='Foo'>\ <value-type name='object' since='0.1'/>\ </typesystem>"; - TestUtil t(cppCode, xmlCode, true, 0.1); + TestUtil t(cppCode, xmlCode, true, "0.1"); AbstractMetaClassList classes = t.builder()->classes(); QCOMPARE(classes.size(), 1); diff --git a/tests/testaddfunction.cpp b/tests/testaddfunction.cpp index 2d4ee91fd..beb49fa18 100644 --- a/tests/testaddfunction.cpp +++ b/tests/testaddfunction.cpp @@ -347,7 +347,7 @@ void TestAddFunction::testAddFunctionWithApiVersion() <inject-code class='target' position='beginning'>custom_code();</inject-code>\ </add-function>\ </typesystem>"; - TestUtil t(cppCode, xmlCode, true, 0.1); + TestUtil t(cppCode, xmlCode, true, "0.1"); AbstractMetaFunctionList globalFuncs = t.builder()->globalFunctions(); QCOMPARE(globalFuncs.count(), 1); } diff --git a/tests/testcodeinjection.cpp b/tests/testcodeinjection.cpp index ab1aa8033..ed2c379c2 100644 --- a/tests/testcodeinjection.cpp +++ b/tests/testcodeinjection.cpp @@ -65,7 +65,7 @@ void TestCodeInjections::testInjectWithValidApiVersion() </value-type>\ </typesystem>"; - TestUtil t(cppCode, xmlCode, true, 1.0); + TestUtil t(cppCode, xmlCode, true, "1.0"); AbstractMetaClassList classes = t.builder()->classes(); AbstractMetaClass* classA = classes.findClass("A"); @@ -84,7 +84,7 @@ void TestCodeInjections::testInjectWithInvalidApiVersion() </value-type>\ </typesystem>"; - TestUtil t(cppCode, xmlCode, true, 0.1); + TestUtil t(cppCode, xmlCode, true, "0.1"); AbstractMetaClassList classes = t.builder()->classes(); AbstractMetaClass* classA = classes.findClass("A"); diff --git a/tests/testenum.cpp b/tests/testenum.cpp index 62c43c6c8..07aa0e8cb 100644 --- a/tests/testenum.cpp +++ b/tests/testenum.cpp @@ -92,7 +92,7 @@ void TestEnum::testEnumWithApiVersion() </value-type> \ </typesystem>"; - TestUtil t(cppCode, xmlCode, true, 0.1); + TestUtil t(cppCode, xmlCode, true, "0.1"); AbstractMetaClassList classes = t.builder()->classes(); QCOMPARE(classes.count(), 1); QCOMPARE(classes[0]->enums().count(), 1); diff --git a/tests/testmodifyfunction.cpp b/tests/testmodifyfunction.cpp index 3f92e3e13..245a3e169 100644 --- a/tests/testmodifyfunction.cpp +++ b/tests/testmodifyfunction.cpp @@ -118,7 +118,7 @@ void TestModifyFunction::invalidateAfterUse() </object-type>\ <object-type name='E' /> \ </typesystem>"; - TestUtil t(cppCode, xmlCode, false, 0.1); + TestUtil t(cppCode, xmlCode, false, "0.1"); AbstractMetaClassList classes = t.builder()->classes(); AbstractMetaClass* classB = classes.findClass("B"); const AbstractMetaFunction* func = classB->findFunction("call"); @@ -190,7 +190,7 @@ void TestModifyFunction::testWithApiVersion() </modify-function>\ </object-type>\ </typesystem>"; - TestUtil t(cppCode, xmlCode, false, 0.1); + TestUtil t(cppCode, xmlCode, false, "0.1"); AbstractMetaClassList classes = t.builder()->classes(); AbstractMetaClass* classB = classes.findClass("B"); const AbstractMetaFunction* func = classB->findFunction("method"); diff --git a/tests/testrefcounttag.cpp b/tests/testrefcounttag.cpp index 6f6f87367..424055f2c 100644 --- a/tests/testrefcounttag.cpp +++ b/tests/testrefcounttag.cpp @@ -76,7 +76,7 @@ void TestRefCountTag::testWithApiVersion() </object-type>\ </typesystem>"; - TestUtil t(cppCode, xmlCode, false, 0.1); + TestUtil t(cppCode, xmlCode, false, "0.1"); AbstractMetaClassList classes = t.builder()->classes(); AbstractMetaClass* classB = classes.findClass("B"); const AbstractMetaFunction* func = classB->findFunction("keepObject"); diff --git a/tests/testutil.h b/tests/testutil.h index 775f3a1c9..9519fb8b2 100644 --- a/tests/testutil.h +++ b/tests/testutil.h @@ -32,14 +32,15 @@ class TestUtil { public: TestUtil(const char* cppCode, const char* xmlCode, - bool silent = true, double apiVersion = 0, + bool silent = true, const char* apiVersion = 0, QStringList dropTypeEntries = QStringList()) : m_builder(0) { ReportHandler::setSilent(silent); m_builder = new AbstractMetaBuilder; TypeDatabase* td = TypeDatabase::instance(true); - td->setApiVersion(apiVersion); + if (apiVersion) + td->setApiVersion("*", apiVersion); td->setDropTypeEntries(dropTypeEntries); QBuffer buffer; // parse typesystem |