Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Remove duplicated test for #1027

Commit
33c58dad419ccce92882e9edbe4fc6124bc193ee
Author
Martin Hořeňovský ·
Parents
68061bbed4d2

Files · Download .tar.gz

Changes

 tests/SelfTest/Baselines/automake.sw.approved.txt  |  1 -
 tests/SelfTest/Baselines/compact.sw.approved.txt   |  2 --
 tests/SelfTest/Baselines/console.std.approved.txt  |  4 ++--
 tests/SelfTest/Baselines/console.sw.approved.txt   | 20 ++-----------------
 tests/SelfTest/Baselines/console.swa4.approved.txt | 20 ++-----------------
 tests/SelfTest/Baselines/junit.sw.approved.txt     |  3 +--
 tests/SelfTest/Baselines/sonarqube.sw.approved.txt |  1 -
 tests/SelfTest/Baselines/tap.sw.approved.txt       |  6 +-----
 tests/SelfTest/Baselines/teamcity.sw.approved.txt  |  2 --
 tests/SelfTest/Baselines/xml.sw.approved.txt       | 23 ++--------------------
 tests/SelfTest/UsageTests/Compilation.tests.cpp    | 21 +++++---------------
 11 files changed, 15 insertions(+), 88 deletions(-)

diff --git a/tests/SelfTest/Baselines/automake.sw.approved.txt b/tests/SelfTest/Baselines/automake.sw.approved.txt
index 7779e17b..88a43ede 100644
--- a/tests/SelfTest/Baselines/automake.sw.approved.txt
+++ b/tests/SelfTest/Baselines/automake.sw.approved.txt
@@ -1,6 +1,5 @@
 :test-result: PASS # A test name that starts with a #
 :test-result: PASS #1005: Comparing pointer to int and long (NULL can be either on various systems)
-:test-result: PASS #1027
 :test-result: PASS #1027: Bitfields can be captured
 :test-result: PASS #1147
 :test-result: PASS #1175 - Hidden Test
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index d505f9b6..dc97d4d6 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -3,8 +3,6 @@ Decomposition.tests.cpp:<line number>: passed: fptr == 0 for: 0 == 0
 Decomposition.tests.cpp:<line number>: passed: fptr == 0l for: 0 == 0
 Compilation.tests.cpp:<line number>: passed: y.v == 0 for: 0 == 0
 Compilation.tests.cpp:<line number>: passed: 0 == y.v for: 0 == 0
-Compilation.tests.cpp:<line number>: passed: y.v == 0 for: 0 == 0
-Compilation.tests.cpp:<line number>: passed: 0 == y.v for: 0 == 0
 Compilation.tests.cpp:<line number>: passed: t1 == t2 for: {?} == {?}
 Compilation.tests.cpp:<line number>: passed: t1 != t2 for: {?} != {?}
 Compilation.tests.cpp:<line number>: passed: t1 < t2 for: {?} < {?}
diff --git a/tests/SelfTest/Baselines/console.std.approved.txt b/tests/SelfTest/Baselines/console.std.approved.txt
index 0fb3f0b2..c5aca7e9 100644
--- a/tests/SelfTest/Baselines/console.std.approved.txt
+++ b/tests/SelfTest/Baselines/console.std.approved.txt
@@ -1380,6 +1380,6 @@ due to unexpected exception with message:
   Why would you throw a std::string?
 
 ===============================================================================
-test cases:  335 |  261 passed |  70 failed |  4 failed as expected
-assertions: 1897 | 1745 passed | 131 failed | 21 failed as expected
+test cases:  334 |  260 passed |  70 failed |  4 failed as expected
+assertions: 1895 | 1743 passed | 131 failed | 21 failed as expected
 
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index 6818786f..efdfab53 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -33,22 +33,6 @@ Decomposition.tests.cpp:<line number>: PASSED:
 with expansion:
   0 == 0
 
