feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move the textual simplification of container type to debugger again

Browse Source 
This is the only user, and likely will stay so for a while, and
eases the linking of the debugger autotests.

Change-Id: I822fa892f105a5b7985370b26e50aa94cac74bb3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2014-01-08 14:10:56 +01:00
parent 11264ef6b9
commit df2ecb4edd
15 changed files with 267 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/cplusplus/cplusplus.pro
View File

@@ -9,7 +9,6 @@ SUBDIRS = \
preprocessor \
semantic \
typeprettyprinter \
simplifytypes \
misc \
cxx11 \
checksymbols \

1
tests/auto/cplusplus/cplusplus.qbs
View File

@@ -13,7 +13,6 @@ Project {
"misc/misc.qbs",
"preprocessor/preprocessor.qbs",
"semantic/semantic.qbs",
"simplifytypes/simplifytypes.qbs",
"typeprettyprinter/typeprettyprinter.qbs"
]
}

2
tests/auto/cplusplus/simplifytypes/simplifytypes.pro
View File

@@ -1,2 +0,0 @@
include(../shared/shared.pri)
SOURCES += tst_simplifytypestest.cpp

7
tests/auto/cplusplus/simplifytypes/simplifytypes.qbs
View File

@@ -1,7 +0,0 @@
import qbs
import "../cplusplusautotest.qbs" as CPlusPlusAutotest
CPlusPlusAutotest {
name: "CPlusPlus simplify types autotest"
files: "tst_simplifytypestest.cpp"
}

148
tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp
View File

@@ -1,148 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include <cplusplus/CppRewriter.h>
#include <QString>
#include <QtTest>
const char *description[] =
{
"g++_stdstring",
"g++_stdwstring",
"g++_stringmap",
"g++_wstringmap",
"g++_stringlist",
"g++_stringset",
"g++_stringvector",
"g++_wstringvector",
"g++_unordered_set",
"g++_unordered_map",
"libc++_stringvector",
"msvc_stdstring",
"msvc_stdwstring",
"msvc_stringmap",
"msvc_wstringmap",
"msvc_stringlist",
"msvc_stringset",
"msvc_stringvector",
"msvc_wstringvector",
};
const char *input[] =
{
// g++
"std::string",
"std::wstring",
"std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >",
"std::map<std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >, std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >, std::less<std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > >, std::allocator<std::pair<std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > const, std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > > > >",
"std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
"std::set<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
"std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >",
"std::vector<std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >, std::allocator<std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > > >",
"std::unordered_set<int, std::hash<int>, std::equal_to<int>, std::allocator<int> >",
"std::unordered_map<int, int, std::hash<int>, std::equal_to<int>, std::allocator<std::pair<int const, int> > >",
// libc++
"std::__1::vector<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, std::__1::allocator<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > >",
// MSVC
"class std::basic_string<char,std::char_traits<char>,std::allocator<char> >",
"class std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >",
"class std::map<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::less<std::basic_string<char,std::char_traits<char>,std::allocator<char> > >,std::allocator<std::pair<std::basic_string<char,std::char_traits<char>,std::allocator<char> > const ,std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > >",
"class std::map<std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >,std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >,std::less<std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> > >,std::allocator<std::pair<std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> > const ,std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> > > > >",
"class std::list<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > >",
"class std::set<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::less<std::basic_string<char,std::char_traits<char>,std::allocator<char> > >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > >",
"class std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > >",
"class std::vector<std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >,std::allocator<std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> > > >"
};
const char *output[] =
{
// Gcc
"std::string",
"std::wstring",
"std::map<std::string, std::string>",
"std::map<std::wstring, std::wstring>",
"std::list<std::string>",
"std::set<std::string>",
"std::vector<std::string>",
"std::vector<std::wstring>",
"std::unordered_set<int>",
"std::unordered_map<int, int>",
// libc++
"std::vector<std::string>",
// MSVC
"std::string",
"std::wstring",
"std::map<std::string, std::string>",
"std::map<std::wstring, std::wstring>",
"std::list<std::string>",
"std::set<std::string>",
"std::vector<std::string>",
"std::vector<std::wstring>",
};
class SimplifyTypesTest : public QObject
{
Q_OBJECT
public:
SimplifyTypesTest();
private Q_SLOTS:
void testCase1();
void testCase1_data();
};
SimplifyTypesTest::SimplifyTypesTest()
{
}
void SimplifyTypesTest::testCase1()
{
QFETCH(QString, input);
QFETCH(QString, expected);
const QString output = CPlusPlus::simplifySTLType(input);
QCOMPARE(output, expected);
}
void SimplifyTypesTest::testCase1_data()
{
QTest::addColumn<QString>("input");
QTest::addColumn<QString>("expected");
const size_t count = sizeof(input)/sizeof(const char *);
for (size_t i = 0; i < count; i++ )
QTest::newRow(description[i]) << QString::fromLatin1(input[i])
<< QString::fromLatin1(output[i]);
}
QTEST_APPLESS_MAIN(SimplifyTypesTest);
#include "tst_simplifytypestest.moc"