diff options
author | David Schulz <david.schulz@nokia.com> | 2012-02-03 11:46:13 +0100 |
---|---|---|
committer | Leandro Melo <leandro.melo@nokia.com> | 2012-02-03 11:52:01 +0100 |
commit | 6d85b53f9c8364bb034bcdcfd5d017b0b6ca99c3 (patch) | |
tree | b225d9794809ef8dbb951f63f0ac1e70227f6f3b /tests/auto/cplusplus/misc/tst_misc.cpp | |
parent | b4eec17317768588196fb715c38356b7811e52d4 (diff) | |
download | qt-creator-6d85b53f9c8364bb034bcdcfd5d017b0b6ca99c3.tar.gz |
Revert "Editor: Highlight background for whitespaces in strings and comments"
The change brokes the Lexer.
This reverts commit e46a5579d368162034813cc4b27d8d5c9f0716d9.
Change-Id: I3363c6eff74b53a7f2d9f417941cde07aaa92619
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Diffstat (limited to 'tests/auto/cplusplus/misc/tst_misc.cpp')
-rw-r--r-- | tests/auto/cplusplus/misc/tst_misc.cpp | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/tests/auto/cplusplus/misc/tst_misc.cpp b/tests/auto/cplusplus/misc/tst_misc.cpp index 514a333a0a..68d3a4d7b6 100644 --- a/tests/auto/cplusplus/misc/tst_misc.cpp +++ b/tests/auto/cplusplus/misc/tst_misc.cpp @@ -34,8 +34,6 @@ #include <QtTest> #include <QtDebug> -#include <SimpleLexer.h> -#include <Token.h> #include <findcdbbreakpoint.h> @@ -52,14 +50,6 @@ private slots: void findBreakpoints(); void findBreakpoints2(); - - void testLexerComment(); - void testLexerComment2(); - void testLexerComment3(); - void testLexerMultiLineComment(); - void testLexerMultiLineComment2(); - void testLexerMultiLineComment3(); - void testLexerMultiLineComment4(); }; void tst_Misc::diagnosticClient_error() @@ -187,107 +177,5 @@ void tst_Misc::findBreakpoints2() QCOMPARE(findBreakpoint(7), 7U); } -void tst_Misc::testLexerComment() { - const QByteArray src("// int a = 42 "); - - SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(false); - tokenize.setObjCEnabled(false); - tokenize.setCxx0xEnabled(true); - const QList<Token> tokens = tokenize(src); - - QCOMPARE(tokenize.state(), 0); - QCOMPARE(tokens.size(), 1); - QCOMPARE(tokens[0].f.kind, 2U); - QCOMPARE(tokens[0].f.length, 17U); -} - -void tst_Misc::testLexerComment2() { - const QByteArray src(" // int a = 42 "); - - SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(false); - tokenize.setObjCEnabled(false); - tokenize.setCxx0xEnabled(true); - const QList<Token> tokens = tokenize(src); - - QCOMPARE(tokenize.state(), 0); - QCOMPARE(tokens.size(), 1); - QCOMPARE(tokens[0].f.kind, 2U); - QCOMPARE(tokens[0].f.length, 17U); -} - -void tst_Misc::testLexerComment3() { - const QByteArray src(" int main( int argc, char** argv) { // Foo m_foo = 42 /n"); - - SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(false); - tokenize.setObjCEnabled(false); - tokenize.setCxx0xEnabled(true); - const QList<Token> tokens = tokenize(src); - - QCOMPARE(tokenize.state(), 0); - QCOMPARE(tokens.size(), 13); - QCOMPARE(tokens.last().f.kind, 2U); - QCOMPARE(tokens.last().f.length, 21U); -} - -void tst_Misc::testLexerMultiLineComment() { - const QByteArray src("/* multi /n" - " * line /n"); - SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(false); - tokenize.setObjCEnabled(false); - tokenize.setCxx0xEnabled(true); - const QList<Token> tokens = tokenize(src); - - QCOMPARE(tokenize.state(), 1); - QCOMPARE(tokens.size(), 1); - QCOMPARE(tokens[0].f.kind, 4U); - QCOMPARE(tokens.last().f.length, 22U); -} - -void tst_Misc::testLexerMultiLineComment2() { - const QByteArray src(""); - SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(false); - tokenize.setObjCEnabled(false); - tokenize.setCxx0xEnabled(true); - QList<Token> tokens = tokenize(src,1); - - QCOMPARE(tokenize.state(), 1); - QCOMPARE(tokens.size(), 1); - QCOMPARE(tokens[0].f.kind, 4U); - QCOMPARE(tokens[0].f.length, 1U); -} - -void tst_Misc::testLexerMultiLineComment3() { - const QByteArray src(" "); - SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(false); - tokenize.setObjCEnabled(false); - tokenize.setCxx0xEnabled(true); - const QList<Token> tokens = tokenize(src,1); - - QCOMPARE(tokenize.state(), 1); - QCOMPARE(tokens.size(), 1); - QCOMPARE(tokens[0].f.kind, 4U); - QCOMPARE(tokens[0].f.length, 5U); -} - -void tst_Misc::testLexerMultiLineComment4() { - const QByteArray src("int /* integer */ i"); - SimpleLexer tokenize; - tokenize.setQtMocRunEnabled(false); - tokenize.setObjCEnabled(false); - tokenize.setCxx0xEnabled(true); - const QList<Token> tokens = tokenize(src,0); - - QCOMPARE(tokenize.state(), 0); - QCOMPARE(tokens.size(), 3); - QCOMPARE(tokens[1].f.kind, 4U); - QCOMPARE(tokens[1].f.length, 13U); -} - QTEST_MAIN(tst_Misc) #include "tst_misc.moc" |