diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-03-01 17:06:23 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-03-14 14:28:36 +0000 |
| commit | 3b42e098ef711e5c60dd18744f6ff9fa07877424 (patch) | |
| tree | 543904e3063adda8054bc92be45c25e74043e96f /tests/auto/testlib | |
| parent | 8864aca9e5a0b2fd727ffc010bc0e9a538f1546b (diff) | |
testlib: Add Test Anything Protocol (TAP) reporter
The Test Anything Protocol (TAP), was originally Perl's simple text-based
interface between testing modules and test harnesses, but has since been
adopted by a large number of producers and consumers in many different
languages, which allows colorizing and summarizing test results.
The format is very simple:
TAP version 13
ok 1 - test description
not ok 2 - test description
---
message: 'Failure message'
severity: fail
expected: 123
actual: 456
...
ok 3 - test description # SKIP
1..3
The specification [1] is very brief, so the implementation has been
based on how typical consumers behave, especially when it comes to
the undefined diagnostics block.
[1] http://testanything.org/tap-version-13-specification.html
Change-Id: I616e802ea380165c678510e940ddc6607d39c92d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/testlib')
38 files changed, 3971 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/expected_assert.tap b/tests/auto/testlib/selftests/expected_assert.tap new file mode 100644 index 0000000000..4cd26848ac --- /dev/null +++ b/tests/auto/testlib/selftests/expected_assert.tap @@ -0,0 +1,16 @@ +TAP version 13 +# tst_Assert +ok 1 - initTestCase() +ok 2 - testNumber1() +# ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0 +not ok 3 - testNumber2() + --- + # Received a fatal error. + at: tst_Assert::testNumber2() (Unknown file:0) + file: Unknown file + line: 0 + ... +1..3 +# tests 3 +# pass 2 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_badxml.tap b/tests/auto/testlib/selftests/expected_badxml.tap new file mode 100644 index 0000000000..7aa4f11829 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_badxml.tap @@ -0,0 +1,61 @@ +TAP version 13 +# tst_BadXml +ok 1 - initTestCase() +# a message +not ok 2 - badDataTag(fail end cdata ]]> text ]]> more text) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 3 - badDataTag(pass end cdata ]]> text ]]> more text) +# a message +not ok 4 - badDataTag(fail quotes " text" more text) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 5 - badDataTag(pass quotes " text" more text) +# a message +not ok 6 - badDataTag(fail xml close > open < tags < text) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 7 - badDataTag(pass xml close > open < tags < text) +# a message +not ok 8 - badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) + --- + # a failure + at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:101) + file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp + line: 101 + ... +# a message +ok 9 - badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) +# end cdata ]]> text ]]> more text +ok 10 - badMessage(string 0) +# quotes " text" more text +ok 11 - badMessage(string 1) +# xml close > open < tags < text +ok 12 - badMessage(string 2) +# all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs +ok 13 - badMessage(string 3) +not ok 14 - failWithNoFile() + --- + # failure message + ... +ok 15 - encoding() # SKIP Skipped for text due to unpredictable console encoding. +ok 16 - cleanupTestCase() +1..16 +# tests 16 +# pass 10 +# fail 5 diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.tap b/tests/auto/testlib/selftests/expected_benchlibcounting.tap new file mode 100644 index 0000000000..e7a4280278 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.tap @@ -0,0 +1,17 @@ +TAP version 13 +# tst_BenchlibCounting +ok 1 - initTestCase() +ok 2 - passingBenchmark() +ok 3 - skippingBenchmark() # SKIP This is a skipping benchmark +not ok 4 - failingBenchmark() + --- + # This is a failing benchmark + at: tst_BenchlibCounting::failingBenchmark() (qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp:58) + file: qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp + line: 58 + ... +ok 5 - cleanupTestCase() +1..5 +# tests 5 +# pass 3 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.tap b/tests/auto/testlib/selftests/expected_benchlibeventcounter.tap new file mode 100644 index 0000000000..02c65e59da --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.tap @@ -0,0 +1,15 @@ +TAP version 13 +# tst_BenchlibEventCounter +ok 1 - initTestCase() +ok 2 - events(0) +ok 3 - events(1) +ok 4 - events(10) +ok 5 - events(100) +ok 6 - events(500) +ok 7 - events(5000) +ok 8 - events(100000) +ok 9 - cleanupTestCase() +1..9 +# tests 9 +# pass 9 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.tap b/tests/auto/testlib/selftests/expected_benchlibtickcounter.tap new file mode 100644 index 0000000000..85d7f10ea0 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_BenchlibTickCounter +ok 1 - initTestCase() +ok 2 - threeBillionTicks() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.tap b/tests/auto/testlib/selftests/expected_benchlibwalltime.tap new file mode 100644 index 0000000000..7653ccbeb3 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.tap @@ -0,0 +1,11 @@ +TAP version 13 +# tst_BenchlibWalltime +ok 1 - initTestCase() +ok 2 - waitForOneThousand() +ok 3 - waitForFourThousand() +ok 4 - qbenchmark_once() +ok 5 - cleanupTestCase() +1..5 +# tests 5 +# pass 5 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_cmptest.tap b/tests/auto/testlib/selftests/expected_cmptest.tap new file mode 100644 index 0000000000..238db2fc2b --- /dev/null +++ b/tests/auto/testlib/selftests/expected_cmptest.tap @@ -0,0 +1,456 @@ +TAP version 13 +# tst_Cmptest +ok 1 - initTestCase() +not ok 2 - compare_unregistered_enums() + --- + # Compared values are not the same + at: tst_Cmptest::compare_unregistered_enums() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:171) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 171 + ... +not ok 3 - compare_registered_enums() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Sunday (Qt::Sunday) + found: Monday (Qt::Monday) + expected: Sunday (Qt::Sunday) + actual: Monday (Qt::Monday) + at: tst_Cmptest::compare_registered_enums() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:178) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 178 + ... +not ok 4 - compare_class_enums() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: MyClassEnumValue2 (MyClassEnum::MyClassEnumValue2) + found: MyClassEnumValue1 (MyClassEnum::MyClassEnumValue1) + expected: MyClassEnumValue2 (MyClassEnum::MyClassEnumValue2) + actual: MyClassEnumValue1 (MyClassEnum::MyClassEnumValue1) + at: tst_Cmptest::compare_class_enums() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:184) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 184 + ... +ok 5 - test_windowflags(pass) +not ok 6 - test_windowflags(fail1) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint (expectedWindowFlags) + found: Window|WindowSystemMenuHint|WindowStaysOnBottomHint (actualWindowFlags) + expected: Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint (expectedWindowFlags) + actual: Window|WindowSystemMenuHint|WindowStaysOnBottomHint (actualWindowFlags) + at: tst_Cmptest::test_windowflags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:209) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 209 + ... +not ok 7 - test_windowflags(fail2) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Window|FramelessWindowHint (expectedWindowFlags) + found: Window (actualWindowFlags) + expected: Window|FramelessWindowHint (expectedWindowFlags) + actual: Window (actualWindowFlags) + at: tst_Cmptest::test_windowflags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:209) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 209 + ... +ok 8 - test_unregistered_flags(pass) +not ok 9 - test_unregistered_flags(fail1) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 0x5 (expectedFlags) + found: 0x3 (actualFlags) + expected: 0x5 (expectedFlags) + actual: 0x3 (actualFlags) + at: tst_Cmptest::test_unregistered_flags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:242) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 242 + ... +not ok 10 - test_unregistered_flags(fail2) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 0x5 (expectedFlags) + found: 0x1 (actualFlags) + expected: 0x5 (expectedFlags) + actual: 0x1 (actualFlags) + at: tst_Cmptest::test_unregistered_flags() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:242) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 242 + ... +ok 11 - compare_boolfuncs() +ok 12 - compare_to_nullptr() +ok 13 - compare_pointerfuncs() +not ok 14 - compare_tostring(int, string) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant(QString,hi) (expected) + found: QVariant(int,123) (actual) + expected: QVariant(QString,hi) (expected) + actual: QVariant(int,123) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +ok 15 - compare_tostring(both invalid) +not ok 16 - compare_tostring(null hash, invalid) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant() (expected) + found: QVariant(QVariantHash) (actual) + expected: QVariant() (expected) + actual: QVariant(QVariantHash) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +not ok 17 - compare_tostring(string, null user type) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant(PhonyClass) (expected) + found: QVariant(QString,A simple string) (actual) + expected: QVariant(PhonyClass) (expected) + actual: QVariant(QString,A simple string) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +not ok 18 - compare_tostring(both non-null user type) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVariant(PhonyClass,<value not representable as string>) (expected) + found: QVariant(PhonyClass,<value not representable as string>) (actual) + expected: QVariant(PhonyClass,<value not representable as string>) (expected) + actual: QVariant(PhonyClass,<value not representable as string>) (actual) + at: tst_Cmptest::compare_tostring() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:331) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 331 + ... +ok 19 - compareQStringLists(empty lists) +ok 20 - compareQStringLists(equal lists) +not ok 21 - compareQStringLists(last item different) + --- + type: QCOMPARE + message: Compared lists differ at index 2. + wanted: "DIFFERS" (opB) + found: "string3" (opA) + expected: "DIFFERS" (opB) + actual: "string3" (opA) + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 22 - compareQStringLists(second-last item different) + --- + type: QCOMPARE + message: Compared lists differ at index 2. + wanted: "DIFFERS" (opB) + found: "string3" (opA) + expected: "DIFFERS" (opB) + actual: "string3" (opA) + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 23 - compareQStringLists(prefix) + --- + # Compared lists have different sizes. + Actual (opA) size: 2 + Expected (opB) size: 1 + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 24 - compareQStringLists(short list second) + --- + # Compared lists have different sizes. + Actual (opA) size: 12 + Expected (opB) size: 1 + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 25 - compareQStringLists(short list first) + --- + # Compared lists have different sizes. + Actual (opA) size: 1 + Expected (opB) size: 12 + at: tst_Cmptest::compareQStringLists() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:425) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 425 + ... +not ok 26 - compareQListInt() + --- + type: QCOMPARE + message: Compared lists differ at index 2. + wanted: 4 (int2) + found: 3 (int1) + expected: 4 (int2) + actual: 3 (int1) + at: tst_Cmptest::compareQListInt() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:432) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 432 + ... +not ok 27 - compareQListDouble() + --- + type: QCOMPARE + message: Compared lists differ at index 0. + wanted: 1 (double2) + found: 1.5 (double1) + expected: 1 (double2) + actual: 1.5 (double1) + at: tst_Cmptest::compareQListDouble() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:439) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 439 + ... +ok 28 - compareQColor(Qt::yellow vs "yellow") +not ok 29 - compareQColor(Qt::yellow vs Qt::green) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: #ff00ff00 (colorB) + found: #ffffff00 (colorA) + expected: #ff00ff00 (colorB) + actual: #ffffff00 (colorA) + at: tst_Cmptest::compareQColor() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:458) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 458 + ... +not ok 30 - compareQColor(0x88ff0000 vs 0xffff0000) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: #ffff0000 (colorB) + found: #88ff0000 (colorA) + expected: #ffff0000 (colorB) + actual: #88ff0000 (colorA) + at: tst_Cmptest::compareQColor() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:458) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 458 + ... +ok 31 - compareQPixmaps(both null) +not ok 32 - compareQPixmaps(one null) + --- + type: QCOMPARE + message: Compared QPixmaps differ. + wanted: 0 (opB).isNull() + found: 1 (opA).isNull() + expected: 0 (opB).isNull() + actual: 1 (opA).isNull() + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +not ok 33 - compareQPixmaps(other null) + --- + type: QCOMPARE + message: Compared QPixmaps differ. + wanted: 1 (opB).isNull() + found: 0 (opA).isNull() + expected: 1 (opB).isNull() + actual: 0 (opA).isNull() + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +ok 34 - compareQPixmaps(equal) +not ok 35 - compareQPixmaps(different size) + --- + type: QCOMPARE + message: Compared QPixmaps differ in size. + wanted: 20x20 (opB) + found: 11x20 (opA) + expected: 20x20 (opB) + actual: 11x20 (opA) + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +not ok 36 - compareQPixmaps(different pixels) + --- + # Compared values are not the same + at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:483) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 483 + ... +ok 37 - compareQImages(both null) +not ok 38 - compareQImages(one null) + --- + type: QCOMPARE + message: Compared QImages differ. + wanted: 0 (opB).isNull() + found: 1 (opA).isNull() + expected: 0 (opB).isNull() + actual: 1 (opA).isNull() + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +not ok 39 - compareQImages(other null) + --- + type: QCOMPARE + message: Compared QImages differ. + wanted: 1 (opB).isNull() + found: 0 (opA).isNull() + expected: 1 (opB).isNull() + actual: 0 (opA).isNull() + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +ok 40 - compareQImages(equal) +not ok 41 - compareQImages(different size) + --- + type: QCOMPARE + message: Compared QImages differ in size. + wanted: 20x20 (opB) + found: 11x20 (opA) + expected: 20x20 (opB) + actual: 11x20 (opA) + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +not ok 42 - compareQImages(different format) + --- + type: QCOMPARE + message: Compared QImages differ in format. + wanted: 3 (opB) + found: 6 (opA) + expected: 3 (opB) + actual: 6 (opA) + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +not ok 43 - compareQImages(different pixels) + --- + # Compared values are not the same + at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:510) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 510 + ... +ok 44 - compareQRegion(equal-empty) +not ok 45 - compareQRegion(1-empty) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QRegion(null) (rB) + found: QRegion(200x50+10+10) (rA) + expected: QRegion(null) (rB) + actual: QRegion(200x50+10+10) (rA) + at: tst_Cmptest::compareQRegion() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:533) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 533 + ... +ok 46 - compareQRegion(equal) +not ok 47 - compareQRegion(different lists) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QRegion(2 rectangles, 50x200+100+200, 200x50+10+10) (rB) + found: QRegion(200x50+10+10) (rA) + expected: QRegion(2 rectangles, 50x200+100+200, 200x50+10+10) (rB) + actual: QRegion(200x50+10+10) (rA) + at: tst_Cmptest::compareQRegion() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:533) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 533 + ... +not ok 48 - compareQVector2D() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVector2D(1, 3) (v2b) + found: QVector2D(1, 2) (v2a) + expected: QVector2D(1, 3) (v2b) + actual: QVector2D(1, 2) (v2a) + at: tst_Cmptest::compareQVector2D() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:542) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 542 + ... +not ok 49 - compareQVector3D() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVector3D(1, 3, 3) (v3b) + found: QVector3D(1, 2, 3) (v3a) + expected: QVector3D(1, 3, 3) (v3b) + actual: QVector3D(1, 2, 3) (v3a) + at: tst_Cmptest::compareQVector3D() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:551) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 551 + ... +not ok 50 - compareQVector4D() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: QVector4D(1, 3, 3, 4) (v4b) + found: QVector4D(1, 2, 3, 4) (v4a) + expected: QVector4D(1, 3, 3, 4) (v4b) + actual: QVector4D(1, 2, 3, 4) (v4a) + at: tst_Cmptest::compareQVector4D() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:560) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 560 + ... +not ok 51 - verify() + --- + type: QVERIFY + message: Verification failed + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::verify() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:572) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 572 + ... +not ok 52 - verify2() + --- + type: QVERIFY + message: 42 + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::verify2() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:578) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 578 + ... +not ok 53 - tryVerify() + --- + type: QVERIFY + message: Verification failed + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::tryVerify() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:584) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 584 + ... +not ok 54 - tryVerify2() + --- + type: QVERIFY + message: 42 + wanted: true (opaqueFunc() < 2) + found: false (opaqueFunc() < 2) + expected: true (opaqueFunc() < 2) + actual: false (opaqueFunc() < 2) + at: tst_Cmptest::tryVerify2() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:590) + file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp + line: 590 + ... +ok 55 - verifyExplicitOperatorBool() +ok 56 - cleanupTestCase() +1..56 +# tests 56 +# pass 18 +# fail 38 diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.tap b/tests/auto/testlib/selftests/expected_commandlinedata.tap new file mode 100644 index 0000000000..1e1abfba50 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_commandlinedata.tap @@ -0,0 +1,20 @@ +TAP version 13 +# tst_DataTable +ok 1 - initTestCase() +# QVERIFY(test) +ok 2 - fiveTablePasses(fiveTablePasses_data1) +# QVERIFY(test) +ok 3 - fiveTablePasses(fiveTablePasses_data2) +# QVERIFY(test) +ok 4 - fiveTablePasses(fiveTablePasses_data3) +# QVERIFY(test) +ok 5 - fiveTablePasses(fiveTablePasses_data4) +# QVERIFY(test) +ok 6 - fiveTablePasses(fiveTablePasses_data5) +# QVERIFY(test) +ok 7 - fiveTablePasses(fiveTablePasses_data1) +ok 8 - cleanupTestCase() +1..8 +# tests 8 +# pass 8 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_counting.tap b/tests/auto/testlib/selftests/expected_counting.tap new file mode 100644 index 0000000000..ad53e8f14e --- /dev/null +++ b/tests/auto/testlib/selftests/expected_counting.tap @@ -0,0 +1,118 @@ +TAP version 13 +# tst_Counting +ok 1 - initTestCase() +ok 2 - testPassPass(row 1) +ok 3 - testPassPass(row 2) +ok 4 - testPassSkip(row 1) +ok 5 - testPassSkip(row 2) # SKIP Skipping +ok 6 - testPassFail(row 1) +not ok 7 - testPassFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testPassFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 8 - testSkipPass(row 1) # SKIP Skipping +ok 9 - testSkipPass(row 2) +ok 10 - testSkipSkip(row 1) # SKIP Skipping +ok 11 - testSkipSkip(row 2) # SKIP Skipping +ok 12 - testSkipFail(row 1) # SKIP Skipping +not ok 13 - testSkipFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testSkipFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 14 - testFailPass(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailPass() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 15 - testFailPass(row 2) +not ok 16 - testFailSkip(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailSkip() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 17 - testFailSkip(row 2) # SKIP Skipping +not ok 18 - testFailFail(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 19 - testFailFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 20 - testFailInInit(before) +not ok 21 - testFailInInit(fail) + --- + # Fail in init() + at: tst_Counting::testFailInInit() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:221) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 221 + ... +ok 22 - testFailInInit(after) +ok 23 - testFailInCleanup(before) +# This test function should execute and then QFAIL in cleanup() +not ok 24 - testFailInCleanup(fail) + --- + # Fail in cleanup() + at: tst_Counting::testFailInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:229) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 229 + ... +ok 25 - testFailInCleanup(after) +ok 26 - testSkipInInit(before) +ok 27 - testSkipInInit(skip) # SKIP Skip in init() +ok 28 - testSkipInInit(after) +ok 29 - testSkipInCleanup(before) +# This test function should execute and then QSKIP in cleanup() +ok 30 - testSkipInCleanup(skip) # SKIP Skip in cleanup() +ok 31 - testSkipInCleanup(after) +ok 32 - cleanupTestCase() +1..32 +# tests 32 +# pass 16 +# fail 8 diff --git a/tests/auto/testlib/selftests/expected_datatable.tap b/tests/auto/testlib/selftests/expected_datatable.tap new file mode 100644 index 0000000000..8a3d473b6c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_datatable.tap @@ -0,0 +1,183 @@ +TAP version 13 +# tst_DataTable +ok 1 - initTestCase() +ok 2 - singleTestFunction1() +ok 3 - singleTestFunction2() +ok 4 - fiveTablePasses(fiveTablePasses_data 1) +ok 5 - fiveTablePasses(fiveTablePasses_data 2) +ok 6 - fiveTablePasses(fiveTablePasses_data 3) +ok 7 - fiveTablePasses(fiveTablePasses_data 4) +ok 8 - fiveTablePasses(fiveTablePasses_data 5) +not ok 9 - fiveTableFailures(fiveTableFailures_data 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 10 - fiveTableFailures(fiveTableFailures_data 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 11 - fiveTableFailures(fiveTableFailures_data 3) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 12 - fiveTableFailures(fiveTableFailures_data 4) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 13 - fiveTableFailures(fiveTableFailures_data 5) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::fiveTableFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +not ok 14 - startsWithFailure(startsWithFailure_data 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::startsWithFailure() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +ok 15 - startsWithFailure(startsWithFailure_data 2) +ok 16 - startsWithFailure(startsWithFailure_data 3) +ok 17 - startsWithFailure(startsWithFailure_data 4) +ok 18 - startsWithFailure(startsWithFailure_data 5) +ok 19 - endsWithFailure(endsWithFailure 1) +ok 20 - endsWithFailure(endsWithFailure 2) +ok 21 - endsWithFailure(endsWithFailure 3) +ok 22 - endsWithFailure(endsWithFailure 4) +not ok 23 - endsWithFailure(endsWithFailure 5) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::endsWithFailure() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +ok 24 - failureInMiddle(failureInMiddle_data 1) +ok 25 - failureInMiddle(failureInMiddle_data 2) +not ok 26 - failureInMiddle(failureInMiddle_data 3) + --- + type: QVERIFY + message: Verification failed + wanted: true (test) + found: false (test) + expected: true (test) + actual: false (test) + at: tst_DataTable::failureInMiddle() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:78) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 78 + ... +ok 27 - failureInMiddle(failureInMiddle_data 4) +ok 28 - failureInMiddle(failureInMiddle_data 5) +not ok 29 - fiveIsolatedFailures(fiveIsolatedFailures_data 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 30 - fiveIsolatedFailures(fiveIsolatedFailures_data 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 31 - fiveIsolatedFailures(fiveIsolatedFailures_data 3) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 32 - fiveIsolatedFailures(fiveIsolatedFailures_data 4) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +not ok 33 - fiveIsolatedFailures(fiveIsolatedFailures_data 5) + --- + type: QVERIFY + message: Verification failed + wanted: true (!test) + found: false (!test) + expected: true (!test) + actual: false (!test) + at: tst_DataTable::fiveIsolatedFailures() (qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp:160) + file: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp + line: 160 + ... +ok 34 - cleanupTestCase() +1..34 +# tests 34 +# pass 21 +# fail 13 diff --git a/tests/auto/testlib/selftests/expected_datetime.tap b/tests/auto/testlib/selftests/expected_datetime.tap new file mode 100644 index 0000000000..896aeafa37 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_datetime.tap @@ -0,0 +1,46 @@ +TAP version 13 +# tst_DateTime +ok 1 - initTestCase() +not ok 2 - dateTime() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 2000/05/03 04:03:04.000[UTC] (utc) + found: 2000/05/03 04:03:04.000[UTC+00:02] (local) + expected: 2000/05/03 04:03:04.000[UTC] (utc) + actual: 2000/05/03 04:03:04.000[UTC+00:02] (local) + at: tst_DateTime::dateTime() (qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp:52) + file: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp + line: 52 + ... +ok 3 - qurl(empty urls) +not ok 4 - qurl(empty rhs) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: Invalid URL: (operandB) + found: http://example.com (operandA) + expected: Invalid URL: (operandB) + actual: http://example.com (operandA) + at: tst_DateTime::qurl() (qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp:60) + file: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp + line: 60 + ... +not ok 5 - qurl(empty lhs) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: http://example.com (operandB) + found: Invalid URL: (operandA) + expected: http://example.com (operandB) + actual: Invalid URL: (operandA) + at: tst_DateTime::qurl() (qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp:60) + file: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp + line: 60 + ... +ok 6 - qurl(same urls) +ok 7 - cleanupTestCase() +1..7 +# tests 7 +# pass 4 +# fail 3 diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.tap b/tests/auto/testlib/selftests/expected_exceptionthrow.tap new file mode 100644 index 0000000000..d8dbf173d6 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.tap @@ -0,0 +1,14 @@ +TAP version 13 +# tst_Exception +ok 1 - initTestCase() +not ok 2 - throwException() + --- + # Caught unhandled exception + at: tst_Exception::throwException() (qtbase/src/testlib/qtestcase.cpp:1846) + file: qtbase/src/testlib/qtestcase.cpp + line: 1846 + ... +1..2 +# tests 2 +# pass 1 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_expectfail.tap b/tests/auto/testlib/selftests/expected_expectfail.tap new file mode 100644 index 0000000000..0e5dc4d982 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_expectfail.tap @@ -0,0 +1,96 @@ +TAP version 13 +# tst_ExpectFail +ok 1 - initTestCase() +# begin +not ok 2 - xfailAndContinue() # TODO This should xfail + --- + at: tst_ExpectFail::xfailAndContinue() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:65) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 65 + ... +# after +# begin +not ok 3 - xfailAndAbort() # TODO This should xfail + --- + at: tst_ExpectFail::xfailAndAbort() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:73) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 73 + ... +not ok 4 - xfailTwice() + --- + # Already expecting a fail + at: tst_ExpectFail::xfailTwice() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:83) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 83 + ... +not ok 5 - xfailWithQString() # TODO A string + --- + at: tst_ExpectFail::xfailWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:92) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 92 + ... +not ok 5 - xfailWithQString() # TODO Bug 5 (The message) + --- + at: tst_ExpectFail::xfailWithQString() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:97) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 97 + ... +ok 6 - xfailDataDrivenWithQVerify(Pass 1) +ok 7 - xfailDataDrivenWithQVerify(Pass 2) +not ok 8 - xfailDataDrivenWithQVerify(Abort) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:126) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 126 + ... +not ok 9 - xfailDataDrivenWithQVerify(Continue) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQVerify() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:126) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 126 + ... +ok 10 - xfailDataDrivenWithQCompare(Pass 1) +ok 11 - xfailDataDrivenWithQCompare(Pass 2) +not ok 12 - xfailDataDrivenWithQCompare(Abort) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:160) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 160 + ... +not ok 13 - xfailDataDrivenWithQCompare(Continue) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailDataDrivenWithQCompare() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:160) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 160 + ... +ok 14 - xfailOnWrongRow(right row) +not ok 15 - xfailOnAnyRow(first row) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:195) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 195 + ... +not ok 16 - xfailOnAnyRow(second row) # TODO This test should xfail + --- + at: tst_ExpectFail::xfailOnAnyRow() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:195) + file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp + line: 195 + ... +not ok 17 - xfailWithoutVerify(first row) + --- + # QEXPECT_FAIL was called without any subsequent verification statements + ... +not ok 18 - xfailWithoutVerify(second row) + --- + # QEXPECT_FAIL was called without any subsequent verification statements + ... +ok 19 - xpass() # TODO 'true' returned TRUE unexpectedly. () +ok 20 - xpassDataDrivenWithQVerify(XPass) # TODO 'true' returned TRUE unexpectedly. () +ok 21 - xpassDataDrivenWithQVerify(Pass) +ok 22 - xpassDataDrivenWithQCompare(XPass) # TODO QCOMPARE(1, 1) returned TRUE unexpectedly. +ok 23 - xpassDataDrivenWithQCompare(Pass) +ok 24 - cleanupTestCase() +1..24 +# tests 24 +# pass 18 +# fail 6 diff --git a/tests/auto/testlib/selftests/expected_failcleanup.tap b/tests/auto/testlib/selftests/expected_failcleanup.tap new file mode 100644 index 0000000000..2098cc1e17 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failcleanup.tap @@ -0,0 +1,20 @@ +TAP version 13 +# tst_FailCleanup +ok 1 - initTestCase() +ok 2 - aTestFunction() +not ok 3 - cleanupTestCase() + --- + type: QVERIFY + message: Fail inside cleanupTestCase + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_FailCleanup::cleanupTestCase() (qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp:46) + file: qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp + line: 46 + ... +1..3 +# tests 3 +# pass 2 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_failinit.tap b/tests/auto/testlib/selftests/expected_failinit.tap new file mode 100644 index 0000000000..d99a71fd51 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failinit.tap @@ -0,0 +1,19 @@ +TAP version 13 +# tst_FailInit +not ok 1 - initTestCase() + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_FailInit::initTestCase() (qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp:42) + file: qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp + line: 42 + ... +ok 2 - cleanupTestCase() +1..2 +# tests 2 +# pass 1 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_failinitdata.tap b/tests/auto/testlib/selftests/expected_failinitdata.tap new file mode 100644 index 0000000000..27bdda5a13 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_failinitdata.tap @@ -0,0 +1,18 @@ +TAP version 13 +# tst_FailInitData +not ok 1 - initTestCase() + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_FailInitData::initTestCase() (qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp:43) + file: qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp + line: 43 + ... +1..1 +# tests 1 +# pass 0 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.tap b/tests/auto/testlib/selftests/expected_fetchbogus.tap new file mode 100644 index 0000000000..c6761b2301 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_fetchbogus.tap @@ -0,0 +1,15 @@ +TAP version 13 +# tst_FetchBogus +ok 1 - initTestCase() +# QFETCH: Requested testdata 'bubu' not available, check your _data function. +not ok 2 - fetchBogus(foo) + --- + # Received a fatal error. + at: tst_FetchBogus::fetchBogus() (Unknown file:0) + file: Unknown file + line: 0 + ... +1..2 +# tests 2 +# pass 1 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_findtestdata.tap b/tests/auto/testlib/selftests/expected_findtestdata.tap new file mode 100644 index 0000000000..0fb38d2822 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_findtestdata.tap @@ -0,0 +1,10 @@ +TAP version 13 +# FindTestData +ok 1 - initTestCase() +# testdata testfile could not be located! +ok 2 - paths() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_float.tap b/tests/auto/testlib/selftests/expected_float.tap new file mode 100644 index 0000000000..fae2dc9796 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_float.tap @@ -0,0 +1,82 @@ +TAP version 13 +# tst_float +ok 1 - initTestCase() +ok 2 - floatComparisons(should SUCCEED 1) +not ok 3 - floatComparisons(should FAIL 1) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3 (operandRight) + found: 1 (operandLeft) + expected: 3 (operandRight) + actual: 1 (operandLeft) + at: tst_float::floatComparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:48) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 48 + ... +not ok 4 - floatComparisons(should FAIL 2) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3e-07 (operandRight) + found: 1e-07 (operandLeft) + expected: 3e-07 (operandRight) + actual: 1e-07 (operandLeft) + at: tst_float::floatComparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:48) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 48 + ... +not ok 5 - floatComparisons(should FAIL 3) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 99999 (operandRight) + found: 99998 (operandLeft) + expected: 99999 (operandRight) + actual: 99998 (operandLeft) + at: tst_float::floatComparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:48) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 48 + ... +ok 6 - floatComparisons(should SUCCEED 2) +not ok 7 - compareFloatTests(1e0) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3 (t3) + found: 1 (t1) + expected: 3 (t3) + actual: 1 (t1) + at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:96) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 96 + ... +not ok 8 - compareFloatTests(1e-7) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3e-07 (t3) + found: 1e-07 (t1) + expected: 3e-07 (t3) + actual: 1e-07 (t1) + at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:96) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 96 + ... +not ok 9 - compareFloatTests(1e+7) + --- + type: QCOMPARE + message: Compared floats are not the same (fuzzy compare) + wanted: 3e+07 (t3) + found: 1e+07 (t1) + expected: 3e+07 (t3) + actual: 1e+07 (t1) + at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:96) + file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp + line: 96 + ... +ok 10 - cleanupTestCase() +1..10 +# tests 10 +# pass 4 +# fail 6 diff --git a/tests/auto/testlib/selftests/expected_globaldata.tap b/tests/auto/testlib/selftests/expected_globaldata.tap new file mode 100644 index 0000000000..580cf3a7a8 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_globaldata.tap @@ -0,0 +1,52 @@ +TAP version 13 +# tst_globaldata +# initTestCase initTestCase (null) +ok 1 - initTestCase() +# init testGlobal local 1 +# global: false +# local: false +# cleanup testGlobal local 1 +ok 2 - testGlobal(1:local 1) +# init testGlobal local 2 +# global: false +# local: true +# cleanup testGlobal local 2 +ok 3 - testGlobal(1:local 2) +# init testGlobal local 1 +# global: true +# local: false +# cleanup testGlobal local 1 +ok 4 - testGlobal(2:local 1) +# init testGlobal local 2 +# global: true +# local: true +# cleanup testGlobal local 2 +ok 5 - testGlobal(2:local 2) +ok 6 - skip(1) # SKIP skipping +# init skipLocal local 1 +ok 7 - skipLocal(1:local 1) # SKIP skipping +# cleanup skipLocal local 1 +# init skipLocal local 2 +ok 8 - skipLocal(1:local 2) # SKIP skipping +# cleanup skipLocal local 2 +# init skipSingle local 1 +# global: false local: false +# cleanup skipSingle local 1 +ok 9 - skipSingle(1:local 1) +# init skipSingle local 2 +# global: false local: true +# cleanup skipSingle local 2 +ok 10 - skipSingle(1:local 2) +# init skipSingle local 1 +ok 11 - skipSingle(2:local 1) # SKIP skipping +# cleanup skipSingle local 1 +# init skipSingle local 2 +# global: true local: true +# cleanup skipSingle local 2 +ok 12 - skipSingle(2:local 2) +# cleanupTestCase cleanupTestCase (null) +ok 13 - cleanupTestCase() +1..13 +# tests 13 +# pass 9 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_longstring.tap b/tests/auto/testlib/selftests/expected_longstring.tap new file mode 100644 index 0000000000..ac870f2d53 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_longstring.tap @@ -0,0 +1,23 @@ +TAP version 13 +# tst_LongString +ok 1 - initTestCase() +not ok 2 - failWithLongString() + --- + # Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. + +Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. + +Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. + +Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. + +Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + at: tst_LongString::failWithLongString() (qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp:54) + file: qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp + line: 54 + ... +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 2 +# fail 1 diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.tap b/tests/auto/testlib/selftests/expected_maxwarnings.tap new file mode 100644 index 0000000000..57bfbd8f8d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_maxwarnings.tap @@ -0,0 +1,2011 @@ +TAP version 13 +# MaxWarnings +ok 1 - initTestCase() +# 0 +# 1 +# 2 +# 3 +# 4 +# 5 +# 6 +# 7 +# 8 +# 9 +# 10 +# 11 +# 12 +# 13 +# 14 +# 15 +# 16 +# 17 +# 18 +# 19 +# 20 +# 21 +# 22 +# 23 +# 24 +# 25 +# 26 +# 27 +# 28 +# 29 +# 30 +# 31 +# 32 +# 33 +# 34 +# 35 +# 36 +# 37 +# 38 +# 39 +# 40 +# 41 +# 42 +# 43 +# 44 +# 45 +# 46 +# 47 +# 48 +# 49 +# 50 +# 51 +# 52 +# 53 +# 54 +# 55 +# 56 +# 57 +# 58 +# 59 +# 60 +# 61 +# 62 +# 63 +# 64 +# 65 +# 66 +# 67 +# 68 +# 69 +# 70 +# 71 +# 72 +# 73 +# 74 +# 75 +# 76 +# 77 +# 78 +# 79 +# 80 +# 81 +# 82 +# 83 +# 84 +# 85 +# 86 +# 87 +# 88 +# 89 +# 90 +# 91 +# 92 +# 93 +# 94 +# 95 +# 96 +# 97 +# 98 +# 99 +# 100 +# 101 +# 102 +# 103 +# 104 +# 105 +# 106 +# 107 +# 108 +# 109 +# 110 +# 111 +# 112 +# 113 +# 114 +# 115 +# 116 +# 117 +# 118 +# 119 +# 120 +# 121 +# 122 +# 123 +# 124 +# 125 +# 126 +# 127 +# 128 +# 129 +# 130 +# 131 +# 132 +# 133 +# 134 +# 135 +# 136 +# 137 +# 138 +# 139 +# 140 +# 141 +# 142 +# 143 +# 144 +# 145 +# 146 +# 147 +# 148 +# 149 +# 150 +# 151 +# 152 +# 153 +# 154 +# 155 +# 156 +# 157 +# 158 +# 159 +# 160 +# 161 +# 162 +# 163 +# 164 +# 165 +# 166 +# 167 +# 168 +# 169 +# 170 +# 171 +# 172 +# 173 +# 174 +# 175 +# 176 +# 177 +# 178 +# 179 +# 180 +# 181 +# 182 +# 183 +# 184 +# 185 +# 186 +# 187 +# 188 +# 189 +# 190 +# 191 +# 192 +# 193 +# 194 +# 195 +# 196 +# 197 +# 198 +# 199 +# 200 +# 201 +# 202 +# 203 +# 204 +# 205 +# 206 +# 207 +# 208 +# 209 +# 210 +# 211 +# 212 +# 213 +# 214 +# 215 +# 216 +# 217 +# 218 +# 219 +# 220 +# 221 +# 222 +# 223 +# 224 +# 225 +# 226 +# 227 +# 228 +# 229 +# 230 +# 231 +# 232 +# 233 +# 234 +# 235 +# 236 +# 237 +# 238 +# 239 +# 240 +# 241 +# 242 +# 243 +# 244 +# 245 +# 246 +# 247 +# 248 +# 249 +# 250 +# 251 +# 252 +# 253 +# 254 +# 255 +# 256 +# 257 +# 258 +# 259 +# 260 +# 261 +# 262 +# 263 +# 264 +# 265 +# 266 +# 267 +# 268 +# 269 +# 270 +# 271 +# 272 +# 273 +# 274 +# 275 +# 276 +# 277 +# 278 +# 279 +# 280 +# 281 +# 282 +# 283 +# 284 +# 285 +# 286 +# 287 +# 288 +# 289 +# 290 +# 291 +# 292 +# 293 +# 294 +# 295 +# 296 +# 297 +# 298 +# 299 +# 300 +# 301 +# 302 +# 303 +# 304 +# 305 +# 306 +# 307 +# 308 +# 309 +# 310 +# 311 +# 312 +# 313 +# 314 +# 315 +# 316 +# 317 +# 318 +# 319 +# 320 +# 321 +# 322 +# 323 +# 324 +# 325 +# 326 +# 327 +# 328 +# 329 +# 330 +# 331 +# 332 +# 333 +# 334 +# 335 +# 336 +# 337 +# 338 +# 339 +# 340 +# 341 +# 342 +# 343 +# 344 +# 345 +# 346 +# 347 +# 348 +# 349 +# 350 +# 351 +# 352 +# 353 +# 354 +# 355 +# 356 +# 357 +# 358 +# 359 +# 360 +# 361 +# 362 +# 363 +# 364 +# 365 +# 366 +# 367 +# 368 +# 369 +# 370 +# 371 +# 372 +# 373 +# 374 +# 375 +# 376 +# 377 +# 378 +# 379 +# 380 +# 381 +# 382 +# 383 +# 384 +# 385 +# 386 +# 387 +# 388 +# 389 +# 390 +# 391 +# 392 +# 393 +# 394 +# 395 +# 396 +# 397 +# 398 +# 399 +# 400 +# 401 +# 402 +# 403 +# 404 +# 405 +# 406 +# 407 +# 408 +# 409 +# 410 +# 411 +# 412 +# 413 +# 414 +# 415 +# 416 +# 417 +# 418 +# 419 +# 420 +# 421 +# 422 +# 423 +# 424 +# 425 +# 426 +# 427 +# 428 +# 429 +# 430 +# 431 +# 432 +# 433 +# 434 +# 435 +# 436 +# 437 +# 438 +# 439 +# 440 +# 441 +# 442 +# 443 +# 444 +# 445 +# 446 +# 447 +# 448 +# 449 +# 450 +# 451 +# 452 +# 453 +# 454 +# 455 +# 456 +# 457 +# 458 +# 459 +# 460 +# 461 +# 462 +# 463 +# 464 +# 465 +# 466 +# 467 +# 468 +# 469 +# 470 +# 471 +# 472 +# 473 +# 474 +# 475 +# 476 +# 477 +# 478 +# 479 +# 480 +# 481 +# 482 +# 483 +# 484 +# 485 +# 486 +# 487 +# 488 +# 489 +# 490 +# 491 +# 492 +# 493 +# 494 +# 495 +# 496 +# 497 +# 498 +# 499 +# 500 +# 501 +# 502 +# 503 +# 504 +# 505 +# 506 +# 507 +# 508 +# 509 +# 510 +# 511 +# 512 +# 513 +# 514 +# 515 +# 516 +# 517 +# 518 +# 519 +# 520 +# 521 +# 522 +# 523 +# 524 +# 525 +# 526 +# 527 +# 528 +# 529 +# 530 +# 531 +# 532 +# 533 +# 534 +# 535 +# 536 +# 537 +# 538 +# 539 +# 540 +# 541 +# 542 +# 543 +# 544 +# 545 +# 546 +# 547 +# 548 +# 549 +# 550 +# 551 +# 552 +# 553 +# 554 +# 555 +# 556 +# 557 +# 558 +# 559 +# 560 +# 561 +# 562 +# 563 +# 564 +# 565 +# 566 +# 567 +# 568 +# 569 +# 570 +# 571 +# 572 +# 573 +# 574 +# 575 +# 576 +# 577 +# 578 +# 579 +# 580 +# 581 +# 582 +# 583 +# 584 +# 585 +# 586 +# 587 +# 588 +# 589 +# 590 +# 591 +# 592 +# 593 +# 594 +# 595 +# 596 +# 597 +# 598 +# 599 +# 600 +# 601 +# 602 +# 603 +# 604 +# 605 +# 606 +# 607 +# 608 +# 609 +# 610 +# 611 +# 612 +# 613 +# 614 +# 615 +# 616 +# 617 +# 618 +# 619 +# 620 +# 621 +# 622 +# 623 +# 624 +# 625 +# 626 +# 627 +# 628 +# 629 +# 630 +# 631 +# 632 +# 633 +# 634 +# 635 +# 636 +# 637 +# 638 +# 639 +# 640 +# 641 +# 642 +# 643 +# 644 +# 645 +# 646 +# 647 +# 648 +# 649 +# 650 +# 651 +# 652 +# 653 +# 654 +# 655 +# 656 +# 657 +# 658 +# 659 +# 660 +# 661 +# 662 +# 663 +# 664 +# 665 +# 666 +# 667 +# 668 +# 669 +# 670 +# 671 +# 672 +# 673 +# 674 +# 675 +# 676 +# 677 +# 678 +# 679 +# 680 +# 681 +# 682 +# 683 +# 684 +# 685 +# 686 +# 687 +# 688 +# 689 +# 690 +# 691 +# 692 +# 693 +# 694 +# 695 +# 696 +# 697 +# 698 +# 699 +# 700 +# 701 +# 702 +# 703 +# 704 +# 705 +# 706 +# 707 +# 708 +# 709 +# 710 +# 711 +# 712 +# 713 +# 714 +# 715 +# 716 +# 717 +# 718 +# 719 +# 720 +# 721 +# 722 +# 723 +# 724 +# 725 +# 726 +# 727 +# 728 +# 729 +# 730 +# 731 +# 732 +# 733 +# 734 +# 735 +# 736 +# 737 +# 738 +# 739 +# 740 +# 741 +# 742 +# 743 +# 744 +# 745 +# 746 +# 747 +# 748 +# 749 +# 750 +# 751 +# 752 +# 753 +# 754 +# 755 +# 756 +# 757 +# 758 +# 759 +# 760 +# 761 +# 762 +# 763 +# 764 +# 765 +# 766 +# 767 +# 768 +# 769 +# 770 +# 771 +# 772 +# 773 +# 774 +# 775 +# 776 +# 777 +# 778 +# 779 +# 780 +# 781 +# 782 +# 783 +# 784 +# 785 +# 786 +# 787 +# 788 +# 789 +# 790 +# 791 +# 792 +# 793 +# 794 +# 795 +# 796 +# 797 +# 798 +# 799 +# 800 +# 801 +# 802 +# 803 +# 804 +# 805 +# 806 +# 807 +# 808 +# 809 +# 810 +# 811 +# 812 +# 813 +# 814 +# 815 +# 816 +# 817 +# 818 +# 819 +# 820 +# 821 +# 822 +# 823 +# 824 +# 825 +# 826 +# 827 +# 828 +# 829 +# 830 +# 831 +# 832 +# 833 +# 834 +# 835 +# 836 +# 837 +# 838 +# 839 +# 840 +# 841 +# 842 +# 843 +# 844 +# 845 +# 846 +# 847 +# 848 +# 849 +# 850 +# 851 +# 852 +# 853 +# 854 +# 855 +# 856 +# 857 +# 858 +# 859 +# 860 +# 861 +# 862 +# 863 +# 864 +# 865 +# 866 +# 867 +# 868 +# 869 +# 870 +# 871 +# 872 +# 873 +# 874 +# 875 +# 876 +# 877 +# 878 +# 879 +# 880 +# 881 +# 882 +# 883 +# 884 +# 885 +# 886 +# 887 +# 888 +# 889 +# 890 +# 891 +# 892 +# 893 +# 894 +# 895 +# 896 +# 897 +# 898 +# 899 +# 900 +# 901 +# 902 +# 903 +# 904 +# 905 +# 906 +# 907 +# 908 +# 909 +# 910 +# 911 +# 912 +# 913 +# 914 +# 915 +# 916 +# 917 +# 918 +# 919 +# 920 +# 921 +# 922 +# 923 +# 924 +# 925 +# 926 +# 927 +# 928 +# 929 +# 930 +# 931 +# 932 +# 933 +# 934 +# 935 +# 936 +# 937 +# 938 +# 939 +# 940 +# 941 +# 942 +# 943 +# 944 +# 945 +# 946 +# 947 +# 948 +# 949 +# 950 +# 951 +# 952 +# 953 +# 954 +# 955 +# 956 +# 957 +# 958 +# 959 +# 960 +# 961 +# 962 +# 963 +# 964 +# 965 +# 966 +# 967 +# 968 +# 969 +# 970 +# 971 +# 972 +# 973 +# 974 +# 975 +# 976 +# 977 +# 978 +# 979 +# 980 +# 981 +# 982 +# 983 +# 984 +# 985 +# 986 +# 987 +# 988 +# 989 +# 990 +# 991 +# 992 +# 993 +# 994 +# 995 +# 996 +# 997 +# 998 +# 999 +# 1000 +# 1001 +# 1002 +# 1003 +# 1004 +# 1005 +# 1006 +# 1007 +# 1008 +# 1009 +# 1010 +# 1011 +# 1012 +# 1013 +# 1014 +# 1015 +# 1016 +# 1017 +# 1018 +# 1019 +# 1020 +# 1021 +# 1022 +# 1023 +# 1024 +# 1025 +# 1026 +# 1027 +# 1028 +# 1029 +# 1030 +# 1031 +# 1032 +# 1033 +# 1034 +# 1035 +# 1036 +# 1037 +# 1038 +# 1039 +# 1040 +# 1041 +# 1042 +# 1043 +# 1044 +# 1045 +# 1046 +# 1047 +# 1048 +# 1049 +# 1050 +# 1051 +# 1052 +# 1053 +# 1054 +# 1055 +# 1056 +# 1057 +# 1058 +# 1059 +# 1060 +# 1061 +# 1062 +# 1063 +# 1064 +# 1065 +# 1066 +# 1067 +# 1068 +# 1069 +# 1070 +# 1071 +# 1072 +# 1073 +# 1074 +# 1075 +# 1076 +# 1077 +# 1078 +# 1079 +# 1080 +# 1081 +# 1082 +# 1083 +# 1084 +# 1085 +# 1086 +# 1087 +# 1088 +# 1089 +# 1090 +# 1091 +# 1092 +# 1093 +# 1094 +# 1095 +# 1096 +# 1097 +# 1098 +# 1099 +# 1100 +# 1101 +# 1102 +# 1103 +# 1104 +# 1105 +# 1106 +# 1107 +# 1108 +# 1109 +# 1110 +# 1111 +# 1112 +# 1113 +# 1114 +# 1115 +# 1116 +# 1117 +# 1118 +# 1119 +# 1120 +# 1121 +# 1122 +# 1123 +# 1124 +# 1125 +# 1126 +# 1127 +# 1128 +# 1129 +# 1130 +# 1131 +# 1132 +# 1133 +# 1134 +# 1135 +# 1136 +# 1137 +# 1138 +# 1139 +# 1140 +# 1141 +# 1142 +# 1143 +# 1144 +# 1145 +# 1146 +# 1147 +# 1148 +# 1149 +# 1150 +# 1151 +# 1152 +# 1153 +# 1154 +# 1155 +# 1156 +# 1157 +# 1158 +# 1159 +# 1160 +# 1161 +# 1162 +# 1163 +# 1164 +# 1165 +# 1166 +# 1167 +# 1168 +# 1169 +# 1170 +# 1171 +# 1172 +# 1173 +# 1174 +# 1175 +# 1176 +# 1177 +# 1178 +# 1179 +# 1180 +# 1181 +# 1182 +# 1183 +# 1184 +# 1185 +# 1186 +# 1187 +# 1188 +# 1189 +# 1190 +# 1191 +# 1192 +# 1193 +# 1194 +# 1195 +# 1196 +# 1197 +# 1198 +# 1199 +# 1200 +# 1201 +# 1202 +# 1203 +# 1204 +# 1205 +# 1206 +# 1207 +# 1208 +# 1209 +# 1210 +# 1211 +# 1212 +# 1213 +# 1214 +# 1215 +# 1216 +# 1217 +# 1218 +# 1219 +# 1220 +# 1221 +# 1222 +# 1223 +# 1224 +# 1225 +# 1226 +# 1227 +# 1228 +# 1229 +# 1230 +# 1231 +# 1232 +# 1233 +# 1234 +# 1235 +# 1236 +# 1237 +# 1238 +# 1239 +# 1240 +# 1241 +# 1242 +# 1243 +# 1244 +# 1245 +# 1246 +# 1247 +# 1248 +# 1249 +# 1250 +# 1251 +# 1252 +# 1253 +# 1254 +# 1255 +# 1256 +# 1257 +# 1258 +# 1259 +# 1260 +# 1261 +# 1262 +# 1263 +# 1264 +# 1265 +# 1266 +# 1267 +# 1268 +# 1269 +# 1270 +# 1271 +# 1272 +# 1273 +# 1274 +# 1275 +# 1276 +# 1277 +# 1278 +# 1279 +# 1280 +# 1281 +# 1282 +# 1283 +# 1284 +# 1285 +# 1286 +# 1287 +# 1288 +# 1289 +# 1290 +# 1291 +# 1292 +# 1293 +# 1294 +# 1295 +# 1296 +# 1297 +# 1298 +# 1299 +# 1300 +# 1301 +# 1302 +# 1303 +# 1304 +# 1305 +# 1306 +# 1307 +# 1308 +# 1309 +# 1310 +# 1311 +# 1312 +# 1313 +# 1314 +# 1315 +# 1316 +# 1317 +# 1318 +# 1319 +# 1320 +# 1321 +# 1322 +# 1323 +# 1324 +# 1325 +# 1326 +# 1327 +# 1328 +# 1329 +# 1330 +# 1331 +# 1332 +# 1333 +# 1334 +# 1335 +# 1336 +# 1337 +# 1338 +# 1339 +# 1340 +# 1341 +# 1342 +# 1343 +# 1344 +# 1345 +# 1346 +# 1347 +# 1348 +# 1349 +# 1350 +# 1351 +# 1352 +# 1353 +# 1354 +# 1355 +# 1356 +# 1357 +# 1358 +# 1359 +# 1360 +# 1361 +# 1362 +# 1363 +# 1364 +# 1365 +# 1366 +# 1367 +# 1368 +# 1369 +# 1370 +# 1371 +# 1372 +# 1373 +# 1374 +# 1375 +# 1376 +# 1377 +# 1378 +# 1379 +# 1380 +# 1381 +# 1382 +# 1383 +# 1384 +# 1385 +# 1386 +# 1387 +# 1388 +# 1389 +# 1390 +# 1391 +# 1392 +# 1393 +# 1394 +# 1395 +# 1396 +# 1397 +# 1398 +# 1399 +# 1400 +# 1401 +# 1402 +# 1403 +# 1404 +# 1405 +# 1406 +# 1407 +# 1408 +# 1409 +# 1410 +# 1411 +# 1412 +# 1413 +# 1414 +# 1415 +# 1416 +# 1417 +# 1418 +# 1419 +# 1420 +# 1421 +# 1422 +# 1423 +# 1424 +# 1425 +# 1426 +# 1427 +# 1428 +# 1429 +# 1430 +# 1431 +# 1432 +# 1433 +# 1434 +# 1435 +# 1436 +# 1437 +# 1438 +# 1439 +# 1440 +# 1441 +# 1442 +# 1443 +# 1444 +# 1445 +# 1446 +# 1447 +# 1448 +# 1449 +# 1450 +# 1451 +# 1452 +# 1453 +# 1454 +# 1455 +# 1456 +# 1457 +# 1458 +# 1459 +# 1460 +# 1461 +# 1462 +# 1463 +# 1464 +# 1465 +# 1466 +# 1467 +# 1468 +# 1469 +# 1470 +# 1471 +# 1472 +# 1473 +# 1474 +# 1475 +# 1476 +# 1477 +# 1478 +# 1479 +# 1480 +# 1481 +# 1482 +# 1483 +# 1484 +# 1485 +# 1486 +# 1487 +# 1488 +# 1489 +# 1490 +# 1491 +# 1492 +# 1493 +# 1494 +# 1495 +# 1496 +# 1497 +# 1498 +# 1499 +# 1500 +# 1501 +# 1502 +# 1503 +# 1504 +# 1505 +# 1506 +# 1507 +# 1508 +# 1509 +# 1510 +# 1511 +# 1512 +# 1513 +# 1514 +# 1515 +# 1516 +# 1517 +# 1518 +# 1519 +# 1520 +# 1521 +# 1522 +# 1523 +# 1524 +# 1525 +# 1526 +# 1527 +# 1528 +# 1529 +# 1530 +# 1531 +# 1532 +# 1533 +# 1534 +# 1535 +# 1536 +# 1537 +# 1538 +# 1539 +# 1540 +# 1541 +# 1542 +# 1543 +# 1544 +# 1545 +# 1546 +# 1547 +# 1548 +# 1549 +# 1550 +# 1551 +# 1552 +# 1553 +# 1554 +# 1555 +# 1556 +# 1557 +# 1558 +# 1559 +# 1560 +# 1561 +# 1562 +# 1563 +# 1564 +# 1565 +# 1566 +# 1567 +# 1568 +# 1569 +# 1570 +# 1571 +# 1572 +# 1573 +# 1574 +# 1575 +# 1576 +# 1577 +# 1578 +# 1579 +# 1580 +# 1581 +# 1582 +# 1583 +# 1584 +# 1585 +# 1586 +# 1587 +# 1588 +# 1589 +# 1590 +# 1591 +# 1592 +# 1593 +# 1594 +# 1595 +# 1596 +# 1597 +# 1598 +# 1599 +# 1600 +# 1601 +# 1602 +# 1603 +# 1604 +# 1605 +# 1606 +# 1607 +# 1608 +# 1609 +# 1610 +# 1611 +# 1612 +# 1613 +# 1614 +# 1615 +# 1616 +# 1617 +# 1618 +# 1619 +# 1620 +# 1621 +# 1622 +# 1623 +# 1624 +# 1625 +# 1626 +# 1627 +# 1628 +# 1629 +# 1630 +# 1631 +# 1632 +# 1633 +# 1634 +# 1635 +# 1636 +# 1637 +# 1638 +# 1639 +# 1640 +# 1641 +# 1642 +# 1643 +# 1644 +# 1645 +# 1646 +# 1647 +# 1648 +# 1649 +# 1650 +# 1651 +# 1652 +# 1653 +# 1654 +# 1655 +# 1656 +# 1657 +# 1658 +# 1659 +# 1660 +# 1661 +# 1662 +# 1663 +# 1664 +# 1665 +# 1666 +# 1667 +# 1668 +# 1669 +# 1670 +# 1671 +# 1672 +# 1673 +# 1674 +# 1675 +# 1676 +# 1677 +# 1678 +# 1679 +# 1680 +# 1681 +# 1682 +# 1683 +# 1684 +# 1685 +# 1686 +# 1687 +# 1688 +# 1689 +# 1690 +# 1691 +# 1692 +# 1693 +# 1694 +# 1695 +# 1696 +# 1697 +# 1698 +# 1699 +# 1700 +# 1701 +# 1702 +# 1703 +# 1704 +# 1705 +# 1706 +# 1707 +# 1708 +# 1709 +# 1710 +# 1711 +# 1712 +# 1713 +# 1714 +# 1715 +# 1716 +# 1717 +# 1718 +# 1719 +# 1720 +# 1721 +# 1722 +# 1723 +# 1724 +# 1725 +# 1726 +# 1727 +# 1728 +# 1729 +# 1730 +# 1731 +# 1732 +# 1733 +# 1734 +# 1735 +# 1736 +# 1737 +# 1738 +# 1739 +# 1740 +# 1741 +# 1742 +# 1743 +# 1744 +# 1745 +# 1746 +# 1747 +# 1748 +# 1749 +# 1750 +# 1751 +# 1752 +# 1753 +# 1754 +# 1755 +# 1756 +# 1757 +# 1758 +# 1759 +# 1760 +# 1761 +# 1762 +# 1763 +# 1764 +# 1765 +# 1766 +# 1767 +# 1768 +# 1769 +# 1770 +# 1771 +# 1772 +# 1773 +# 1774 +# 1775 +# 1776 +# 1777 +# 1778 +# 1779 +# 1780 +# 1781 +# 1782 +# 1783 +# 1784 +# 1785 +# 1786 +# 1787 +# 1788 +# 1789 +# 1790 +# 1791 +# 1792 +# 1793 +# 1794 +# 1795 +# 1796 +# 1797 +# 1798 +# 1799 +# 1800 +# 1801 +# 1802 +# 1803 +# 1804 +# 1805 +# 1806 +# 1807 +# 1808 +# 1809 +# 1810 +# 1811 +# 1812 +# 1813 +# 1814 +# 1815 +# 1816 +# 1817 +# 1818 +# 1819 +# 1820 +# 1821 +# 1822 +# 1823 +# 1824 +# 1825 +# 1826 +# 1827 +# 1828 +# 1829 +# 1830 +# 1831 +# 1832 +# 1833 +# 1834 +# 1835 +# 1836 +# 1837 +# 1838 +# 1839 +# 1840 +# 1841 +# 1842 +# 1843 +# 1844 +# 1845 +# 1846 +# 1847 +# 1848 +# 1849 +# 1850 +# 1851 +# 1852 +# 1853 +# 1854 +# 1855 +# 1856 +# 1857 +# 1858 +# 1859 +# 1860 +# 1861 +# 1862 +# 1863 +# 1864 +# 1865 +# 1866 +# 1867 +# 1868 +# 1869 +# 1870 +# 1871 +# 1872 +# 1873 +# 1874 +# 1875 +# 1876 +# 1877 +# 1878 +# 1879 +# 1880 +# 1881 +# 1882 +# 1883 +# 1884 +# 1885 +# 1886 +# 1887 +# 1888 +# 1889 +# 1890 +# 1891 +# 1892 +# 1893 +# 1894 +# 1895 +# 1896 +# 1897 +# 1898 +# 1899 +# 1900 +# 1901 +# 1902 +# 1903 +# 1904 +# 1905 +# 1906 +# 1907 +# 1908 +# 1909 +# 1910 +# 1911 +# 1912 +# 1913 +# 1914 +# 1915 +# 1916 +# 1917 +# 1918 +# 1919 +# 1920 +# 1921 +# 1922 +# 1923 +# 1924 +# 1925 +# 1926 +# 1927 +# 1928 +# 1929 +# 1930 +# 1931 +# 1932 +# 1933 +# 1934 +# 1935 +# 1936 +# 1937 +# 1938 +# 1939 +# 1940 +# 1941 +# 1942 +# 1943 +# 1944 +# 1945 +# 1946 +# 1947 +# 1948 +# 1949 +# 1950 +# 1951 +# 1952 +# 1953 +# 1954 +# 1955 +# 1956 +# 1957 +# 1958 +# 1959 +# 1960 +# 1961 +# 1962 +# 1963 +# 1964 +# 1965 +# 1966 +# 1967 +# 1968 +# 1969 +# 1970 +# 1971 +# 1972 +# 1973 +# 1974 +# 1975 +# 1976 +# 1977 +# 1978 +# 1979 +# 1980 +# 1981 +# 1982 +# 1983 +# 1984 +# 1985 +# 1986 +# 1987 +# 1988 +# 1989 +# 1990 +# 1991 +# 1992 +# 1993 +# 1994 +# 1995 +# 1996 +# 1997 +# 1998 +# 1999 +# 2000 +# Maximum amount of warnings exceeded. Use -maxwarnings to override. +ok 2 - warn() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.tap b/tests/auto/testlib/selftests/expected_pairdiagnostics.tap new file mode 100644 index 0000000000..9c45880c2d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.tap @@ -0,0 +1,32 @@ +TAP version 13 +# tst_PairDiagnostics +ok 1 - initTestCase() +not ok 2 - testQPair() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "QPair(1,2)" (pair2) + found: "QPair(1,1)" (pair1) + expected: "QPair(1,2)" (pair2) + actual: "QPair(1,1)" (pair1) + at: tst_PairDiagnostics::testQPair() (qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp:51) + file: qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp + line: 51 + ... +not ok 3 - testStdPair() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "std::pair(1,2)" (pair2) + found: "std::pair(1,1)" (pair1) + expected: "std::pair(1,2)" (pair2) + actual: "std::pair(1,1)" (pair1) + at: tst_PairDiagnostics::testStdPair() (qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp:58) + file: qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp + line: 58 + ... +ok 4 - cleanupTestCase() +1..4 +# tests 4 +# pass 2 +# fail 2 diff --git a/tests/auto/testlib/selftests/expected_singleskip.tap b/tests/auto/testlib/selftests/expected_singleskip.tap new file mode 100644 index 0000000000..2cc09e7d26 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_singleskip.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_SingleSkip +ok 1 - initTestCase() +ok 2 - myTest() # SKIP skipping test +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 2 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skip.tap b/tests/auto/testlib/selftests/expected_skip.tap new file mode 100644 index 0000000000..adf9f692a9 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skip.tap @@ -0,0 +1,13 @@ +TAP version 13 +# tst_Skip +ok 1 - initTestCase() +ok 2 - test() # SKIP skipping all +ok 3 - emptytest() # SKIP skipping all +ok 4 - singleSkip(local 1) # SKIP skipping one +# this line should only be reached once (true) +ok 5 - singleSkip(local 2) +ok 6 - cleanupTestCase() +1..6 +# tests 6 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.tap b/tests/auto/testlib/selftests/expected_skipcleanup.tap new file mode 100644 index 0000000000..4a3f8f852c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipcleanup.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_SkipCleanup +ok 1 - initTestCase() +ok 2 - aTestFunction() +ok 3 - cleanupTestCase() # SKIP Skip inside cleanupTestCase. +1..3 +# tests 3 +# pass 2 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skipinit.tap b/tests/auto/testlib/selftests/expected_skipinit.tap new file mode 100644 index 0000000000..1fc38e79aa --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipinit.tap @@ -0,0 +1,8 @@ +TAP version 13 +# tst_SkipInit +ok 1 - initTestCase() # SKIP Skip inside initTestCase. This should skip all tests in the class. +ok 2 - cleanupTestCase() +1..2 +# tests 2 +# pass 1 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.tap b/tests/auto/testlib/selftests/expected_skipinitdata.tap new file mode 100644 index 0000000000..1ea96ca74e --- /dev/null +++ b/tests/auto/testlib/selftests/expected_skipinitdata.tap @@ -0,0 +1,7 @@ +TAP version 13 +# tst_SkipInitData +ok 1 - initTestCase() # SKIP Skip inside initTestCase_data. This should skip all tests in the class. +1..1 +# tests 1 +# pass 0 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_sleep.tap b/tests/auto/testlib/selftests/expected_sleep.tap new file mode 100644 index 0000000000..7caef214d2 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_sleep.tap @@ -0,0 +1,9 @@ +TAP version 13 +# tst_Sleep +ok 1 - initTestCase() +ok 2 - sleep() +ok 3 - cleanupTestCase() +1..3 +# tests 3 +# pass 3 +# fail 0 diff --git a/tests/auto/testlib/selftests/expected_strcmp.tap b/tests/auto/testlib/selftests/expected_strcmp.tap new file mode 100644 index 0000000000..af368e4745 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_strcmp.tap @@ -0,0 +1,87 @@ +TAP version 13 +# tst_StrCmp +ok 1 - initTestCase() +ok 2 - compareCharStars() +not ok 3 - compareByteArray() # TODO Next test should fail + --- + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:75) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 75 + ... +not ok 3 - compareByteArray() # TODO Next test should fail + --- + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:82) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 82 + ... +not ok 3 - compareByteArray() # TODO Next test should fail + --- + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:89) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 89 + ... +not ok 3 - compareByteArray() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"... (b) + found: "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... (a) + expected: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"... (b) + actual: "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... (a) + at: tst_StrCmp::compareByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:96) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 96 + ... +not ok 4 - failByteArray() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "cba" (QByteArray("cba")) + found: "abc" (QByteArray("abc")) + expected: "cba" (QByteArray("cba")) + actual: "abc" (QByteArray("abc")) + at: tst_StrCmp::failByteArray() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:102) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 102 + ... +not ok 5 - failByteArrayNull() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "" (QByteArray()) + found: "foo" (QByteArray("foo")) + expected: "" (QByteArray()) + actual: "foo" (QByteArray("foo")) + at: tst_StrCmp::failByteArrayNull() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:108) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 108 + ... +not ok 6 - failByteArrayEmpty() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "foo" (QByteArray("foo")) + found: "" (QByteArray("")) + expected: "foo" (QByteArray("foo")) + actual: "" (QByteArray("")) + at: tst_StrCmp::failByteArrayEmpty() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:113) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 113 + ... +not ok 7 - failByteArraySingleChars() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "7" (QByteArray("7")) + found: "6" (QByteArray("6")) + expected: "7" (QByteArray("7")) + actual: "6" (QByteArray("6")) + at: tst_StrCmp::failByteArraySingleChars() (qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp:120) + file: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp + line: 120 + ... +ok 8 - cleanupTestCase() +1..8 +# tests 8 +# pass 3 +# fail 5 diff --git a/tests/auto/testlib/selftests/expected_subtest.tap b/tests/auto/testlib/selftests/expected_subtest.tap new file mode 100644 index 0000000000..67fe7be570 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_subtest.tap @@ -0,0 +1,68 @@ +TAP version 13 +# tst_Subtest +# initTestCase initTestCase (null) +ok 1 - initTestCase() +# init test1 (null) +# test1 test1 (null) +# cleanup test1 (null) +ok 2 - test1() +# test2_data test2 (null) +# test2_data end +# init test2 data0 +# test2 test2 data0 +# test2 end +# cleanup test2 data0 +ok 3 - test2(data0) +# init test2 data1 +# test2 test2 data1 +# test2 end +# cleanup test2 data1 +ok 4 - test2(data1) +# init test2 data2 +# test2 test2 data2 +# test2 end +# cleanup test2 data2 +ok 5 - test2(data2) +# test3_data test3 (null) +# test3_data end +# init test3 data0 +# test2 test3 data0 +# test2 end +# cleanup test3 data0 +ok 6 - test3(data0) +# init test3 data1 +# test2 test3 data1 +not ok 7 - test3(data1) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "hello0" (QString("hello0")) + found: "hello1" (str) + expected: "hello0" (QString("hello0")) + actual: "hello1" (str) + at: tst_Subtest::test3() (qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp:141) + file: qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp + line: 141 + ... +# cleanup test3 data1 +# init test3 data2 +# test2 test3 data2 +not ok 8 - test3(data2) + --- + type: QCOMPARE + message: Compared values are not the same + wanted: "hello0" (QString("hello0")) + found: "hello2" (str) + expected: "hello0" (QString("hello0")) + actual: "hello2" (str) + at: tst_Subtest::test3() (qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp:141) + file: qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp + line: 141 + ... +# cleanup test3 data2 +# cleanupTestCase cleanupTestCase (null) +ok 9 - cleanupTestCase() +1..9 +# tests 9 +# pass 7 +# fail 2 diff --git a/tests/auto/testlib/selftests/expected_verbose1.tap b/tests/auto/testlib/selftests/expected_verbose1.tap new file mode 100644 index 0000000000..ad53e8f14e --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verbose1.tap @@ -0,0 +1,118 @@ +TAP version 13 +# tst_Counting +ok 1 - initTestCase() +ok 2 - testPassPass(row 1) +ok 3 - testPassPass(row 2) +ok 4 - testPassSkip(row 1) +ok 5 - testPassSkip(row 2) # SKIP Skipping +ok 6 - testPassFail(row 1) +not ok 7 - testPassFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testPassFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 8 - testSkipPass(row 1) # SKIP Skipping +ok 9 - testSkipPass(row 2) +ok 10 - testSkipSkip(row 1) # SKIP Skipping +ok 11 - testSkipSkip(row 2) # SKIP Skipping +ok 12 - testSkipFail(row 1) # SKIP Skipping +not ok 13 - testSkipFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testSkipFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 14 - testFailPass(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailPass() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 15 - testFailPass(row 2) +not ok 16 - testFailSkip(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailSkip() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 17 - testFailSkip(row 2) # SKIP Skipping +not ok 18 - testFailFail(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +not ok 19 - testFailFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 20 - testFailInInit(before) +not ok 21 - testFailInInit(fail) + --- + # Fail in init() + at: tst_Counting::testFailInInit() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:221) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 221 + ... +ok 22 - testFailInInit(after) +ok 23 - testFailInCleanup(before) +# This test function should execute and then QFAIL in cleanup() +not ok 24 - testFailInCleanup(fail) + --- + # Fail in cleanup() + at: tst_Counting::testFailInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:229) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 229 + ... +ok 25 - testFailInCleanup(after) +ok 26 - testSkipInInit(before) +ok 27 - testSkipInInit(skip) # SKIP Skip in init() +ok 28 - testSkipInInit(after) +ok 29 - testSkipInCleanup(before) +# This test function should execute and then QSKIP in cleanup() +ok 30 - testSkipInCleanup(skip) # SKIP Skip in cleanup() +ok 31 - testSkipInCleanup(after) +ok 32 - cleanupTestCase() +1..32 +# tests 32 +# pass 16 +# fail 8 diff --git a/tests/auto/testlib/selftests/expected_verbose2.tap b/tests/auto/testlib/selftests/expected_verbose2.tap new file mode 100644 index 0000000000..7e6a7280a4 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verbose2.tap @@ -0,0 +1,136 @@ +TAP version 13 +# tst_Counting +ok 1 - initTestCase() +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 2 - testPassPass(row 1) +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 3 - testPassPass(row 2) +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 4 - testPassSkip(row 1) +ok 5 - testPassSkip(row 2) # SKIP Skipping +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 6 - testPassFail(row 1) +# QVERIFY(false) +not ok 7 - testPassFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testPassFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 8 - testSkipPass(row 1) # SKIP Skipping +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 9 - testSkipPass(row 2) +ok 10 - testSkipSkip(row 1) # SKIP Skipping +ok 11 - testSkipSkip(row 2) # SKIP Skipping +ok 12 - testSkipFail(row 1) # SKIP Skipping +# QVERIFY(false) +not ok 13 - testSkipFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testSkipFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +# QVERIFY(false) +not ok 14 - testFailPass(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailPass() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +# QVERIFY(true) +# QCOMPARE(2 + 1, 3) +ok 15 - testFailPass(row 2) +# QVERIFY(false) +not ok 16 - testFailSkip(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailSkip() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 17 - testFailSkip(row 2) # SKIP Skipping +# QVERIFY(false) +not ok 18 - testFailFail(row 1) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +# QVERIFY(false) +not ok 19 - testFailFail(row 2) + --- + type: QVERIFY + message: Verification failed + wanted: true (false) + found: false (false) + expected: true (false) + actual: false (false) + at: tst_Counting::testFailFail() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:102) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 102 + ... +ok 20 - testFailInInit(before) +not ok 21 - testFailInInit(fail) + --- + # Fail in init() + at: tst_Counting::testFailInInit() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:221) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 221 + ... +ok 22 - testFailInInit(after) +ok 23 - testFailInCleanup(before) +# This test function should execute and then QFAIL in cleanup() +not ok 24 - testFailInCleanup(fail) + --- + # Fail in cleanup() + at: tst_Counting::testFailInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:229) + file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp + line: 229 + ... +ok 25 - testFailInCleanup(after) +ok 26 - testSkipInInit(before) +ok 27 - testSkipInInit(skip) # SKIP Skip in init() +ok 28 - testSkipInInit(after) +ok 29 - testSkipInCleanup(before) +# This test function should execute and then QSKIP in cleanup() +ok 30 - testSkipInCleanup(skip) # SKIP Skip in cleanup() +ok 31 - testSkipInCleanup(after) +ok 32 - cleanupTestCase() +1..32 +# tests 32 +# pass 16 +# fail 8 diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.tap b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.tap new file mode 100644 index 0000000000..2b04c08cdb --- /dev/null +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.tap @@ -0,0 +1,53 @@ +TAP version 13 +# tst_VerifyExceptionThrown +ok 1 - initTestCase() +ok 2 - testCorrectStdTypes() +ok 3 - testCorrectStdExceptions() +ok 4 - testCorrectMyExceptions() +not ok 5 - testFailInt() + --- + # Expected exception of type double to be thrown but unknown exception caught + at: tst_VerifyExceptionThrown::testFailInt() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:115) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 115 + ... +not ok 6 - testFailStdString() + --- + # Expected exception of type char* to be thrown but unknown exception caught + at: tst_VerifyExceptionThrown::testFailStdString() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:120) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 120 + ... +not ok 7 - testFailStdRuntimeError() + --- + # Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error + at: tst_VerifyExceptionThrown::testFailStdRuntimeError() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:125) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 125 + ... +not ok 8 - testFailMyException() + --- + # Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error + at: tst_VerifyExceptionThrown::testFailMyException() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:130) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 130 + ... +not ok 9 - testFailMyDerivedException() + --- + # Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException + at: tst_VerifyExceptionThrown::testFailMyDerivedException() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:135) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 135 + ... +not ok 10 - testFailNoException() + --- + # Expected exception of type std::exception to be thrown but no exception caught + at: tst_VerifyExceptionThrown::testFailNoException() (qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp:140) + file: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp + line: 140 + ... +ok 11 - cleanupTestCase() +1..11 +# tests 11 +# pass 5 +# fail 6 diff --git a/tests/auto/testlib/selftests/expected_warnings.tap b/tests/auto/testlib/selftests/expected_warnings.tap new file mode 100644 index 0000000000..0e357cb770 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_warnings.tap @@ -0,0 +1,42 @@ +TAP version 13 +# tst_Warnings +ok 1 - initTestCase() +# Warning +# Warning +# Debug +# Debug +# Info +# Info +# Baba +# Baba +# Bubublabla +# Babablabla +ok 2 - testWarnings() +# Did not receive message: "Warning0" +# Did not receive message: "Warning1" +not ok 3 - testMissingWarnings() + --- + # Not all expected messages were received + ... +# Did not receive any message matching: "Warning\s\d" +not ok 4 - testMissingWarningsRegularExpression() + --- + # Not all expected messages were received + ... +# Did not receive message: "Warning0" +# Did not receive message: "Warning1" +not ok 5 - testMissingWarningsWithData(first row) + --- + # Not all expected messages were received + ... +# Did not receive message: "Warning0" +# Did not receive message: "Warning1" +not ok 6 - testMissingWarningsWithData(second row) + --- + # Not all expected messages were received + ... +ok 7 - cleanupTestCase() +1..7 +# tests 7 +# pass 3 +# fail 4 diff --git a/tests/auto/testlib/selftests/expected_xunit.tap b/tests/auto/testlib/selftests/expected_xunit.tap new file mode 100644 index 0000000000..13ff7e45a3 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_xunit.tap @@ -0,0 +1,44 @@ +TAP version 13 +# tst_Xunit +ok 1 - initTestCase() +# just a QWARN() ! +ok 2 - testFunc1() +# a qDebug() call with comment-ending stuff --> +not ok 3 - testFunc2() + --- + type: QCOMPARE + message: Compared values are not the same + wanted: 3 (3) + found: 2 (2) + expected: 3 (3) + actual: 2 (2) + at: tst_Xunit::testFunc2() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:61) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 61 + ... +ok 4 - testFunc3() # SKIP skipping this function! +not ok 5 - testFunc4() + --- + # a forced failure! + at: tst_Xunit::testFunc4() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:71) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 71 + ... +not ok 6 - testFunc5() # TODO this failure is expected + --- + at: tst_Xunit::testFunc5() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:85) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 85 + ... +not ok 7 - testFunc6() # TODO this failure is also expected + --- + at: tst_Xunit::testFunc6() (qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp:91) + file: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp + line: 91 + ... +ok 8 - testFunc7() # TODO 'true' returned TRUE unexpectedly. () +ok 9 - cleanupTestCase() +1..9 +# tests 9 +# pass 5 +# fail 3 diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 6c14d75ea6..a959a71749 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -212,7 +212,7 @@ class Scanner (object): del re def generateTestData(testname, clean, - formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity'), + formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity', 'tap'), extraArgs = { "commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2", "benchlibcallgrind": "-callgrind", diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 9c23574456..8ac2ca7b90 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -310,6 +310,14 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const QStringList() << "teamcity", QStringList() << "-teamcity" << "-o" << logName("teamcity") ) + << LoggerSet("old stdout tap", + QStringList() << "stdout tap", + QStringList() << "-tap" + ) + << LoggerSet("old tap", + QStringList() << "tap", + QStringList() << "-tap" << "-o" << logName("tap") + ) // Test with new-style options for a single logger << LoggerSet("new stdout txt", QStringList() << "stdout txt", @@ -357,6 +365,14 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const QStringList() << "teamcity", QStringList() << "-o" << logName("teamcity")+",teamcity" ) + << LoggerSet("new stdout tap", + QStringList() << "stdout tap", + QStringList() << "-o" << "-,tap" + ) + << LoggerSet("new tap", + QStringList() << "tap", + QStringList() << "-o" << logName("tap")+",tap" + ) // Test with two loggers (don't test all 32 combinations, just a sample) << LoggerSet("stdout txt + txt", QStringList() << "stdout txt" << "txt", @@ -380,13 +396,14 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const ) // All loggers at the same time (except csv) << LoggerSet("all loggers", - QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "xunitxml", + QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "xunitxml" << "tap", QStringList() << "-o" << logName("txt")+",txt" << "-o" << logName("xml")+",xml" << "-o" << logName("lightxml")+",lightxml" << "-o" << "-,txt" << "-o" << logName("xunitxml")+",xunitxml" << "-o" << logName("teamcity")+",teamcity" + << "-o" << logName("tap")+",tap" ) ; } @@ -851,6 +868,11 @@ bool tst_Selftests::compareOutput(const QString &logger, const QString &subdir, expectedLine.replace(teamcityLocRegExp, teamCityLocation()); } + if (logger.endsWith(QLatin1String("tap"))) { + if (expectedLine.contains(QLatin1String("at:")) || expectedLine.contains(QLatin1String("file:"))) + actualLine = expectedLine; + } + if (!compareLine(logger, subdir, benchmark, actualLine, expectedLine, errorMessage)) { errorMessage->prepend(QLatin1String("Line ") + QString::number(i + 1) |