From 47cf0c2fafd1cdf594a319a7e42c606880ce0d51 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Mon, 20 Sep 2010 19:29:57 -0300 Subject: Updates tests to use nesting of type declarations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also added a new cases to test the nesting of type tags a bit more. Reviewed by Luciano Wolf Reviewed by Renato Araújo --- tests/CMakeLists.txt | 10 +++--- tests/testenum.cpp | 19 ++++++----- tests/testnamespace.cpp | 13 ++++--- tests/testnestedtypes.cpp | 87 +++++++++++++++++++++++++++++++++++++++++++++++ tests/testnestedtypes.h | 35 +++++++++++++++++++ 5 files changed, 147 insertions(+), 17 deletions(-) create mode 100644 tests/testnestedtypes.cpp create mode 100644 tests/testnestedtypes.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ce054e2e5..a4cb4a13b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,20 +11,18 @@ declare_test(testabstractmetaclass) declare_test(testabstractmetatype) declare_test(testaddfunction) declare_test(testcodeinjection) +declare_test(testcontainer) declare_test(testconversionoperator) declare_test(testconversionruletag) -declare_test(testcontainer) declare_test(testctorinformation) declare_test(testdtorinformation) declare_test(testenum) declare_test(testfunctiontag) declare_test(testimplicitconversions) -if (NOT DISABLE_DOCSTRINGS) - declare_test(testmodifydocumentation) -endif() declare_test(testmodifyfunction) declare_test(testmultipleinheritance) declare_test(testnamespace) +declare_test(testnestedtypes) declare_test(testprimitivetypetag) declare_test(testrefcounttag) declare_test(testreferencetopointer) @@ -34,3 +32,7 @@ declare_test(testreverseoperators) declare_test(testtemplates) declare_test(testtoposort) declare_test(testvoidarg) +if (NOT DISABLE_DOCSTRINGS) + declare_test(testmodifydocumentation) +endif() + diff --git a/tests/testenum.cpp b/tests/testenum.cpp index 4ae6cb58a..82a0288ac 100644 --- a/tests/testenum.cpp +++ b/tests/testenum.cpp @@ -38,9 +38,10 @@ void TestEnum::testEnumCppSignature() "; const char* xmlCode = "\ \ - \ \ - \ + \ + \ + \ \ "; @@ -85,9 +86,10 @@ void TestEnum::testEnumWithApiVersion() "; const char* xmlCode = "\ \ - \ - \ - \ + \ + \ + \ + \ "; TestUtil t(cppCode, xmlCode, true, 0.1); @@ -106,11 +108,12 @@ void TestEnum::testAnonymousEnum() "; const char* xmlCode = "\ \ - \ \ \ - \ - \ + \ + \ + \ + \ "; TestUtil t(cppCode, xmlCode, false); diff --git a/tests/testnamespace.cpp b/tests/testnamespace.cpp index 3833700a7..7fc457db0 100644 --- a/tests/testnamespace.cpp +++ b/tests/testnamespace.cpp @@ -38,8 +38,9 @@ void TestNamespace::testNamespaceMembers() };"; const char* xmlCode = "\ \ - \ - \ + \ + \ + \ "; TestUtil t(cppCode, xmlCode, false); AbstractMetaClassList classes = t.builder()->classes(); @@ -64,9 +65,11 @@ void TestNamespace::testNamespaceInnerClassMembers() };"; const char* xmlCode = "\ \ - \ - \ - \ + \ + \ + \ + \ + \ "; TestUtil t(cppCode, xmlCode, false); AbstractMetaClassList classes = t.builder()->classes(); diff --git a/tests/testnestedtypes.cpp b/tests/testnestedtypes.cpp new file mode 100644 index 000000000..76c5ccd1a --- /dev/null +++ b/tests/testnestedtypes.cpp @@ -0,0 +1,87 @@ +/* +* This file is part of the API Extractor project. +* +* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* +* Contact: PySide team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA +* +*/ + +#include "testnestedtypes.h" +#include +#include "testutil.h" + +void TestNestedTypes::testNestedTypesModifications() +{ + const char* cppCode ="\ + namespace OuterNamespace {\ + namespace InnerNamespace {\ + struct SomeClass {\ + void method() {}\ + };\ + };\ + };\ + "; + const char* xmlCode = "\ + \ + \ + \ + custom_code1();\ + \ + custom_code2();\ + \ + \ + \ + \ + \ + \ + "; + + TestUtil t(cppCode, xmlCode, false); + AbstractMetaClassList classes = t.builder()->classes(); + + AbstractMetaClass* ons = classes.findClass("OuterNamespace"); + QVERIFY(ons); + + AbstractMetaClass* ins = classes.findClass("OuterNamespace::InnerNamespace"); + QVERIFY(ins); + QCOMPARE(ins->functions().count(), 1); + QCOMPARE(ins->typeEntry()->codeSnips().count(), 1); + CodeSnip snip = ins->typeEntry()->codeSnips().first(); + QCOMPARE(snip.code(), QString("custom_code1();")); + + AbstractMetaFunction* addedFunc = ins->functions().first(); + QVERIFY(addedFunc->isUserAdded()); + QCOMPARE(addedFunc->visibility(), uint(AbstractMetaFunction::Public)); + QCOMPARE(addedFunc->functionType(), AbstractMetaFunction::NormalFunction); + QCOMPARE(addedFunc->type()->minimalSignature(), QString("OuterNamespace::InnerNamespace::SomeClass")); + + QCOMPARE(addedFunc->modifications().size(), 1); + QVERIFY(addedFunc->modifications().first().isCodeInjection()); + snip = addedFunc->modifications().first().snips.first(); + QCOMPARE(snip.code(), QString("custom_code2();")); + + AbstractMetaClass* sc = classes.findClass("OuterNamespace::InnerNamespace::SomeClass"); + QVERIFY(ins); + QCOMPARE(sc->functions().count(), 2); // default constructor and removed method + AbstractMetaFunction* removedFunc = sc->functions().last(); + QVERIFY(removedFunc->isModifiedRemoved()); +} + +QTEST_APPLESS_MAIN(TestNestedTypes) + +#include "testnestedtypes.moc" diff --git a/tests/testnestedtypes.h b/tests/testnestedtypes.h new file mode 100644 index 000000000..b9980b0a6 --- /dev/null +++ b/tests/testnestedtypes.h @@ -0,0 +1,35 @@ +/* +* This file is part of the API Extractor project. +* +* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* +* Contact: PySide team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA +* +*/ + +#ifndef TESTNESTEDTYPES_H +#define TESTNESTEDTYPES_H +#include + +class TestNestedTypes : public QObject +{ + Q_OBJECT +private slots: + void testNestedTypesModifications(); +}; + +#endif -- cgit v1.2.3