AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing naming of selftests.

Browse Source 
Make the test object names correspond to the test program names, so that
it is easier to see which test produced each block of test output.

Change-Id: Ib19a955938b549f27cdcaac83bfa9150285b396d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-12-05 15:00:51 +10:00 committed by Qt by Nokia
parent 4bca278d63
commit 260a2e52b2
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/testlib/selftests/expected_printdatatags.txt
View File

@ -1,6 +1,6 @@
tst_MyTestCase a data tag a1 tst_PrintDataTags a data tag a1
tst_MyTestCase a data tag a2 tst_PrintDataTags a data tag a2
tst_MyTestCase b tst_PrintDataTags b
tst_MyTestCase c data tag c1 tst_PrintDataTags c data tag c1
tst_MyTestCase c data tag c2 tst_PrintDataTags c data tag c2
tst_MyTestCase c data tag c3 tst_PrintDataTags c data tag c3

24
tests/auto/testlib/selftests/expected_printdatatagswithglobaltags.txt
View File

@ -1,12 +1,12 @@
tst_MyTestCase a data tag a1 __global__ global data tag 1 tst_PrintDataTagsWithGlobalTags a data tag a1 __global__ global data tag 1
tst_MyTestCase a data tag a2 __global__ global data tag 1 tst_PrintDataTagsWithGlobalTags a data tag a2 __global__ global data tag 1
tst_MyTestCase a data tag a1 __global__ global data tag 2 tst_PrintDataTagsWithGlobalTags a data tag a1 __global__ global data tag 2
tst_MyTestCase a data tag a2 __global__ global data tag 2 tst_PrintDataTagsWithGlobalTags a data tag a2 __global__ global data tag 2
tst_MyTestCase b __global__ global data tag 1 tst_PrintDataTagsWithGlobalTags b __global__ global data tag 1
tst_MyTestCase b __global__ global data tag 2 tst_PrintDataTagsWithGlobalTags b __global__ global data tag 2
tst_MyTestCase c data tag c1 __global__ global data tag 1 tst_PrintDataTagsWithGlobalTags c data tag c1 __global__ global data tag 1
tst_MyTestCase c data tag c2 __global__ global data tag 1 tst_PrintDataTagsWithGlobalTags c data tag c2 __global__ global data tag 1
tst_MyTestCase c data tag c3 __global__ global data tag 1 tst_PrintDataTagsWithGlobalTags c data tag c3 __global__ global data tag 1
tst_MyTestCase c data tag c1 __global__ global data tag 2 tst_PrintDataTagsWithGlobalTags c data tag c1 __global__ global data tag 2
tst_MyTestCase c data tag c2 __global__ global data tag 2 tst_PrintDataTagsWithGlobalTags c data tag c2 __global__ global data tag 2
tst_MyTestCase c data tag c3 __global__ global data tag 2 tst_PrintDataTagsWithGlobalTags c data tag c3 __global__ global data tag 2

14
tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp
View File

@ -42,7 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
class tst_MyTestCase: public QObject class tst_PrintDataTags: public QObject
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
@ -55,7 +55,7 @@ private slots:
void c() const; void c() const;
}; };
void tst_MyTestCase::a_data() const void tst_PrintDataTags::a_data() const
{ {
QTest::addColumn<int>("x"); QTest::addColumn<int>("x");
QTest::addColumn<int>("y"); QTest::addColumn<int>("y");
@ -64,15 +64,15 @@ void tst_MyTestCase::a_data() const
QTest::newRow("data tag a2") << 1 << 2; QTest::newRow("data tag a2") << 1 << 2;
} }
void tst_MyTestCase::a() const void tst_PrintDataTags::a() const
{ {
} }
void tst_MyTestCase::b() const void tst_PrintDataTags::b() const
{ {
} }
void tst_MyTestCase::c_data() const void tst_PrintDataTags::c_data() const
{ {
QTest::addColumn<int>("x"); QTest::addColumn<int>("x");
@ -81,10 +81,10 @@ void tst_MyTestCase::c_data() const
QTest::newRow("data tag c3") << 1; QTest::newRow("data tag c3") << 1;
} }
void tst_MyTestCase::c() const void tst_PrintDataTags::c() const
{ {
} }
QTEST_MAIN(tst_MyTestCase) QTEST_MAIN(tst_PrintDataTags)
#include "tst_printdatatags.moc" #include "tst_printdatatags.moc"

18
tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp
View File

@ -42,7 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
class tst_MyTestCase: public QObject class tst_PrintDataTagsWithGlobalTags: public QObject
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
@ -58,7 +58,7 @@ private slots:
void c() const; void c() const;
}; };
void tst_MyTestCase::initTestCase_data() const void tst_PrintDataTagsWithGlobalTags::initTestCase_data() const
{ {
QTest::addColumn<int>("f"); QTest::addColumn<int>("f");
QTest::addColumn<int>("g"); QTest::addColumn<int>("g");
@ -67,11 +67,11 @@ void tst_MyTestCase::initTestCase_data() const
QTest::newRow("global data tag 2") << 1 << 2; QTest::newRow("global data tag 2") << 1 << 2;
} }
void tst_MyTestCase::initTestCase() const void tst_PrintDataTagsWithGlobalTags::initTestCase() const
{ {
} }
void tst_MyTestCase::a_data() const void tst_PrintDataTagsWithGlobalTags::a_data() const
{ {
QTest::addColumn<int>("x"); QTest::addColumn<int>("x");
QTest::addColumn<int>("y"); QTest::addColumn<int>("y");
@ -80,15 +80,15 @@ void tst_MyTestCase::a_data() const
QTest::newRow("data tag a2") << 1 << 2; QTest::newRow("data tag a2") << 1 << 2;
} }
void tst_MyTestCase::a() const void tst_PrintDataTagsWithGlobalTags::a() const
{ {
} }
void tst_MyTestCase::b() const void tst_PrintDataTagsWithGlobalTags::b() const
{ {
} }
void tst_MyTestCase::c_data() const void tst_PrintDataTagsWithGlobalTags::c_data() const
{ {
QTest::addColumn<int>("x"); QTest::addColumn<int>("x");
@ -97,10 +97,10 @@ void tst_MyTestCase::c_data() const
QTest::newRow("data tag c3") << 1; QTest::newRow("data tag c3") << 1;
} }
void tst_MyTestCase::c() const void tst_PrintDataTagsWithGlobalTags::c() const
{ {
} }
QTEST_MAIN(tst_MyTestCase) QTEST_MAIN(tst_PrintDataTagsWithGlobalTags)
#include "tst_printdatatagswithglobaltags.moc" #include "tst_printdatatagswithglobaltags.moc"