From 163c06d1431da7aa4aa88e571cc48c2ee39c83a3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 28 Jun 2018 16:12:45 +0200 Subject: shiboken: Use raw string literals in ApiExtractor test testtemplates This improves the readability. Task-number: PYSIDE-672 Change-Id: I936ef46fb30af6163b8337adbf9cf585e68f3424 Reviewed-by: Alexandru Croitor --- .../shiboken2/ApiExtractor/tests/testtemplates.cpp | 388 +++++++++++---------- 1 file changed, 195 insertions(+), 193 deletions(-) (limited to 'sources/shiboken2/ApiExtractor/tests/testtemplates.cpp') diff --git a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp index ea506f3b5..8d869e3f9 100644 --- a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp @@ -35,35 +35,37 @@ void TestTemplates::testTemplateWithNamespace() { - const char cppCode[] = "\n\ - template struct QList {}; \n\ - struct Url {\n\ - void name();\n\ - };\n\ - namespace Internet {\n\ - struct Url{};\n\ - struct Bookmarks {\n\ - QList list();\n\ - };\n\ - }"; - const char xmlCode0[] = "\n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +template struct QList {}; +struct Url { + void name(); +}; +namespace Internet { + struct Url{}; + struct Bookmarks { + QList list(); + }; +}; +)CPP"; + + const char xmlCode0[] = R"XML( + + +)XML"; QTemporaryFile file; QVERIFY(file.open()); file.write(xmlCode0); file.close(); - QString xmlCode1 = QString::fromLatin1("\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - ").arg(file.fileName()); + QString xmlCode1 = QString::fromLatin1(R"XML( + + + + + + +)XML").arg(file.fileName()); QScopedPointer builder(TestUtil::parse(cppCode, qPrintable(xmlCode1), false)); QVERIFY(!builder.isNull()); @@ -79,26 +81,27 @@ void TestTemplates::testTemplateWithNamespace() void TestTemplates::testTemplateOnContainers() { - const char cppCode[] = "\n\ - struct Base {};\n\ - template struct QList {}; \n\ - namespace Namespace {\n\ - enum SomeEnum { E1, E2 };\n\ - template struct A {\n\ - A foo(const QList >& a);\n\ - };\n\ - typedef A B;\n\ - }\n\ - "; - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +struct Base {}; +template struct QList {}; +namespace Namespace { + enum SomeEnum { E1, E2 }; + template struct A { + A foo(const QList >& a); + }; + typedef A B; +} +)CPP"; + + const char xmlCode[] = R"XML( + + + + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -124,18 +127,17 @@ void TestTemplates::testTemplateOnContainers() void TestTemplates::testTemplateValueAsArgument() { - const char cppCode[] = "\n\ - template struct List {};\n\ - void func(List arg) {}\n\ - "; - - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +template struct List {}; +void func(List arg) {} +)CPP"; + + const char xmlCode[] = R"XML( + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -149,18 +151,17 @@ void TestTemplates::testTemplateValueAsArgument() void TestTemplates::testTemplatePointerAsArgument() { - const char cppCode[] = "\n\ - template struct List {};\n\ - void func(List* arg) {}\n\ - "; - - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +template struct List {}; +void func(List* arg) {} +)CPP"; + + const char xmlCode[] = R"XML( + + + + + )XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -174,18 +175,17 @@ void TestTemplates::testTemplatePointerAsArgument() void TestTemplates::testTemplateReferenceAsArgument() { - const char cppCode[] = "\n\ - template struct List {};\n\ - void func(List& arg) {}\n\ - "; - - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +template struct List {}; +void func(List& arg) {} + )CPP"; + + const char xmlCode[] = R"XML( + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -199,19 +199,20 @@ void TestTemplates::testTemplateReferenceAsArgument() void TestTemplates::testTemplateParameterFixup() { - const char cppCode[] = "\n\ - template\n\ - struct List {\n\ - struct Iterator {};\n\ - void append(List l);\n\ - void erase(List::Iterator it);\n\ - };\n"; - - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n"; + const char cppCode[] = R"CPP( +template +struct List { + struct Iterator {}; + void append(List l); + void erase(List::Iterator it); +}; +)CPP"; + + const char xmlCode[] = R"XML( + + + + )XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -234,26 +235,25 @@ void TestTemplates::testTemplateParameterFixup() void TestTemplates::testInheritanceFromContainterTemplate() { - const char cppCode[] = "\n\ - template\n\ - struct ListContainer {\n\ - inline void push_front(const T& t);\n\ - inline T& front();\n\ - };\n\ - struct FooBar {};\n\ - struct FooBars : public ListContainer {};\n\ - "; - - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +template +struct ListContainer { + inline void push_front(const T& t); + inline T& front(); +}; +struct FooBar {}; +struct FooBars : public ListContainer {}; +)CPP"; + + const char xmlCode[] = R"XML( + + + + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -271,25 +271,26 @@ void TestTemplates::testInheritanceFromContainterTemplate() void TestTemplates::testTemplateInheritanceMixedWithForwardDeclaration() { - const char cppCode[] = "\n\ - enum SomeEnum { E1, E2 };\n\ - template struct Future;\n\ - template\n\ - struct A {\n\ - A();\n\ - void method();\n\ - friend struct Future;\n\ - };\n\ - typedef A B;\n\ - template struct Future {};\n\ - "; - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +enum SomeEnum { E1, E2 }; +template struct Future; +template +struct A { + A(); + void method(); + friend struct Future; +}; +typedef A B; +template struct Future {}; +)CPP"; + + const char xmlCode[] = R"XML( + + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -305,28 +306,29 @@ void TestTemplates::testTemplateInheritanceMixedWithForwardDeclaration() void TestTemplates::testTemplateInheritanceMixedWithNamespaceAndForwardDeclaration() { - const char cppCode[] = "\n\ - namespace Namespace {\n\ - enum SomeEnum { E1, E2 };\n\ - template struct Future;\n\ - template\n\ - struct A {\n\ - A();\n\ - void method();\n\ - friend struct Future;\n\ - };\n\ - typedef A B;\n\ - template struct Future {};\n\ - };\n\ - "; - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +namespace Namespace { +enum SomeEnum { E1, E2 }; +template struct Future; +template +struct A { + A(); + void method(); + friend struct Future; +}; +typedef A B; +template struct Future {}; +}; +)CPP"; + + const char xmlCode[] = R"XML( + + + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -342,28 +344,27 @@ void TestTemplates::testTemplateInheritanceMixedWithNamespaceAndForwardDeclarati void TestTemplates::testTypedefOfInstantiationOfTemplateClass() { - const char cppCode[] = "\n\ - namespace NSpace {\n\ - enum ClassType {\n\ - TypeOne\n\ - };\n\ - template\n\ - struct BaseTemplateClass {\n\ - inline ClassType getClassType() const { CLASS_TYPE; }\n\ - };\n\ - typedef BaseTemplateClass TypeOneClass;\n\ - }\n\ - "; - - const char xmlCode[] = "\n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +namespace NSpace { +enum ClassType { + TypeOne +}; +template +struct BaseTemplateClass { + inline ClassType getClassType() const { CLASS_TYPE; } +}; +typedef BaseTemplateClass TypeOneClass; +} +)CPP"; + + const char xmlCode[] = R"XML( + + + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); @@ -395,24 +396,25 @@ void TestTemplates::testTypedefOfInstantiationOfTemplateClass() void TestTemplates::testContainerTypeIncompleteArgument() { - const char* cppCode ="\n\ - template\n\ - class Vector {\n\ - void method(const Vector& vector);\n\ - Vector otherMethod();\n\ - };\n\ - template \n\ - void Vector::method(const Vector& vector) {}\n\ - template \n\ - Vector Vector::otherMethod() { return Vector(); }\n\ - typedef Vector IntVector;\n\ - "; - const char* xmlCode = "\n\ - \n\ - \n\ - \n\ - \n\ - "; + const char cppCode[] = R"CPP( +template +class Vector { + void method(const Vector& vector); + Vector otherMethod(); +}; +template +void Vector::method(const Vector& vector) {} +template +Vector Vector::otherMethod() { return Vector(); } +typedef Vector IntVector; +)CPP"; + + const char xmlCode[] = R"XML( + + + + +)XML"; QScopedPointer builder(TestUtil::parse(cppCode, xmlCode, true)); QVERIFY(!builder.isNull()); -- cgit v1.2.3