aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/testaddfunction.cpp24
-rw-r--r--tests/testimplicitconversions.cpp42
-rw-r--r--tests/testnestedtypes.cpp4
3 files changed, 34 insertions, 36 deletions
diff --git a/tests/testaddfunction.cpp b/tests/testaddfunction.cpp
index beb49fa18..c1189c346 100644
--- a/tests/testaddfunction.cpp
+++ b/tests/testaddfunction.cpp
@@ -67,7 +67,7 @@ void TestAddFunction::testAddFunction()
{
const char cppCode[] = "struct B {}; struct A { void a(int); };";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<primitive-type name='int' />\
<primitive-type name='float' />\
<value-type name='B' />\
@@ -108,7 +108,8 @@ void TestAddFunction::testAddFunctionConstructor()
{
const char cppCode[] = "struct A { A() {} };";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
+ <primitive-type name='int' />\
<value-type name='A'>\
<add-function signature='A(int)' />\
</value-type>\
@@ -130,7 +131,7 @@ void TestAddFunction::testAddFunctionTagDefaultValues()
{
const char cppCode[] = "struct A {};";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<value-type name='A'>\
<add-function signature='func()' />\
</value-type>\
@@ -151,7 +152,7 @@ void TestAddFunction::testAddFunctionCodeSnippets()
{
const char cppCode[] = "struct A {};";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<value-type name='A'>\
<add-function signature='func()'>\
<inject-code class='target' position='end'>Hi!, I am the code.</inject-code>\
@@ -178,7 +179,7 @@ void TestAddFunction::testAddFunctionWithoutParenteses()
const char cppCode[] = "struct A {};";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<value-type name='A'>\
<add-function signature='func'>\
<inject-code class='target' position='end'>Hi!, I am the code.</inject-code>\
@@ -207,7 +208,7 @@ void TestAddFunction::testAddFunctionWithDefaultArgs()
const char cppCode[] = "struct A { };";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<primitive-type name='int'/> \
<value-type name='A'>\
<add-function signature='func(int, int)'>\
@@ -232,7 +233,7 @@ void TestAddFunction::testAddFunctionAtModuleLevel()
{
const char cppCode[] = "struct A { };";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<primitive-type name='int'/> \
<value-type name='A'/>\
<add-function signature='func(int, int)'>\
@@ -270,7 +271,7 @@ void TestAddFunction::testAddFunctionWithVarargs()
const char cppCode[] = "struct A {};";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<primitive-type name='int'/> \
<primitive-type name='char'/> \
<value-type name='A'>\
@@ -293,7 +294,7 @@ void TestAddFunction::testAddStaticFunction()
{
const char cppCode[] = "struct A { };";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<primitive-type name='int'/> \
<value-type name='A'>\
<add-function signature='func(int, int)' static='yes'>\
@@ -314,7 +315,7 @@ void TestAddFunction::testAddGlobalFunction()
{
const char cppCode[] = "struct A { };struct B {};";
const char xmlCode[] = "\
- <typesystem package=\"Foo\">\
+ <typesystem package='Foo'>\
<primitive-type name='int'/> \
<value-type name='A' />\
<add-function signature='globalFunc(int, int)' static='yes'>\
@@ -385,9 +386,10 @@ void TestAddFunction::testAddFunctionOnTypedef()
const char cppCode[] = "template<class T> class Foo { }; typedef Foo<int> FooInt;";
const char xmlCode[] = "\
<typesystem package='Package'>\
+ <custom-type name='PySequence'/>\
<primitive-type name='int'/>\
<value-type name='FooInt'>\
- <add-function signature='FooInt(PySequence*)'>\
+ <add-function signature='FooInt(PySequence)'>\
<inject-code class='target' position='beginning'>custom_code();</inject-code>\
</add-function>\
<add-function signature='method()'>\
diff --git a/tests/testimplicitconversions.cpp b/tests/testimplicitconversions.cpp
index 86032acaf..4bc4d73fc 100644
--- a/tests/testimplicitconversions.cpp
+++ b/tests/testimplicitconversions.cpp
@@ -30,22 +30,20 @@ void TestImplicitConversions::testWithPrivateCtors()
const char* cppCode ="\
class B;\
class C;\
- \
class A {\
A(const B&);\
public:\
A(const C&);\
};\
- \
class B {};\
class C {};\
";
const char* xmlCode = "\
- <typesystem package=\"Foo\"> \
- <value-type name=\"A\"/> \
- <value-type name=\"B\"/> \
- <value-type name=\"C\"/> \
- </typesystem>";
+ <typesystem package='Foo'> \
+ <value-type name='A'/> \
+ <value-type name='B'/> \
+ <value-type name='C'/> \
+ </typesystem>";
TestUtil t(cppCode, xmlCode);
AbstractMetaClassList classes = t.builder()->classes();
QCOMPARE(classes.count(), 3);
@@ -65,18 +63,17 @@ void TestImplicitConversions::testWithModifiedVisibility()
public:\
A(const B&);\
};\
- \
class B {};\
";
const char* xmlCode = "\
- <typesystem package=\"Foo\">\
- <value-type name=\"A\">\
+ <typesystem package='Foo'>\
+ <value-type name='A'>\
<modify-function signature='A(const B&amp;)'>\
<access modifier='private' />\
</modify-function>\
</value-type>\
- <value-type name=\"B\"/>\
- </typesystem>";
+ <value-type name='B'/>\
+ </typesystem>";
TestUtil t(cppCode, xmlCode);
AbstractMetaClassList classes = t.builder()->classes();
QCOMPARE(classes.count(), 2);
@@ -96,20 +93,20 @@ void TestImplicitConversions::testWithAddedCtor()
public:\
A(const B&);\
};\
- \
class B {};\
class C {};\
";
const char* xmlCode = "\
- <typesystem package=\"Foo\">\
- <value-type name=\"A\">\
+ <typesystem package='Foo'>\
+ <custom-type name='TARGETLANGTYPE' />\
+ <value-type name='A'>\
<add-function signature='A(const C&amp;)' />\
</value-type>\
- <value-type name=\"B\">\
+ <value-type name='B'>\
<add-function signature='B(TARGETLANGTYPE*)' />\
</value-type>\
- <value-type name=\"C\"/>\
- </typesystem>";
+ <value-type name='C'/>\
+ </typesystem>";
TestUtil t(cppCode, xmlCode);
AbstractMetaClassList classes = t.builder()->classes();
QCOMPARE(classes.count(), 3);
@@ -133,10 +130,10 @@ void TestImplicitConversions::testWithExternalConversionOperator()
};\
";
const char* xmlCode = "\
- <typesystem package=\"Foo\">\
- <value-type name=\"A\"/>\
- <value-type name=\"B\"/>\
- </typesystem>";
+ <typesystem package='Foo'>\
+ <value-type name='A'/>\
+ <value-type name='B'/>\
+ </typesystem>";
TestUtil t(cppCode, xmlCode);
AbstractMetaClassList classes = t.builder()->classes();
QCOMPARE(classes.count(), 2);
@@ -159,4 +156,3 @@ void TestImplicitConversions::testWithExternalConversionOperator()
QTEST_APPLESS_MAIN(TestImplicitConversions)
#include "testimplicitconversions.moc"
-
diff --git a/tests/testnestedtypes.cpp b/tests/testnestedtypes.cpp
index 4e000cb08..83512f7db 100644
--- a/tests/testnestedtypes.cpp
+++ b/tests/testnestedtypes.cpp
@@ -93,7 +93,7 @@ void TestNestedTypes::testDuplicationOfNestedTypes()
<typesystem package='Foo'> \
<namespace-type name='Namespace'>\
<value-type name='SomeClass'>\
- <add-function signature='createSomeClass(SomeClass)'/>\
+ <add-function signature='createSomeClass(Namespace::SomeClass)'/>\
</value-type>\
</namespace-type>\
</typesystem>";
@@ -114,7 +114,7 @@ void TestNestedTypes::testDuplicationOfNestedTypes()
TypeEntry* t1 = TypeDatabase::instance()->findType("Namespace::SomeClass");
QVERIFY(t1);
TypeEntry* t2 = TypeDatabase::instance()->findType("SomeClass");
- QCOMPARE(t1, t2);
+ QVERIFY(!t2);
}
QTEST_APPLESS_MAIN(TestNestedTypes)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 18:56:14 +0000