Add approval test with capture

snitch-org · Sep 27, 2024 · d76f2d1 · d76f2d1
1 parent 7f75d68
commit d76f2d1
Show file tree

Hide file tree

Showing 11 changed files with 206 additions and 8 deletions.
diff --git a/tests/approval_tests/data/expected/reporter_catch2_xml_default b/tests/approval_tests/data/expected/reporter_catch2_xml_default
@@ -388,6 +388,45 @@
     </Failure>
     <OverallResult success="false" skips="0" durationInSeconds="*"/>
   </TestCase>
+  <TestCase name="test SECTION &amp; CAPTURE" tags="" filename="*testing_reporters.cpp" line="*">
+    <Section name="section 1" filename="*testing_reporters.cpp" line="*">
+      <Info>
+        i := 1
+      </Info>
+      <Info>
+        j := 2
+      </Info>
+      <Failure filename="*testing_reporters.cpp" line="*">
+        failure 1
+      </Failure>
+      <OverallResults successes="0" failures="1" expectedFailures="0" skipped="false" durationInSeconds="*"/>
+    </Section>
+    <Info>
+      i := 1
+    </Info>
+    <Failure filename="*testing_reporters.cpp" line="*">
+      failure 3
+    </Failure>
+    <Section name="section 2" filename="*testing_reporters.cpp" line="*">
+      <Info>
+        i := 1
+      </Info>
+      <Info>
+        j := 3
+      </Info>
+      <Failure filename="*testing_reporters.cpp" line="*">
+        failure 2
+      </Failure>
+      <OverallResults successes="0" failures="1" expectedFailures="0" skipped="false" durationInSeconds="*"/>
+    </Section>
+    <Info>
+      i := 1
+    </Info>
+    <Failure filename="*testing_reporters.cpp" line="*">
+      failure 3
+    </Failure>
+    <OverallResult success="false" skips="0" durationInSeconds="*"/>
+  </TestCase>
   <TestCase name="test SKIP in SECTION" tags="" filename="*testing_reporters.cpp" line="*">
     <Section name="section 1" filename="*testing_reporters.cpp" line="*">
       <Section name="section 2" filename="*testing_reporters.cpp" line="*">
@@ -412,6 +451,6 @@
     </Failure>
     <OverallResult success="false" skips="0" durationInSeconds="*"/>
   </TestCase>
-  <OverallResults successes="42" failures="44" expectedFailures="2" skips="2"/>
-  <OverallResultsCases successes="16" failures="27" expectedFailures="2" skips="2"/>
+  <OverallResults successes="43" failures="48" expectedFailures="2" skips="2"/>
+  <OverallResultsCases successes="16" failures="28" expectedFailures="2" skips="2"/>
 </Catch2TestRun>
diff --git a/tests/approval_tests/data/expected/reporter_catch2_xml_full b/tests/approval_tests/data/expected/reporter_catch2_xml_full
@@ -529,6 +529,48 @@
     </Success>
     <OverallResult success="false" skips="0" durationInSeconds="*"/>
   </TestCase>
+  <TestCase name="test SECTION &amp; CAPTURE" tags="" filename="*testing_reporters.cpp" line="*">
+    <Section name="section 1" filename="*testing_reporters.cpp" line="*">
+      <Info>
+        i := 1
+      </Info>
+      <Info>
+        j := 2
+      </Info>
+      <Failure filename="*testing_reporters.cpp" line="*">
+        failure 1
+      </Failure>
+      <OverallResults successes="0" failures="1" expectedFailures="0" skipped="false" durationInSeconds="*"/>
+    </Section>
+    <Info>
+      i := 1
+    </Info>
+    <Failure filename="*testing_reporters.cpp" line="*">
+      failure 3
+    </Failure>
+    <Section name="section 2" filename="*testing_reporters.cpp" line="*">
+      <Info>
+        i := 1
+      </Info>
+      <Info>
+        j := 3
+      </Info>
+      <Failure filename="*testing_reporters.cpp" line="*">
+        failure 2
+      </Failure>
+      <OverallResults successes="0" failures="1" expectedFailures="0" skipped="false" durationInSeconds="*"/>
+    </Section>
+    <Info>
+      i := 1
+    </Info>
+    <Failure filename="*testing_reporters.cpp" line="*">
+      failure 3
+    </Failure>
+    <Success filename="*testing_reporters.cpp" line="*">
+      no exception caught
+    </Success>
+    <OverallResult success="false" skips="0" durationInSeconds="*"/>
+  </TestCase>
   <TestCase name="test SKIP in SECTION" tags="" filename="*testing_reporters.cpp" line="*">
     <Section name="section 1" filename="*testing_reporters.cpp" line="*">
       <Section name="section 2" filename="*testing_reporters.cpp" line="*">