--------------------------------------------------------------------------------
-#1027
--------------------------------------------------------------------------------
-Compilation.tests.cpp:<line number>
-...............................................................................
-
-Compilation.tests.cpp:<line number>: PASSED:
-  REQUIRE( y.v == 0 )
-with expansion:
-  0 == 0
-
-Compilation.tests.cpp:<line number>: PASSED:
-  REQUIRE( 0 == y.v )
-with expansion:
-  0 == 0
-
 -------------------------------------------------------------------------------
 #1027: Bitfields can be captured
 -------------------------------------------------------------------------------
@@ -14804,6 +14788,6 @@ Misc.tests.cpp:<line number>
 Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
-test cases:  335 |  245 passed |  86 failed |  4 failed as expected
-assertions: 1914 | 1745 passed | 148 failed | 21 failed as expected
+test cases:  334 |  244 passed |  86 failed |  4 failed as expected
+assertions: 1912 | 1743 passed | 148 failed | 21 failed as expected
 
diff --git a/tests/SelfTest/Baselines/console.swa4.approved.txt b/tests/SelfTest/Baselines/console.swa4.approved.txt
index cf37da74..bb7ee973 100644
--- a/tests/SelfTest/Baselines/console.swa4.approved.txt
+++ b/tests/SelfTest/Baselines/console.swa4.approved.txt
@@ -33,22 +33,6 @@ Decomposition.tests.cpp:<line number>: PASSED:
 with expansion:
   0 == 0
 
--------------------------------------------------------------------------------
-#1027
--------------------------------------------------------------------------------
-Compilation.tests.cpp:<line number>
-...............................................................................
-
-Compilation.tests.cpp:<line number>: PASSED:
-  REQUIRE( y.v == 0 )
-with expansion:
-  0 == 0
-
-Compilation.tests.cpp:<line number>: PASSED:
-  REQUIRE( 0 == y.v )
-with expansion:
-  0 == 0
-
 -------------------------------------------------------------------------------
 #1027: Bitfields can be captured
 -------------------------------------------------------------------------------
@@ -432,6 +416,6 @@ Condition.tests.cpp:<line number>: FAILED:
   CHECK( true != true )
 
 ===============================================================================
-test cases: 22 | 17 passed | 3 failed | 2 failed as expected
-assertions: 50 | 43 passed | 4 failed | 3 failed as expected
+test cases: 21 | 16 passed | 3 failed | 2 failed as expected
+assertions: 48 | 41 passed | 4 failed | 3 failed as expected
 
diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt
index 26044c54..4ae272ba 100644
--- a/tests/SelfTest/Baselines/junit.sw.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesloose text artifact
 >
-  <testsuite name="<exe-name>" errors="17" failures="132" tests="1915" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="132" tests="1913" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
       <property name="random-seed" value="1"/>
     </properties>
     <testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}"/>
-    <testcase classname="<exe-name>.global" name="#1027" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#1027: Bitfields can be captured" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#1147" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#1175 - Hidden Test" time="{duration}"/>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
index 60bbe28d..42422727 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -385,7 +385,6 @@ Class.tests.cpp:<line number>
     <testCase name="Template test case method with test types specified inside std::tuple - MyTypes - 2" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/UsageTests/Compilation.tests.cpp">
-    <testCase name="#1027" duration="{duration}"/>
     <testCase name="#1027: Bitfields can be captured" duration="{duration}"/>
     <testCase name="#1147" duration="{duration}"/>
     <testCase name="#1238" duration="{duration}"/>
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index f7a5aeb7..d31e82ff 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -4,10 +4,6 @@ ok {test-number} - with 1 message: 'yay'
 ok {test-number} - fptr == 0 for: 0 == 0
 # #1005: Comparing pointer to int and long (NULL can be either on various systems)
 ok {test-number} - fptr == 0l for: 0 == 0
