diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-04-04 15:34:23 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-09 19:10:15 -0300 |
commit | 17f8e2a2435874df7103826641ab46b7761c010a (patch) | |
tree | 44090abf0d0803a64d7acaedf0e3ea28d9fdfad2 | |
parent | eea55215f0f172c7103e881ec1423891784a2790 (diff) |
Added support for module extra includes.
Unit tests were also added.
Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/testextrainclude.cpp | 79 | ||||
-rw-r--r-- | tests/testextrainclude.h | 37 | ||||
-rw-r--r-- | typesystem.cpp | 1 |
4 files changed, 118 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ab5d289..5d991e6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,6 +24,7 @@ declare_test(testctorinformation) declare_test(testdroptypeentries) declare_test(testdtorinformation) declare_test(testenum) +declare_test(testextrainclude) declare_test(testfunctiontag) declare_test(testimplicitconversions) declare_test(testmodifyfunction) diff --git a/tests/testextrainclude.cpp b/tests/testextrainclude.cpp new file mode 100644 index 0000000..b9e6ad3 --- /dev/null +++ b/tests/testextrainclude.cpp @@ -0,0 +1,79 @@ +/* +* This file is part of the API Extractor project. +* +* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +* +* Contact: PySide team <contact@pyside.org> +* +* 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 "testextrainclude.h" +#include <QtTest/QTest> +#include "testutil.h" + +void TestExtraInclude::testClassExtraInclude() +{ + const char* cppCode ="struct A {};"; + const char* xmlCode = "\ + <typesystem package='Foo'> \ + <value-type name='A'> \ + <extra-includes>\ + <include file-name='header.h' location='global' />\ + </extra-includes>\ + </value-type>\ + </typesystem>"; + + TestUtil t(cppCode, xmlCode, false); + AbstractMetaClassList classes = t.builder()->classes(); + const AbstractMetaClass* classA = classes.findClass("A"); + QVERIFY(classA); + + QList<Include> includes = classA->typeEntry()->extraIncludes(); + QCOMPARE(includes.count(), 1); + QCOMPARE(includes.first().name(), QString("header.h")); +} + +void TestExtraInclude::testGlobalExtraIncludes() +{ + const char* cppCode ="struct A {};"; + const char* xmlCode = "\ + <typesystem package='Foo'>\ + <extra-includes>\ + <include file-name='header1.h' location='global' />\ + <include file-name='header2.h' location='global' />\ + </extra-includes>\ + <value-type name='A' />\ + </typesystem>"; + + TestUtil t(cppCode, xmlCode, false); + AbstractMetaClassList classes = t.builder()->classes(); + QVERIFY(classes.findClass("A")); + + TypeDatabase* td = TypeDatabase::instance(); + TypeEntry* module = td->findType("Foo"); + QVERIFY(module); + + QList<Include> includes = module->extraIncludes(); + QCOMPARE(includes.count(), 2); + QCOMPARE(includes.first().name(), QString("header1.h")); + QCOMPARE(includes.last().name(), QString("header2.h")); +} + +QTEST_APPLESS_MAIN(TestExtraInclude) + +#include "testextrainclude.moc" + diff --git a/tests/testextrainclude.h b/tests/testextrainclude.h new file mode 100644 index 0000000..d397f5f --- /dev/null +++ b/tests/testextrainclude.h @@ -0,0 +1,37 @@ +/* +* This file is part of the API Extractor project. +* +* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +* +* Contact: PySide team <contact@pyside.org> +* +* 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 TESTEXTRAINCLUDE_H +#define TESTEXTRAINCLUDE_H + +#include <QObject> + +class TestExtraInclude : public QObject +{ + Q_OBJECT + private slots: + void testClassExtraInclude(); + void testGlobalExtraIncludes(); +}; + +#endif diff --git a/typesystem.cpp b/typesystem.cpp index c9f6ac7..843f182 100644 --- a/typesystem.cpp +++ b/typesystem.cpp @@ -816,6 +816,7 @@ bool Handler::startElement(const QString &, const QString &n, || element->type == StackElement::Rejection || element->type == StackElement::LoadTypesystem || element->type == StackElement::InjectCode + || element->type == StackElement::ExtraIncludes || element->type == StackElement::ConversionRule || element->type == StackElement::AddFunction || element->type == StackElement::Template; |