Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-03-31 22:30:38 +0200
committerMartin Hořeňovský2022-03-31 22:30:38 +0200
commit797c3e731883bfb80dff5e237f2559232314310c (patch)
tree1aa93767b50957e095291f5e8ee1651492fc31b7
parent6206db5a73e989965d7f67b710762ab91c2c0959 (diff)
downloadcatch3-797c3e731883bfb80dff5e237f2559232314310c.tar.gz
Refactor tests
-rw-r--r--tests/SelfTest/Baselines/automake.sw.approved.txt6
-rw-r--r--tests/SelfTest/Baselines/automake.sw.multi.approved.txt6
-rw-r--r--tests/SelfTest/Baselines/compact.sw.approved.txt33
-rw-r--r--tests/SelfTest/Baselines/compact.sw.multi.approved.txt33
-rw-r--r--tests/SelfTest/Baselines/console.std.approved.txt4
-rw-r--r--tests/SelfTest/Baselines/console.sw.approved.txt155
-rw-r--r--tests/SelfTest/Baselines/console.sw.multi.approved.txt155
-rw-r--r--tests/SelfTest/Baselines/junit.sw.approved.txt13
-rw-r--r--tests/SelfTest/Baselines/junit.sw.multi.approved.txt13
-rw-r--r--tests/SelfTest/Baselines/sonarqube.sw.approved.txt11
-rw-r--r--tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt11
-rw-r--r--tests/SelfTest/Baselines/tap.sw.approved.txt24
-rw-r--r--tests/SelfTest/Baselines/tap.sw.multi.approved.txt24
-rw-r--r--tests/SelfTest/Baselines/teamcity.sw.approved.txt12
-rw-r--r--tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt12
-rw-r--r--tests/SelfTest/Baselines/xml.sw.approved.txt156
-rw-r--r--tests/SelfTest/Baselines/xml.sw.multi.approved.txt156
-rw-r--r--tests/SelfTest/IntrospectiveTests/TestCaseInfoHasher.tests.cpp77
18 files changed, 491 insertions, 410 deletions
diff --git a/tests/SelfTest/Baselines/automake.sw.approved.txt b/tests/SelfTest/Baselines/automake.sw.approved.txt
index 9df8be0d..8da193da 100644
--- a/tests/SelfTest/Baselines/automake.sw.approved.txt
+++ b/tests/SelfTest/Baselines/automake.sw.approved.txt
@@ -155,6 +155,10 @@ Nor would this
:test-result: PASS Generators -- simple
:test-result: PASS Generators internals
:test-result: PASS Greater-than inequalities with different epsilons
+:test-result: PASS Hashers with different seed produce different hash with same test case
+:test-result: PASS Hashers with same seed produce same hash
+:test-result: PASS Hashing different test cases produces different result
+:test-result: PASS Hashing test case produces same hash across multiple calls
:test-result: FAIL INFO and WARN do not abort tests
:test-result: FAIL INFO gets logged on failure
:test-result: FAIL INFO gets logged on failure, even if captured before successful assertions
@@ -255,8 +259,6 @@ Message from section two
:test-result: PASS Test case with one argument
:test-result: PASS Test enum bit values
:test-result: PASS Test with special, characters "in name
-:test-result: PASS TestCaseInfoHasher produces different hashes.
-:test-result: PASS TestCaseInfoHasher produces equal hashes.
:test-result: PASS Testing checked-if
:test-result: XFAIL Testing checked-if 2
:test-result: XFAIL Testing checked-if 3
diff --git a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
index 10db54cd..c95a970d 100644
--- a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
@@ -153,6 +153,10 @@
:test-result: PASS Generators -- simple
:test-result: PASS Generators internals
:test-result: PASS Greater-than inequalities with different epsilons
+:test-result: PASS Hashers with different seed produce different hash with same test case
+:test-result: PASS Hashers with same seed produce same hash
+:test-result: PASS Hashing different test cases produces different result
+:test-result: PASS Hashing test case produces same hash across multiple calls
:test-result: FAIL INFO and WARN do not abort tests
:test-result: FAIL INFO gets logged on failure
:test-result: FAIL INFO gets logged on failure, even if captured before successful assertions
@@ -248,8 +252,6 @@
:test-result: PASS Test case with one argument
:test-result: PASS Test enum bit values
:test-result: PASS Test with special, characters "in name
-:test-result: PASS TestCaseInfoHasher produces different hashes.
-:test-result: PASS TestCaseInfoHasher produces equal hashes.
:test-result: PASS Testing checked-if
:test-result: XFAIL Testing checked-if 2
:test-result: XFAIL Testing checked-if 3
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index 8b404c58..f8c74732 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -916,6 +916,24 @@ Approx.tests.cpp:<line number>: passed: d >= Approx( 1.22 ) for: 1.23 >= Approx(
Approx.tests.cpp:<line number>: passed: d >= Approx( 1.23 ) for: 1.23 >= Approx( 1.23 )
Approx.tests.cpp:<line number>: passed: !(d >= Approx( 1.24 )) for: !(1.23 >= Approx( 1.24 ))
Approx.tests.cpp:<line number>: passed: d >= Approx( 1.24 ).epsilon(0.1) for: 1.23 >= Approx( 1.24 )
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h1( dummy ) != h2( dummy ) for: 3422778688 (0x<hex digits>)
+!=
+130711275 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h1( dummy ) == h2( dummy ) for: 3422778688 (0x<hex digits>)
+==
+3422778688 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) for: 2903002874 (0x<hex digits>)
+!=
+2668622104 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) for: 2673152918 (0x<hex digits>)
+!=
+3916075712 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) for: 2074929312 (0x<hex digits>)
+!=
+3429949824 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy ) == h( dummy ) for: 3422778688 (0x<hex digits>)
+==
+3422778688 (0x<hex digits>)
Message.tests.cpp:<line number>: warning: 'this is a message' with 1 message: 'this is a warning'
Message.tests.cpp:<line number>: failed: a == 1 for: 2 == 1 with 2 messages: 'this message should be logged' and 'so should this'
Message.tests.cpp:<line number>: passed: a == 2 for: 2 == 2 with 1 message: 'this message may be logged later'
@@ -1868,21 +1886,6 @@ Tag.tests.cpp:<line number>: passed: testCase.tags[0] == Tag( "tag1" ) for: {?}
VariadicMacros.tests.cpp:<line number>: passed: with 1 message: 'no assertions'
Tricky.tests.cpp:<line number>: passed: 0x<hex digits> == bit30and31 for: 3221225472 (0x<hex digits>) == 3221225472
CmdLine.tests.cpp:<line number>: passed:
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) for: 764519552 (0x<hex digits>)
-!=
-3472848544 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) for: 869111496 (0x<hex digits>)
-!=
-2870097333 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) for: 1172537240 (0x<hex digits>)
-!=
-1403724645 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: h1(testCase1) != h2(testCase2) for: 1836497244 (0x<hex digits>)
-!=
-430288597 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) == hasherWithCustomSeed(testCase2) for: 764519552 (0x<hex digits>)
-==
-764519552 (0x<hex digits>)
Misc.tests.cpp:<line number>: passed: true
Misc.tests.cpp:<line number>: passed:
Misc.tests.cpp:<line number>: failed - but was ok: false
diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
index 3b3e1eef..b9bfabd0 100644
--- a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -914,6 +914,24 @@ Approx.tests.cpp:<line number>: passed: d >= Approx( 1.22 ) for: 1.23 >= Approx(
Approx.tests.cpp:<line number>: passed: d >= Approx( 1.23 ) for: 1.23 >= Approx( 1.23 )
Approx.tests.cpp:<line number>: passed: !(d >= Approx( 1.24 )) for: !(1.23 >= Approx( 1.24 ))
Approx.tests.cpp:<line number>: passed: d >= Approx( 1.24 ).epsilon(0.1) for: 1.23 >= Approx( 1.24 )
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h1( dummy ) != h2( dummy ) for: 3422778688 (0x<hex digits>)
+!=
+130711275 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h1( dummy ) == h2( dummy ) for: 3422778688 (0x<hex digits>)
+==
+3422778688 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) for: 2903002874 (0x<hex digits>)
+!=
+2668622104 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) for: 2673152918 (0x<hex digits>)
+!=
+3916075712 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) for: 2074929312 (0x<hex digits>)
+!=
+3429949824 (0x<hex digits>)
+TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy ) == h( dummy ) for: 3422778688 (0x<hex digits>)
+==
+3422778688 (0x<hex digits>)
Message.tests.cpp:<line number>: warning: 'this is a message' with 1 message: 'this is a warning'
Message.tests.cpp:<line number>: failed: a == 1 for: 2 == 1 with 2 messages: 'this message should be logged' and 'so should this'
Message.tests.cpp:<line number>: passed: a == 2 for: 2 == 2 with 1 message: 'this message may be logged later'
@@ -1861,21 +1879,6 @@ Tag.tests.cpp:<line number>: passed: testCase.tags[0] == Tag( "tag1" ) for: {?}
VariadicMacros.tests.cpp:<line number>: passed: with 1 message: 'no assertions'
Tricky.tests.cpp:<line number>: passed: 0x<hex digits> == bit30and31 for: 3221225472 (0x<hex digits>) == 3221225472
CmdLine.tests.cpp:<line number>: passed:
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) for: 764519552 (0x<hex digits>)
-!=
-3472848544 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) for: 869111496 (0x<hex digits>)
-!=
-2870097333 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) for: 1172537240 (0x<hex digits>)
-!=
-1403724645 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: h1(testCase1) != h2(testCase2) for: 1836497244 (0x<hex digits>)
-!=
-430288597 (0x<hex digits>)
-TestCaseInfoHasher.tests.cpp:<line number>: passed: hasherWithCustomSeed(testCase1) == hasherWithCustomSeed(testCase2) for: 764519552 (0x<hex digits>)
-==
-764519552 (0x<hex digits>)
Misc.tests.cpp:<line number>: passed: true
Misc.tests.cpp:<line number>: passed:
Misc.tests.cpp:<line number>: failed - but was ok: false
diff --git a/tests/SelfTest/Baselines/console.std.approved.txt b/tests/SelfTest/Baselines/console.std.approved.txt
index 61b1a112..a6847cdf 100644
--- a/tests/SelfTest/Baselines/console.std.approved.txt
+++ b/tests/SelfTest/Baselines/console.std.approved.txt
@@ -1395,6 +1395,6 @@ due to unexpected exception with message:
Why would you throw a std::string?
===============================================================================
-test cases: 388 | 312 passed | 69 failed | 7 failed as expected
-assertions: 2224 | 2069 passed | 128 failed | 27 failed as expected
+test cases: 390 | 314 passed | 69 failed | 7 failed as expected
+assertions: 2225 | 2070 passed | 128 failed | 27 failed as expected
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index 148a3b53..d3476456 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -6833,6 +6833,87 @@ with expansion:
1.23 >= Approx( 1.24 )
-------------------------------------------------------------------------------
+Hashers with different seed produce different hash with same test case
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h1( dummy ) != h2( dummy ) )
+with expansion:
+ 3422778688 (0x<hex digits>)
+ !=
+ 130711275 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashers with same seed produce same hash
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h1( dummy ) == h2( dummy ) )
+with expansion:
+ 3422778688 (0x<hex digits>)
+ ==
+ 3422778688 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing different test cases produces different result
+ Different test name
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy1 ) != h( dummy2 ) )
+with expansion:
+ 2903002874 (0x<hex digits>)
+ !=
+ 2668622104 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing different test cases produces different result
+ Different classname
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy1 ) != h( dummy2 ) )
+with expansion:
+ 2673152918 (0x<hex digits>)
+ !=
+ 3916075712 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing different test cases produces different result
+ Different tags
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy1 ) != h( dummy2 ) )
+with expansion:
+ 2074929312 (0x<hex digits>)
+ !=
+ 3429949824 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing test case produces same hash across multiple calls
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy ) == h( dummy ) )
+with expansion:
+ 3422778688 (0x<hex digits>)
+ ==
+ 3422778688 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
INFO and WARN do not abort tests
-------------------------------------------------------------------------------
Message.tests.cpp:<line number>
@@ -13287,76 +13368,6 @@ CmdLine.tests.cpp:<line number>
CmdLine.tests.cpp:<line number>: PASSED:
-------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- class names are equal, names are equal but tags are different.
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) )
-with expansion:
- 764519552 (0x<hex digits>)
- !=
- 3472848544 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- class names are equal, tags are equal but names are different
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) )
-with expansion:
- 869111496 (0x<hex digits>)
- !=
- 2870097333 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- names are equal, tags are equal but class names are different
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) )
-with expansion:
- 1172537240 (0x<hex digits>)
- !=
- 1403724645 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- class names and names and tags are equal but hashers are seeded differently.
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( h1(testCase1) != h2(testCase2) )
-with expansion:
- 1836497244 (0x<hex digits>)
- !=
- 430288597 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces equal hashes.
- class names and names and tags are equal.
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) == hasherWithCustomSeed(testCase2) )
-with expansion:
- 764519552 (0x<hex digits>)
- ==
- 764519552 (0x<hex digits>)
-
--------------------------------------------------------------------------------
Testing checked-if
-------------------------------------------------------------------------------
Misc.tests.cpp:<line number>
@@ -17941,6 +17952,6 @@ Misc.tests.cpp:<line number>
Misc.tests.cpp:<line number>: PASSED:
===============================================================================
-test cases: 388 | 298 passed | 83 failed | 7 failed as expected
-assertions: 2239 | 2069 passed | 143 failed | 27 failed as expected
+test cases: 390 | 300 passed | 83 failed | 7 failed as expected
+assertions: 2240 | 2070 passed | 143 failed | 27 failed as expected
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index 412303da..3cfef5e2 100644
--- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -6831,6 +6831,87 @@ with expansion:
1.23 >= Approx( 1.24 )
-------------------------------------------------------------------------------
+Hashers with different seed produce different hash with same test case
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h1( dummy ) != h2( dummy ) )
+with expansion:
+ 3422778688 (0x<hex digits>)
+ !=
+ 130711275 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashers with same seed produce same hash
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h1( dummy ) == h2( dummy ) )
+with expansion:
+ 3422778688 (0x<hex digits>)
+ ==
+ 3422778688 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing different test cases produces different result
+ Different test name
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy1 ) != h( dummy2 ) )
+with expansion:
+ 2903002874 (0x<hex digits>)
+ !=
+ 2668622104 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing different test cases produces different result
+ Different classname
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy1 ) != h( dummy2 ) )
+with expansion:
+ 2673152918 (0x<hex digits>)
+ !=
+ 3916075712 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing different test cases produces different result
+ Different tags
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy1 ) != h( dummy2 ) )
+with expansion:
+ 2074929312 (0x<hex digits>)
+ !=
+ 3429949824 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
+Hashing test case produces same hash across multiple calls
+-------------------------------------------------------------------------------
+TestCaseInfoHasher.tests.cpp:<line number>
+...............................................................................
+
+TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
+ REQUIRE( h( dummy ) == h( dummy ) )
+with expansion:
+ 3422778688 (0x<hex digits>)
+ ==
+ 3422778688 (0x<hex digits>)
+
+-------------------------------------------------------------------------------
INFO and WARN do not abort tests
-------------------------------------------------------------------------------
Message.tests.cpp:<line number>
@@ -13280,76 +13361,6 @@ CmdLine.tests.cpp:<line number>
CmdLine.tests.cpp:<line number>: PASSED:
-------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- class names are equal, names are equal but tags are different.
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) )
-with expansion:
- 764519552 (0x<hex digits>)
- !=
- 3472848544 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- class names are equal, tags are equal but names are different
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) )
-with expansion:
- 869111496 (0x<hex digits>)
- !=
- 2870097333 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- names are equal, tags are equal but class names are different
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) != hasherWithCustomSeed(testCase2) )
-with expansion:
- 1172537240 (0x<hex digits>)
- !=
- 1403724645 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces different hashes.
- class names and names and tags are equal but hashers are seeded differently.
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( h1(testCase1) != h2(testCase2) )
-with expansion:
- 1836497244 (0x<hex digits>)
- !=
- 430288597 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-TestCaseInfoHasher produces equal hashes.
- class names and names and tags are equal.
--------------------------------------------------------------------------------
-TestCaseInfoHasher.tests.cpp:<line number>
-...............................................................................
-
-TestCaseInfoHasher.tests.cpp:<line number>: PASSED:
- CHECK( hasherWithCustomSeed(testCase1) == hasherWithCustomSeed(testCase2) )
-with expansion:
- 764519552 (0x<hex digits>)
- ==
- 764519552 (0x<hex digits>)
-
--------------------------------------------------------------------------------
Testing checked-if
-------------------------------------------------------------------------------
Misc.tests.cpp:<line number>
@@ -17933,6 +17944,6 @@ Misc.tests.cpp:<line number>
Misc.tests.cpp:<line number>: PASSED:
===============================================================================
-test cases: 388 | 298 passed | 83 failed | 7 failed as expected
-assertions: 2239 | 2069 passed | 143 failed | 27 failed as expected
+test cases: 390 | 300 passed | 83 failed | 7 failed as expected
+assertions: 2240 | 2070 passed | 143 failed | 27 failed as expected
diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt
index 7c82e5b3..519fdfbc 100644
--- a/tests/SelfTest/Baselines/junit.sw.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuitesloose text artifact
>
- <testsuite name="<exe-name>" errors="17" failures="126" tests="2239" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+ <testsuite name="<exe-name>" errors="17" failures="126" tests="2240" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<properties>
<property name="random-seed" value="1"/>
<property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
@@ -728,6 +728,12 @@ Message.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="Generators internals/Range/Negative manual step/Integer/Slightly over end" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Generators internals/Range/Negative manual step/Integer/Slightly under end" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Greater-than inequalities with different epsilons" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashers with different seed produce different hash with same test case" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashers with same seed produce same hash" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashing different test cases produces different result/Different test name" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashing different test cases produces different result/Different classname" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashing different test cases produces different result/Different tags" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashing test case produces same hash across multiple calls" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="INFO and WARN do not abort tests" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="INFO gets logged on failure" time="{duration}" status="run">
<failure message="a == 1" type="REQUIRE">
@@ -1355,11 +1361,6 @@ Misc.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="Test case with one argument" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Test enum bit values" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Test with special, characters &quot;in name" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="TestCaseInfoHasher produces different hashes./class names are equal, names are equal but tags are different." time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="TestCaseInfoHasher produces different hashes./class names are equal, tags are equal but names are different" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="TestCaseInfoHasher produces different hashes./names are equal, tags are equal but class names are different" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="TestCaseInfoHasher produces different hashes./class names and names and tags are equal but hashers are seeded differently." time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="TestCaseInfoHasher produces equal hashes./class names and names and tags are equal." time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Testing checked-if" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Testing checked-if 2" time="{duration}" status="run">
<skipped message="TEST_CASE tagged with !mayfail"/>
diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
index d850f16a..567b7ab7 100644
--- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
- <testsuite name="<exe-name>" errors="17" failures="126" tests="2239" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+ <testsuite name="<exe-name>" errors="17" failures="126" tests="2240" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<properties>
<property name="random-seed" value="1"/>
<property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
@@ -727,6 +727,12 @@ Message.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="Generators internals/Range/Negative manual step/Integer/Slightly over end" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Generators internals/Range/Negative manual step/Integer/Slightly under end" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="Greater-than inequalities with different epsilons" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashers with different seed produce different hash with same test case" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="Hashers with same seed produce same h