QStringBuilder: code tidies in the tests

Including other headers, while defining very questionable macro
names, can and will result in trouble. Stop doing that.

While at it, move from including <QtTest> to include-what-you-use,
and clean up the code a bit.

Change-Id: Idb02ef2b612c0805baecac3ce6edd435609aca4c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 30 insertions, 14 deletions

diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp
index ac7f439248..e31708ad72 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/stringbuilder.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+// Do not include anything in this file. We are being #included with
+// a bunch of defines that may break other legitimate code.
 
 #define LITERAL "some literal"
 #define LITERAL_LEN (sizeof(LITERAL)-1)
@@ -46,7 +47,6 @@
 
 #ifndef P
 # error You need to define P
-# define P +
 #endif
 
 //fix for gcc4.0: if the operator+ does not exist without QT_USE_FAST_OPERATOR_PLUS
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
index 2d320748f2..fcf004b4fc 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
@@ -30,13 +30,14 @@
 // SCENARIO 1
 // this is the "no harm done" version. Only operator% is active,
 // with NO_CAST * defined
-#define P %
 #undef QT_USE_QSTRINGBUILDER
 #define QT_NO_CAST_FROM_ASCII
 #define QT_NO_CAST_TO_ASCII
 
-
-#include <QtTest/QtTest>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringBuilder>
+#include <QtTest/QTest>
 
 #define LITERAL "some literal"
 
@@ -50,7 +51,10 @@ private slots:
     void scenario() { runScenario(); }
 };
 
+#define P %
 #include "stringbuilder.cpp"
+#undef P
+
 #include "tst_qstringbuilder1.moc"
 
 QTEST_APPLESS_MAIN(tst_QStringBuilder1)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
index 669990c9bc..ac4e383649 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
@@ -31,13 +31,14 @@
 // this is the "full" version. Operator+ is replaced by a QStringBuilder
 // based version
 // with NO_CAST * defined
-#define P +
 #define QT_USE_QSTRINGBUILDER
 #define QT_NO_CAST_FROM_ASCII
 #define QT_NO_CAST_TO_ASCII
 
-
-#include <QtTest/QtTest>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringBuilder>
+#include <QtTest/QTest>
 
 #define LITERAL "some literal"
 
@@ -51,7 +52,10 @@ private slots:
     void scenario() { runScenario(); }
 };
 
+#define P +
 #include "../qstringbuilder1/stringbuilder.cpp"
+#undef P
+
 #include "tst_qstringbuilder2.moc"
 
 QTEST_APPLESS_MAIN(tst_QStringBuilder2)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
index 397e3326bf..6559168cbd 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
@@ -30,13 +30,14 @@
 // SCENARIO 3
 // this is the "no harm done" version. Only operator% is active,
 // with NO_CAST * _not_ defined
-#define P %
 #undef QT_USE_QSTRINGBUILDER
 #undef QT_NO_CAST_FROM_ASCII
 #undef QT_NO_CAST_TO_ASCII
 
-
-#include <QtTest/QtTest>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringBuilder>
+#include <QtTest/QTest>
 
 #define LITERAL "some literal"
 
@@ -50,7 +51,10 @@ private slots:
     void scenario() { runScenario(); }
 };
 
+#define P %
 #include "../qstringbuilder1/stringbuilder.cpp"
+#undef P
+
 #include "tst_qstringbuilder3.moc"
 
 QTEST_APPLESS_MAIN(tst_QStringBuilder3)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
index 05ce334c82..4efc69908e 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
@@ -31,13 +31,14 @@
 // this is the "full" version. Operator+ is replaced by a QStringBuilder
 // based version
 // with NO_CAST * _not_ defined
-#define P +
 #define QT_USE_QSTRINGBUILDER
 #undef QT_NO_CAST_FROM_ASCII
 #undef QT_NO_CAST_TO_ASCII
 
-
-#include <QtTest/QtTest>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringBuilder>
+#include <QtTest/QTest>
 
 #define LITERAL "some literal"
 
@@ -51,7 +52,10 @@ private slots:
     void scenario() { runScenario(); }
 };
 
+#define P +
 #include "../qstringbuilder1/stringbuilder.cpp"
+#undef P
+
 #include "tst_qstringbuilder4.moc"
 
 QTEST_APPLESS_MAIN(tst_QStringBuilder4)