@@ -553,6 +595,6 @@
     </Failure>
     <OverallResult success="false" skips="0" durationInSeconds="*"/>
   </TestCase>
-  <OverallResults successes="42" failures="44" expectedFailures="2" skips="2"/>
-  <OverallResultsCases successes="16" failures="27" expectedFailures="2" skips="2"/>
+  <OverallResults successes="43" failures="48" expectedFailures="2" skips="2"/>
+  <OverallResultsCases successes="16" failures="28" expectedFailures="2" skips="2"/>
 </Catch2TestRun>
diff --git a/tests/approval_tests/data/expected/reporter_catch2_xml_list_tests b/tests/approval_tests/data/expected/reporter_catch2_xml_list_tests
@@ -378,6 +378,15 @@
       <Line>*</Line>
     </SourceInfo>
   </TestCase>
+  <TestCase>
+    <Name>test SECTION &amp; CAPTURE</Name>
+    <ClassName/>
+    <Tags/>
+    <SourceInfo>
+      <File>*testing_reporters.cpp</File>
+      <Line>*</Line>
+    </SourceInfo>
+  </TestCase>
   <TestCase>
     <Name>test SKIP in SECTION</Name>
     <ClassName/>

diff --git a/tests/approval_tests/data/expected/reporter_console_default b/tests/approval_tests/data/expected/reporter_console_default
@@ -169,10 +169,30 @@ failed: running test case "test SECTION & INFO"
           at *testing_reporters.cpp:*
           with info 1
           failure 3
+failed: running test case "test SECTION & CAPTURE"
+          in section "section 1"
+          at *testing_reporters.cpp:*
+          with i := 1
+          with j := 2
+          failure 1
+failed: running test case "test SECTION & CAPTURE"
+          at *testing_reporters.cpp:*
+          with i := 1
+          failure 3
+failed: running test case "test SECTION & CAPTURE"
+          in section "section 2"
+          at *testing_reporters.cpp:*
+          with i := 1
+          with j := 3
+          failure 2
+failed: running test case "test SECTION & CAPTURE"
+          at *testing_reporters.cpp:*
+          with i := 1
+          failure 3
 skipped: running test case "test SKIP in SECTION"
           in section "section 1"
           in section "section 2"
           at *testing_reporters.cpp:*
           stopping here
 ==========================================
-error: some tests failed (25 out of 43 test cases, 86 assertions, 2 test cases skipped, * seconds)
+error: some tests failed (26 out of 44 test cases, 91 assertions, 2 test cases skipped, * seconds)
diff --git a/tests/approval_tests/data/expected/reporter_console_full b/tests/approval_tests/data/expected/reporter_console_full
@@ -409,6 +409,35 @@ passed: running test case "test SECTION & INFO"
           at *testing_reporters.cpp:*
           no exception caught
 finished: test SECTION & INFO (*)
