diff options
Diffstat (limited to 'tests/auto/cplusplus')
21 files changed, 82 insertions, 9 deletions
diff --git a/tests/auto/cplusplus/CMakeLists.txt b/tests/auto/cplusplus/CMakeLists.txt new file mode 100644 index 0000000000..1c85a988cc --- /dev/null +++ b/tests/auto/cplusplus/CMakeLists.txt @@ -0,0 +1,15 @@ +add_subdirectory(ast) +add_subdirectory(c99) +add_subdirectory(checksymbols) +add_subdirectory(codeformatter) +add_subdirectory(cppselectionchanger) +add_subdirectory(cxx11) +add_subdirectory(fileiterationorder) +add_subdirectory(findusages) +add_subdirectory(lexer) +add_subdirectory(lookup) +add_subdirectory(misc) +add_subdirectory(preprocessor) +add_subdirectory(semantic) +add_subdirectory(translationunit) +add_subdirectory(typeprettyprinter) diff --git a/tests/auto/cplusplus/ast/CMakeLists.txt b/tests/auto/cplusplus/ast/CMakeLists.txt new file mode 100644 index 0000000000..5bfef72674 --- /dev/null +++ b/tests/auto/cplusplus/ast/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_ast + DEPENDS CppTools + SOURCES tst_ast.cpp +) diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp index 0cf9c7a560..e444a4b8e5 100644 --- a/tests/auto/cplusplus/ast/tst_ast.cpp +++ b/tests/auto/cplusplus/ast/tst_ast.cpp @@ -97,7 +97,7 @@ public: { ++errorCount; - qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap); + qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap); } }; diff --git a/tests/auto/cplusplus/c99/CMakeLists.txt b/tests/auto/cplusplus/c99/CMakeLists.txt new file mode 100644 index 0000000000..836f4b5c55 --- /dev/null +++ b/tests/auto/cplusplus/c99/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_c99 + DEPENDS CppTools + SOURCES tst_c99.cpp +) diff --git a/tests/auto/cplusplus/c99/tst_c99.cpp b/tests/auto/cplusplus/c99/tst_c99.cpp index df33671907..edcb5f955f 100644 --- a/tests/auto/cplusplus/c99/tst_c99.cpp +++ b/tests/auto/cplusplus/c99/tst_c99.cpp @@ -83,11 +83,10 @@ class tst_c99: public QObject static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); + QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); errors->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); errors->append(str.toUtf8()); errors->append('\n'); diff --git a/tests/auto/cplusplus/checksymbols/CMakeLists.txt b/tests/auto/cplusplus/checksymbols/CMakeLists.txt new file mode 100644 index 0000000000..f889839ed2 --- /dev/null +++ b/tests/auto/cplusplus/checksymbols/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_checksymbols + DEPENDS CppTools TextEditor + SOURCES tst_checksymbols.cpp +) diff --git a/tests/auto/cplusplus/codeformatter/CMakeLists.txt b/tests/auto/cplusplus/codeformatter/CMakeLists.txt new file mode 100644 index 0000000000..9dfcc9346e --- /dev/null +++ b/tests/auto/cplusplus/codeformatter/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_codeformatter + DEPENDS CppTools + SOURCES tst_codeformatter.cpp +) diff --git a/tests/auto/cplusplus/cppselectionchanger/CMakeLists.txt b/tests/auto/cplusplus/cppselectionchanger/CMakeLists.txt new file mode 100644 index 0000000000..6df9d4c2ba --- /dev/null +++ b/tests/auto/cplusplus/cppselectionchanger/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_cppselectionchangertest + DEPENDS CppTools + SOURCES tst_cppselectionchangertest.cpp +) diff --git a/tests/auto/cplusplus/cxx11/CMakeLists.txt b/tests/auto/cplusplus/cxx11/CMakeLists.txt new file mode 100644 index 0000000000..b21ee16194 --- /dev/null +++ b/tests/auto/cplusplus/cxx11/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_cxx11 + DEPENDS CppTools + SOURCES tst_cxx11.cpp +) diff --git a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp index 108d93f18f..abef7cc1e1 100644 --- a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp +++ b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp @@ -85,11 +85,10 @@ class tst_cxx11: public QObject static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); + QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); errors->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); errors->append(str.toUtf8()); errors->append('\n'); diff --git a/tests/auto/cplusplus/fileiterationorder/CMakeLists.txt b/tests/auto/cplusplus/fileiterationorder/CMakeLists.txt new file mode 100644 index 0000000000..3f3d99d0e7 --- /dev/null +++ b/tests/auto/cplusplus/fileiterationorder/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_fileiterationorder + DEPENDS CppTools + SOURCES tst_fileiterationorder.cpp +) diff --git a/tests/auto/cplusplus/findusages/CMakeLists.txt b/tests/auto/cplusplus/findusages/CMakeLists.txt new file mode 100644 index 0000000000..5155c324e5 --- /dev/null +++ b/tests/auto/cplusplus/findusages/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_findusages + DEPENDS CppTools Utils + SOURCES tst_findusages.cpp +) diff --git a/tests/auto/cplusplus/lexer/CMakeLists.txt b/tests/auto/cplusplus/lexer/CMakeLists.txt new file mode 100644 index 0000000000..8cc0c55062 --- /dev/null +++ b/tests/auto/cplusplus/lexer/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_lexer + DEPENDS CppTools + SOURCES tst_lexer.cpp +) diff --git a/tests/auto/cplusplus/lookup/CMakeLists.txt b/tests/auto/cplusplus/lookup/CMakeLists.txt new file mode 100644 index 0000000000..4ca7f97e21 --- /dev/null +++ b/tests/auto/cplusplus/lookup/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_lookup + DEPENDS CppTools + SOURCES tst_lookup.cpp +) diff --git a/tests/auto/cplusplus/misc/CMakeLists.txt b/tests/auto/cplusplus/misc/CMakeLists.txt new file mode 100644 index 0000000000..260ec2ae12 --- /dev/null +++ b/tests/auto/cplusplus/misc/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_misc + DEPENDS CppTools Utils + SOURCES tst_misc.cpp +) diff --git a/tests/auto/cplusplus/preprocessor/CMakeLists.txt b/tests/auto/cplusplus/preprocessor/CMakeLists.txt new file mode 100644 index 0000000000..c473084bad --- /dev/null +++ b/tests/auto/cplusplus/preprocessor/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_preprocessor + DEPENDS CppTools + SOURCES tst_preprocessor.cpp +) diff --git a/tests/auto/cplusplus/semantic/CMakeLists.txt b/tests/auto/cplusplus/semantic/CMakeLists.txt new file mode 100644 index 0000000000..6a358e9fff --- /dev/null +++ b/tests/auto/cplusplus/semantic/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_semantic + DEPENDS CppTools + SOURCES tst_semantic.cpp +) diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp index 3904558efc..e13795154b 100644 --- a/tests/auto/cplusplus/semantic/tst_semantic.cpp +++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp @@ -120,7 +120,7 @@ public: ++errorCount; #ifndef NO_PARSER_OR_SEMANTIC_ERROR_MESSAGES - qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap); + qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap); #else Q_UNUSED(fileName); Q_UNUSED(line); diff --git a/tests/auto/cplusplus/translationunit/CMakeLists.txt b/tests/auto/cplusplus/translationunit/CMakeLists.txt new file mode 100644 index 0000000000..5633d0f36b --- /dev/null +++ b/tests/auto/cplusplus/translationunit/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_translationunit + DEPENDS CppTools + SOURCES tst_translationunit.cpp +) diff --git a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp index 4a2159bf04..2c651676bc 100644 --- a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp +++ b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp @@ -133,7 +133,7 @@ private: { ++errorCount; qDebug() << fileName->chars() << ':' << line << ':' << column - << ' ' << QString().vsprintf(format, ap); + << ' ' << QString::vasprintf(format, ap); } } m_diagnosticClient; }; diff --git a/tests/auto/cplusplus/typeprettyprinter/CMakeLists.txt b/tests/auto/cplusplus/typeprettyprinter/CMakeLists.txt new file mode 100644 index 0000000000..a6c0718114 --- /dev/null +++ b/tests/auto/cplusplus/typeprettyprinter/CMakeLists.txt @@ -0,0 +1,4 @@ +add_qtc_test(tst_cplusplus_typeprettyprinter + DEPENDS CppTools + SOURCES tst_typeprettyprinter.cpp +) |