From 1fd576c1f6fdb96e7c65b7c6fde724e46cee43b2 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 20 Jan 2014 09:15:50 +0200 Subject: C++: Add support for prefixes in switch header/source Task-number: QTCREATORBUG-11031 Change-Id: I93cce0ebf46984eb06094e1f1519717be2bbaa79 Reviewed-by: Orgad Shaneh Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cppheadersource_test.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/plugins/cpptools/cppheadersource_test.cpp') diff --git a/src/plugins/cpptools/cppheadersource_test.cpp b/src/plugins/cpptools/cppheadersource_test.cpp index c047d0fe43..f5f7198544 100644 --- a/src/plugins/cpptools/cppheadersource_test.cpp +++ b/src/plugins/cpptools/cppheadersource_test.cpp @@ -29,6 +29,7 @@ #include "cpptoolsplugin.h" #include "cpptoolsreuse.h" +#include "cppfilesettingspage.h" #include @@ -81,16 +82,31 @@ void CppToolsPlugin::test_headersource_data() QTest::addColumn("headerFileName"); QTest::newRow("samedir") << _("foo.cpp") << _("foo.h"); QTest::newRow("includesub") << _("foo.cpp") << _("include/foo.h"); + QTest::newRow("headerprefix") << _("foo.cpp") << _("testh_foo.h"); + QTest::newRow("sourceprefixwsub") << _("testc_foo.cpp") << _("include/foo.h"); + QTest::newRow("sourceAndHeaderPrefixWithBothsub") << _("src/testc_foo.cpp") << _("include/testh_foo.h"); } void CppToolsPlugin::initTestCase() { QDir(baseTestDir()).mkpath(_(".")); + m_fileSettings->headerSearchPaths.append(QLatin1String("include")); + m_fileSettings->headerSearchPaths.append(QLatin1String("../include")); + m_fileSettings->sourceSearchPaths.append(QLatin1String("src")); + m_fileSettings->sourceSearchPaths.append(QLatin1String("../src")); + m_fileSettings->headerPrefixes.append(QLatin1String("testh_")); + m_fileSettings->sourcePrefixes.append(QLatin1String("testc_")); } void CppToolsPlugin::cleanupTestCase() { Utils::FileUtils::removeRecursively(Utils::FileName::fromString(baseTestDir())); + m_fileSettings->headerSearchPaths.removeLast(); + m_fileSettings->headerSearchPaths.removeLast(); + m_fileSettings->sourceSearchPaths.removeLast(); + m_fileSettings->sourceSearchPaths.removeLast(); + m_fileSettings->headerPrefixes.removeLast(); + m_fileSettings->sourcePrefixes.removeLast(); } } // namespace Internal -- cgit v1.2.1