-# #1027
-ok {test-number} - y.v == 0 for: 0 == 0
-# #1027
-ok {test-number} - 0 == y.v for: 0 == 0
 # #1027: Bitfields can be captured
 ok {test-number} - y.v == 0 for: 0 == 0
 # #1027: Bitfields can be captured
@@ -3820,5 +3816,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
 ok {test-number} -
 # xmlentitycheck
 ok {test-number} -
-1..1906
+1..1904
 
diff --git a/tests/SelfTest/Baselines/teamcity.sw.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.approved.txt
index 3594ed22..b73aa2e9 100644
--- a/tests/SelfTest/Baselines/teamcity.sw.approved.txt
+++ b/tests/SelfTest/Baselines/teamcity.sw.approved.txt
@@ -3,8 +3,6 @@
 ##teamcity[testFinished name='# A test name that starts with a #' duration="{duration}"]
 ##teamcity[testStarted name='#1005: Comparing pointer to int and long (NULL can be either on various systems)']
 ##teamcity[testFinished name='#1005: Comparing pointer to int and long (NULL can be either on various systems)' duration="{duration}"]
-##teamcity[testStarted name='#1027']
-##teamcity[testFinished name='#1027' duration="{duration}"]
 ##teamcity[testStarted name='#1027: Bitfields can be captured']
 ##teamcity[testFinished name='#1027: Bitfields can be captured' duration="{duration}"]
 ##teamcity[testStarted name='#1147']
diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt
index 70de0b73..340e1931 100644
--- a/tests/SelfTest/Baselines/xml.sw.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.approved.txt
@@ -24,25 +24,6 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#1027" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
-      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
-        <Original>
-          y.v == 0
-        </Original>
-        <Expanded>
-          0 == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
-        <Original>
-          0 == y.v
-        </Original>
-        <Expanded>
-          0 == 0
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
     <TestCase name="#1027: Bitfields can be captured" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
         <Original>
@@ -17775,7 +17756,7 @@ loose text artifact
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="1745" failures="149" expectedFailures="21"/>
+    <OverallResults successes="1743" failures="149" expectedFailures="21"/>
   </Group>
-  <OverallResults successes="1745" failures="148" expectedFailures="21"/>
+  <OverallResults successes="1743" failures="148" expectedFailures="21"/>
 </Catch>
diff --git a/tests/SelfTest/UsageTests/Compilation.tests.cpp b/tests/SelfTest/UsageTests/Compilation.tests.cpp
index 9e4211ff..0f339cb8 100644
--- a/tests/SelfTest/UsageTests/Compilation.tests.cpp
+++ b/tests/SelfTest/UsageTests/Compilation.tests.cpp
@@ -61,10 +61,6 @@ namespace { namespace CompilationTests {
         return val == f.i;
     }
 
-    struct Y {
-        uint32_t v : 1;
-    };
-
     void throws_int(bool b) {
         if (b) {
             throw 1;
@@ -142,9 +138,11 @@ namespace { namespace CompilationTests {
         REQUIRE (x == 4);
     }
 
-
-    TEST_CASE("#1027") {
-        Y y{0};
+    TEST_CASE("#1027: Bitfields can be captured") {
+        struct Y {
+            uint32_t v : 1;
+        };
+        Y y{ 0 };
         REQUIRE(y.v == 0);
         REQUIRE(0 == y.v);
     }
@@ -216,15 +214,6 @@ namespace { namespace CompilationTests {
 #pragma warning(pop)
 #endif
 
-    TEST_CASE( "#1027: Bitfields can be captured" ) {
-        struct Y {
-            uint32_t v : 1;
-        };
-        Y y{ 0 };
-        REQUIRE( y.v == 0 );
-        REQUIRE( 0 == y.v );
-    }
-
     TEST_CASE("#1319: Sections can have description (even if it is not saved", "[compilation]") {
         SECTION("SectionName", "This is a long form section description") {
             SUCCEED();