diff options
| author | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-09 14:49:28 -0200 |
|---|---|---|
| committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-09 19:00:00 -0200 |
| commit | e363a1d1d2aa2a05139719adc02756766bc92cc1 (patch) | |
| tree | b8c5954af58e9306655d9f448094dcad45b4bbfc /tests | |
| parent | f59e7ee17f8be5d29be464e56c0cf901b8e3f023 (diff) | |
Fix add-function tag when adding a global function.
Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testaddfunction.cpp | 26 | ||||
| -rw-r--r-- | tests/testaddfunction.h | 1 |
2 files changed, 26 insertions, 1 deletions
diff --git a/tests/testaddfunction.cpp b/tests/testaddfunction.cpp index b1c0aca8d..91380b073 100644 --- a/tests/testaddfunction.cpp +++ b/tests/testaddfunction.cpp @@ -247,7 +247,7 @@ void TestAddFunction::testAddFunctionAtModuleLevel() TypeDatabase* typeDb = TypeDatabase::instance(); - AddedFunctionList addedFuncs = typeDb->findAddedFunctions("func"); + AddedFunctionList addedFuncs = typeDb->findGlobalUserFunctions("func"); QCOMPARE(addedFuncs.size(), 1); @@ -310,6 +310,30 @@ void TestAddFunction::testAddStaticFunction() QVERIFY(addedFunc->isStatic()); } +void TestAddFunction::testAddGlobalFunction() +{ + const char cppCode[] = "struct A { };struct B {};"; + const char xmlCode[] = "\ + <typesystem package=\"Foo\">\ + <primitive-type name='int'/> \ + <value-type name='A' />\ + <add-function signature='globalFunc(int, int)' static='yes'>\ + <inject-code class='target' position='beginning'>custom_code();</inject-code>\ + </add-function>\ + <add-function signature='globalFunc2(int, int)' static='yes'>\ + <inject-code class='target' position='beginning'>custom_code();</inject-code>\ + </add-function>\ + <value-type name='B' />\ + </typesystem>"; + TestUtil t(cppCode, xmlCode); + AbstractMetaFunctionList globalFuncs = t.builder()->globalFunctions(); + QCOMPARE(globalFuncs.count(), 2); + QVERIFY(!t.builder()->classes().findClass("B")->findFunction("globalFunc")); + QVERIFY(!t.builder()->classes().findClass("B")->findFunction("globalFunc2")); + QVERIFY(!globalFuncs[0]->injectedCodeSnips().isEmpty()); + QVERIFY(!globalFuncs[1]->injectedCodeSnips().isEmpty()); +} + QTEST_APPLESS_MAIN(TestAddFunction) #include "testaddfunction.moc" diff --git a/tests/testaddfunction.h b/tests/testaddfunction.h index 4d5764309..2d529f02a 100644 --- a/tests/testaddfunction.h +++ b/tests/testaddfunction.h @@ -39,6 +39,7 @@ private slots: void testAddFunctionAtModuleLevel(); void testAddFunctionWithVarargs(); void testAddStaticFunction(); + void testAddGlobalFunction(); }; #endif |