+starting: test SECTION & CAPTURE at *testing_reporters.cpp:*
+entering section: section 1 at *testing_reporters.cpp:*
+failed: running test case "test SECTION & CAPTURE"
+          in section "section 1"
+          at *testing_reporters.cpp:*
+          with i := 1
+          with j := 2
+          failure 1
+leaving section: section 1
+failed: running test case "test SECTION & CAPTURE"
+          at *testing_reporters.cpp:*
+          with i := 1
+          failure 3
+entering section: section 2 at *testing_reporters.cpp:*
+failed: running test case "test SECTION & CAPTURE"
+          in section "section 2"
+          at *testing_reporters.cpp:*
+          with i := 1
+          with j := 3
+          failure 2
+leaving section: section 2
+failed: running test case "test SECTION & CAPTURE"
+          at *testing_reporters.cpp:*
+          with i := 1
+          failure 3
+passed: running test case "test SECTION & CAPTURE"
+          at *testing_reporters.cpp:*
+          no exception caught
+finished: test SECTION & CAPTURE (*)
 starting: test SKIP in SECTION at *testing_reporters.cpp:*
 entering section: section 1 at *testing_reporters.cpp:*
 entering section: section 2 at *testing_reporters.cpp:*
@@ -421,4 +450,4 @@ leaving section: section 2
 leaving section: section 1
 finished: test SKIP in SECTION (*)
 ==========================================
-error: some tests failed (25 out of 43 test cases, 86 assertions, 2 test cases skipped, * seconds)
+error: some tests failed (26 out of 44 test cases, 91 assertions, 2 test cases skipped, * seconds)
diff --git a/tests/approval_tests/data/expected/reporter_console_list_tests b/tests/approval_tests/data/expected/reporter_console_list_tests
@@ -53,5 +53,6 @@ Matching test cases:
   test SECTION
   test multiple SECTION
   test SECTION & INFO
+  test SECTION & CAPTURE
   test SKIP in SECTION
