From 260a2e52b2ab58bb6e27bb4915ebc2196fd1f2d4 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 5 Dec 2011 15:00:51 +1000 Subject: Fixing naming of selftests. 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 --- .../testlib/selftests/expected_printdatatags.txt | 12 +++++------ .../expected_printdatatagswithglobaltags.txt | 24 +++++++++++----------- .../selftests/printdatatags/tst_printdatatags.cpp | 14 ++++++------- .../tst_printdatatagswithglobaltags.cpp | 18 ++++++++-------- 4 files changed, 34 insertions(+), 34 deletions(-) (limited to 'tests') diff --git a/tests/auto/testlib/selftests/expected_printdatatags.txt b/tests/auto/testlib/selftests/expected_printdatatags.txt index ac22f231a4..88495a7335 100644 --- a/tests/auto/testlib/selftests/expected_printdatatags.txt +++ b/tests/auto/testlib/selftests/expected_printdatatags.txt @@ -1,6 +1,6 @@ -tst_MyTestCase a data tag a1 -tst_MyTestCase a data tag a2 -tst_MyTestCase b -tst_MyTestCase c data tag c1 -tst_MyTestCase c data tag c2 -tst_MyTestCase c data tag c3 +tst_PrintDataTags a data tag a1 +tst_PrintDataTags a data tag a2 +tst_PrintDataTags b +tst_PrintDataTags c data tag c1 +tst_PrintDataTags c data tag c2 +tst_PrintDataTags c data tag c3 diff --git a/tests/auto/testlib/selftests/expected_printdatatagswithglobaltags.txt b/tests/auto/testlib/selftests/expected_printdatatagswithglobaltags.txt index 32feba4afb..a70e33cb39 100644 --- a/tests/auto/testlib/selftests/expected_printdatatagswithglobaltags.txt +++ b/tests/auto/testlib/selftests/expected_printdatatagswithglobaltags.txt @@ -1,12 +1,12 @@ -tst_MyTestCase a data tag a1 __global__ global data tag 1 -tst_MyTestCase a data tag a2 __global__ global data tag 1 -tst_MyTestCase a data tag a1 __global__ global data tag 2 -tst_MyTestCase a data tag a2 __global__ global data tag 2 -tst_MyTestCase b __global__ global data tag 1 -tst_MyTestCase b __global__ global data tag 2 -tst_MyTestCase c data tag c1 __global__ global data tag 1 -tst_MyTestCase c data tag c2 __global__ global data tag 1 -tst_MyTestCase c data tag c3 __global__ global data tag 1 -tst_MyTestCase c data tag c1 __global__ global data tag 2 -tst_MyTestCase c data tag c2 __global__ global data tag 2 -tst_MyTestCase c data tag c3 __global__ global data tag 2 +tst_PrintDataTagsWithGlobalTags a data tag a1 __global__ global data tag 1 +tst_PrintDataTagsWithGlobalTags a data tag a2 __global__ global data tag 1 +tst_PrintDataTagsWithGlobalTags a data tag a1 __global__ global data tag 2 +tst_PrintDataTagsWithGlobalTags a data tag a2 __global__ global data tag 2 +tst_PrintDataTagsWithGlobalTags b __global__ global data tag 1 +tst_PrintDataTagsWithGlobalTags b __global__ global data tag 2 +tst_PrintDataTagsWithGlobalTags c data tag c1 __global__ global data tag 1 +tst_PrintDataTagsWithGlobalTags c data tag c2 __global__ global data tag 1 +tst_PrintDataTagsWithGlobalTags c data tag c3 __global__ global data tag 1 +tst_PrintDataTagsWithGlobalTags c data tag c1 __global__ global data tag 2 +tst_PrintDataTagsWithGlobalTags c data tag c2 __global__ global data tag 2 +tst_PrintDataTagsWithGlobalTags c data tag c3 __global__ global data tag 2 diff --git a/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp b/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp index 79f889072f..f0882316b8 100644 --- a/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp +++ b/tests/auto/testlib/selftests/printdatatags/tst_printdatatags.cpp @@ -42,7 +42,7 @@ #include -class tst_MyTestCase: public QObject +class tst_PrintDataTags: public QObject { Q_OBJECT private slots: @@ -55,7 +55,7 @@ private slots: void c() const; }; -void tst_MyTestCase::a_data() const +void tst_PrintDataTags::a_data() const { QTest::addColumn("x"); QTest::addColumn("y"); @@ -64,15 +64,15 @@ void tst_MyTestCase::a_data() const 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("x"); @@ -81,10 +81,10 @@ void tst_MyTestCase::c_data() const 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" diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp b/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp index 6b0e61b7cd..53454fc1ac 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/tst_printdatatagswithglobaltags.cpp @@ -42,7 +42,7 @@ #include -class tst_MyTestCase: public QObject +class tst_PrintDataTagsWithGlobalTags: public QObject { Q_OBJECT private slots: @@ -58,7 +58,7 @@ private slots: void c() const; }; -void tst_MyTestCase::initTestCase_data() const +void tst_PrintDataTagsWithGlobalTags::initTestCase_data() const { QTest::addColumn("f"); QTest::addColumn("g"); @@ -67,11 +67,11 @@ void tst_MyTestCase::initTestCase_data() const 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("x"); QTest::addColumn("y"); @@ -80,15 +80,15 @@ void tst_MyTestCase::a_data() const 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("x"); @@ -97,10 +97,10 @@ void tst_MyTestCase::c_data() const 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" -- cgit v1.2.3