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

C++: Minor cleanup in lexer tests

Browse Source 
Use a typedef for the list

Change-Id: Ie921226f9b72fdbedd9926ae166979a4cd1ad540
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Orgad Shaneh
2014-01-18 20:38:18 +02:00
committed by Orgad Shaneh
parent 2216c399e5
commit 15680ebe0c
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/auto/cplusplus/lexer/tst_lexer.cpp
View File

@@ -33,7 +33,9 @@
#include <QtTest> #include <QtTest>
#include <QDebug> #include <QDebug>
Q_DECLARE_METATYPE(QList<unsigned>) typedef QList<unsigned> List;
Q_DECLARE_METATYPE(List)
//TESTED_COMPONENT=src/libs/cplusplus //TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus; using namespace CPlusPlus;
@@ -73,85 +75,85 @@ void tst_SimpleLexer::basic()
void tst_SimpleLexer::basic_data() void tst_SimpleLexer::basic_data()
{ {
QTest::addColumn<QByteArray>("source"); QTest::addColumn<QByteArray>("source");
QTest::addColumn<QList<unsigned> >("expectedTokenKindList"); QTest::addColumn<List>("expectedTokenKindList");
QByteArray source; QByteArray source;
QList<unsigned> expectedTokenKindList; List expectedTokenKindList;
source = "// comment"; source = "// comment";
expectedTokenKindList = QList<unsigned>() << T_CPP_COMMENT; expectedTokenKindList = List() << T_CPP_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "//// comment"; source = "//// comment";
expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT; expectedTokenKindList = List() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/// comment"; source = "/// comment";
expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT; expectedTokenKindList = List() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "///< comment"; source = "///< comment";
expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT; expectedTokenKindList = List() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "//! comment"; source = "//! comment";
expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT; expectedTokenKindList = List() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "//!< comment"; source = "//!< comment";
expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT; expectedTokenKindList = List() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "///\n"; source = "///\n";
expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT; expectedTokenKindList = List() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "///\n" source = "///\n"
"int i;"; "int i;";
expectedTokenKindList = QList<unsigned>() expectedTokenKindList = List()
<< T_CPP_DOXY_COMMENT << T_CPP_DOXY_COMMENT
<< T_INT << T_IDENTIFIER << T_SEMICOLON; << T_INT << T_IDENTIFIER << T_SEMICOLON;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/* comment */\n"; source = "/* comment */\n";
expectedTokenKindList = QList<unsigned>() << T_COMMENT; expectedTokenKindList = List() << T_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/* comment\n" source = "/* comment\n"
" comment\n" " comment\n"
" */\n"; " */\n";
expectedTokenKindList = QList<unsigned>() << T_COMMENT; expectedTokenKindList = List() << T_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/** comment */"; source = "/** comment */";
expectedTokenKindList = QList<unsigned>() << T_DOXY_COMMENT; expectedTokenKindList = List() << T_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/** comment */\n"; source = "/** comment */\n";
expectedTokenKindList = QList<unsigned>() << T_DOXY_COMMENT; expectedTokenKindList = List() << T_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/** comment */ int i;\n"; source = "/** comment */ int i;\n";
expectedTokenKindList = QList<unsigned>() expectedTokenKindList = List()
<< T_DOXY_COMMENT << T_INT << T_IDENTIFIER << T_SEMICOLON; << T_DOXY_COMMENT << T_INT << T_IDENTIFIER << T_SEMICOLON;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/**\n" source = "/**\n"
" * comment\n" " * comment\n"
" */\n"; " */\n";
expectedTokenKindList = QList<unsigned>() << T_DOXY_COMMENT; expectedTokenKindList = List() << T_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/*!\n" source = "/*!\n"
" * comment\n" " * comment\n"
" */\n"; " */\n";
expectedTokenKindList = QList<unsigned>() << T_DOXY_COMMENT; expectedTokenKindList = List() << T_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/*!\n" source = "/*!\n"
" comment\n" " comment\n"
"*/\n"; "*/\n";
expectedTokenKindList = QList<unsigned>() << T_DOXY_COMMENT; expectedTokenKindList = List() << T_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "int i; /*!< first counter */\n" source = "int i; /*!< first counter */\n"
@@ -159,7 +161,7 @@ void tst_SimpleLexer::basic_data()
"int k; ///< third counter\n" "int k; ///< third counter\n"
"int l; //!< fourth counter\n" "int l; //!< fourth counter\n"
" //!< more details... "; " //!< more details... ";
expectedTokenKindList = QList<unsigned>() expectedTokenKindList = List()
<< T_INT << T_IDENTIFIER << T_SEMICOLON << T_DOXY_COMMENT << T_INT << T_IDENTIFIER << T_SEMICOLON << T_DOXY_COMMENT
<< T_INT << T_IDENTIFIER << T_SEMICOLON << T_DOXY_COMMENT << T_INT << T_IDENTIFIER << T_SEMICOLON << T_DOXY_COMMENT
<< T_INT << T_IDENTIFIER << T_SEMICOLON << T_CPP_DOXY_COMMENT << T_INT << T_IDENTIFIER << T_SEMICOLON << T_CPP_DOXY_COMMENT
@@ -167,7 +169,7 @@ void tst_SimpleLexer::basic_data()
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "?" "?(?" "?)?" "?<?" "?>a?b:c"; source = "?" "?(?" "?)?" "?<?" "?>a?b:c";
expectedTokenKindList = QList<unsigned>() expectedTokenKindList = List()
<< T_LBRACKET << T_RBRACKET << T_LBRACE << T_RBRACE << T_LBRACKET << T_RBRACKET << T_LBRACE << T_RBRACE
<< T_IDENTIFIER << T_QUESTION << T_IDENTIFIER << T_COLON << T_IDENTIFIER; << T_IDENTIFIER << T_QUESTION << T_IDENTIFIER << T_COLON << T_IDENTIFIER;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;