-43 matching test cases
+44 matching test cases
diff --git a/tests/approval_tests/data/expected/reporter_console_withcolor b/tests/approval_tests/data/expected/reporter_console_withcolor
@@ -169,10 +169,30 @@
           at *testing_reporters.cpp:*
           with [1;35minfo 1[0m
           [1;36mfailure 3[0m
+[1;31mfailed: [0mrunning test case "[1;35mtest SECTION & CAPTURE[0m"
+          in section "[1;35msection 1[0m"
+          at *testing_reporters.cpp:*
+          with [1;35mi := 1[0m
+          with [1;35mj := 2[0m
+          [1;36mfailure 1[0m
+[1;31mfailed: [0mrunning test case "[1;35mtest SECTION & CAPTURE[0m"
+          at *testing_reporters.cpp:*
+          with [1;35mi := 1[0m
+          [1;36mfailure 3[0m
+[1;31mfailed: [0mrunning test case "[1;35mtest SECTION & CAPTURE[0m"
+          in section "[1;35msection 2[0m"
+          at *testing_reporters.cpp:*
+          with [1;35mi := 1[0m
+          with [1;35mj := 3[0m
+          [1;36mfailure 2[0m
+[1;31mfailed: [0mrunning test case "[1;35mtest SECTION & CAPTURE[0m"
+          at *testing_reporters.cpp:*
+          with [1;35mi := 1[0m
+          [1;36mfailure 3[0m
 [1;33mskipped: [0mrunning test case "[1;35mtest SKIP in SECTION[0m"
           in section "[1;35msection 1[0m"
           in section "[1;35msection 2[0m"
           at *testing_reporters.cpp:*
           [1;36mstopping here[0m
 ==========================================
-[1;31merror:[0m some tests failed (25 out of 43 test cases, 86 assertions, 2 test cases skipped, * seconds)
+[1;31merror:[0m some tests failed (26 out of 44 test cases, 91 assertions, 2 test cases skipped, * seconds)
diff --git a/tests/approval_tests/data/expected/reporter_teamcity_default b/tests/approval_tests/data/expected/reporter_teamcity_default
@@ -150,6 +150,16 @@
 ##teamCity[blockClosed name='section 2']
 ##teamCity[testFailed name='test SECTION & INFO' message='*testing_reporters.cpp:*|ninfo 1|n  failure 3']
 ##teamCity[testFinished name='test SECTION & INFO' duration='*']
+##teamCity[testStarted name='test SECTION & CAPTURE']
+##teamCity[blockOpened name='section 1' description='']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|nsection 1|ni := 1|nj := 2|n  failure 1']
+##teamCity[blockClosed name='section 1']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|ni := 1|n  failure 3']
+##teamCity[blockOpened name='section 2' description='']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|nsection 2|ni := 1|nj := 3|n  failure 2']
+##teamCity[blockClosed name='section 2']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|ni := 1|n  failure 3']
+##teamCity[testFinished name='test SECTION & CAPTURE' duration='*']
 ##teamCity[testStarted name='test SKIP in SECTION']
 ##teamCity[blockOpened name='section 1' description='']
 ##teamCity[blockOpened name='section 2' description='']

diff --git a/tests/approval_tests/data/expected/reporter_teamcity_full b/tests/approval_tests/data/expected/reporter_teamcity_full
@@ -192,6 +192,17 @@
 ##teamCity[testFailed name='test SECTION & INFO' message='*testing_reporters.cpp:*|ninfo 1|n  failure 3']
 ##teamCity[testStdOut name='test SECTION & INFO' out='*testing_reporters.cpp:*|n  no exception caught']
 ##teamCity[testFinished name='test SECTION & INFO' duration='*']
+##teamCity[testStarted name='test SECTION & CAPTURE']
+##teamCity[blockOpened name='section 1' description='']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|nsection 1|ni := 1|nj := 2|n  failure 1']
+##teamCity[blockClosed name='section 1']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|ni := 1|n  failure 3']
+##teamCity[blockOpened name='section 2' description='']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|nsection 2|ni := 1|nj := 3|n  failure 2']
+##teamCity[blockClosed name='section 2']
+##teamCity[testFailed name='test SECTION & CAPTURE' message='*testing_reporters.cpp:*|ni := 1|n  failure 3']
+##teamCity[testStdOut name='test SECTION & CAPTURE' out='*testing_reporters.cpp:*|n  no exception caught']
+##teamCity[testFinished name='test SECTION & CAPTURE' duration='*']
 ##teamCity[testStarted name='test SKIP in SECTION']
 ##teamCity[blockOpened name='section 1' description='']
 ##teamCity[blockOpened name='section 2' description='']

diff --git a/tests/approval_tests/data/expected/reporter_teamcity_list_tests b/tests/approval_tests/data/expected/reporter_teamcity_list_tests
@@ -40,6 +40,7 @@ test multiple INFO
 test SECTION
 test multiple SECTION
 test SECTION & INFO
+test SECTION & CAPTURE
 test SKIP in SECTION
 test escape |||'|n|r|[|]
 test escape very long
diff --git a/tests/testing_reporters.cpp b/tests/testing_reporters.cpp
@@ -195,6 +195,22 @@ void register_tests_for_reporters(snitch::registry& r) {
         SNITCH_FAIL_CHECK("failure 3");
     });
 
+    r.add({"test SECTION & CAPTURE"}, SNITCH_CURRENT_LOCATION, []() {
+        int i = 1;
+        SNITCH_CAPTURE(i);
+        SNITCH_SECTION("section 1") {
+            int j = 2;
+            SNITCH_CAPTURE(j);
+            SNITCH_FAIL_CHECK("failure 1");
+        }
+        SNITCH_SECTION("section 2") {
+            int j = 3;
+            SNITCH_CAPTURE(j);
+            SNITCH_FAIL_CHECK("failure 2");
+        }
+        SNITCH_FAIL_CHECK("failure 3");
+    });
+
     r.add({"test SKIP in SECTION"}, SNITCH_CURRENT_LOCATION, []() {
         SNITCH_SECTION("section 1") {
             SNITCH_SECTION("section 2") {