fixed #282

7 files changed, 55 insertions, 8 deletions

diff --git a/examples/all_features/subcases.cpp b/examples/all_features/subcases.cpp
index 8fb49a9..8becba0 100644
--- a/examples/all_features/subcases.cpp
+++ b/examples/all_features/subcases.cpp
@@ -113,3 +113,27 @@ TEST_CASE("fails from an exception but gets re-entered to traverse all subcases"
         throw_if(true, "failure... but the show must go on!");
     }
 }
+
+static void checks(int data)
+{
+    DOCTEST_SUBCASE("check data 1") { REQUIRE(data % 2 == 0); }
+    DOCTEST_SUBCASE("check data 2") { REQUIRE(data % 4 == 0); }
+}
+
+TEST_CASE("Nested - related to https://github.com/onqtam/doctest/issues/282")
+{
+    DOCTEST_SUBCASE("generate data variant 1")
+    {
+        int data(44);
+        
+        // checks
+        checks(data);
+    }
+    DOCTEST_SUBCASE("generate data variant 1")
+    {
+        int data(80);
+        
+        // checks (identical in both variants)
+        checks(data);
+    }
+}
diff --git a/examples/all_features/test_output/filter_2.txt b/examples/all_features/test_output/filter_2.txt
index 2c565bb..bb80ff8 100644
--- a/examples/all_features/test_output/filter_2.txt
+++ b/examples/all_features/test_output/filter_2.txt
@@ -1,6 +1,6 @@
 [doctest] run with "--help" for options
 ===============================================================================
-[doctest] test cases:      0 |      0 passed |      0 failed |     76 skipped
+[doctest] test cases:      0 |      0 passed |      0 failed |     77 skipped
 [doctest] assertions:      0 |      0 passed |      0 failed |
 [doctest] Status: SUCCESS!
 Program code.
diff --git a/examples/all_features/test_output/filter_2_xml.txt b/examples/all_features/test_output/filter_2_xml.txt
index 4a6a03a..8539325 100644
--- a/examples/all_features/test_output/filter_2_xml.txt
+++ b/examples/all_features/test_output/filter_2_xml.txt
@@ -4,6 +4,7 @@
   <TestSuite>
     <TestCase name="  Scenario: vectors can be sized and resized" filename="subcases.cpp" line="0" skipped="true"/>
     <TestCase name="CHECK level of asserts fail the test case but don't abort it" filename="assertion_macros.cpp" line="0" skipped="true"/>
+    <TestCase name="Nested - related to https://github.com/onqtam/doctest/issues/282" filename="subcases.cpp" line="0" skipped="true"/>
     <TestCase name="REQUIRE level of asserts fail and abort the test case - 1" filename="assertion_macros.cpp" line="0" skipped="true"/>
     <TestCase name="REQUIRE level of asserts fail and abort the test case - 10" filename="assertion_macros.cpp" line="0" skipped="true"/>
     <TestCase name="REQUIRE level of asserts fail and abort the test case - 11" filename="assertion_macros.cpp" line="0" skipped="true"/>
@@ -114,6 +115,6 @@
     <TestCase name="will end from an unknown exception" filename="coverage_maxout.cpp" line="0" skipped="true"/>
   </TestSuite>
   <OverallResultsAsserts successes="0" failures="0"/>
-  <OverallResultsTestCases successes="0" failures="0" skipped="76"/>
+  <OverallResultsTestCases successes="0" failures="0" skipped="77"/>
 </doctest>
 Program code.
diff --git a/examples/all_features/test_output/filter_3.txt b/examples/all_features/test_output/filter_3.txt
index f61eb82..c0cb430 100644
--- a/examples/all_features/test_output/filter_3.txt
+++ b/examples/all_features/test_output/filter_3.txt
@@ -23,7 +23,7 @@ TEST CASE:  subcases can be used in a separate function as well
 subcases.cpp(0): MESSAGE: lala
 
 ===============================================================================
-[doctest] test cases:      5 |      5 passed |      0 failed | 
+[doctest] test cases:      6 |      6 passed |      0 failed | 
 [doctest] assertions:      0 |      0 passed |      0 failed |
 [doctest] Status: SUCCESS!
 Program code.
diff --git a/examples/all_features/test_output/filter_3_xml.txt b/examples/all_features/test_output/filter_3_xml.txt
index c363fa4..3e56aa9 100644
--- a/examples/all_features/test_output/filter_3_xml.txt
+++ b/examples/all_features/test_output/filter_3_xml.txt
@@ -38,8 +38,11 @@ root
     <TestCase name="fails from an exception but gets re-entered to traverse all subcases" filename="subcases.cpp" line="0">
       <OverallResultsAsserts successes="0" failures="0"/>
     </TestCase>
+    <TestCase name="Nested - related to https://github.com/onqtam/doctest/issues/282" filename="subcases.cpp" line="0">
+      <OverallResultsAsserts successes="0" failures="0"/>
+    </TestCase>
   </TestSuite>
   <OverallResultsAsserts successes="0" failures="0"/>
-  <OverallResultsTestCases successes="5" failures="0"/>
+  <OverallResultsTestCases successes="6" failures="0"/>
 </doctest>
 Program code.
diff --git a/examples/all_features/test_output/subcases.cpp.txt b/examples/all_features/test_output/subcases.cpp.txt
index 9204383..89151c3 100644
--- a/examples/all_features/test_output/subcases.cpp.txt
+++ b/examples/all_features/test_output/subcases.cpp.txt
@@ -117,7 +117,7 @@ TEST CASE:  fails from an exception but gets re-entered to traverse all subcases
 subcases.cpp(0): ERROR: test case THREW exception: failure... but the show must go on!
 
 ===============================================================================
-[doctest] test cases:      5 |      1 passed |      4 failed | 
-[doctest] assertions:     21 |     15 passed |      6 failed |
+[doctest] test cases:      6 |      2 passed |      4 failed | 
+[doctest] assertions:     25 |     19 passed |      6 failed |
 [doctest] Status: FAILURE!
 Program code.
diff --git a/examples/all_features/test_output/subcases.cpp_xml.txt b/examples/all_features/test_output/subcases.cpp_xml.txt
index c5a5b94..95bbd7f 100644
--- a/examples/all_features/test_output/subcases.cpp_xml.txt
+++ b/examples/all_features/test_output/subcases.cpp_xml.txt
@@ -163,8 +163,27 @@ root
       </Exception>
       <OverallResultsAsserts successes="0" failures="2"/>
     </TestCase>
+    <TestCase name="Nested - related to https://github.com/onqtam/doctest/issues/282" filename="subcases.cpp" line="0">
+      <SubCase name="generate data variant 1" filename="subcases.cpp" line="0">
+        <SubCase name="check data 1" filename="subcases.cpp" line="0">
+        </SubCase>
+      </SubCase>
+      <SubCase name="generate data variant 1" filename="subcases.cpp" line="0">
+        <SubCase name="check data 2" filename="subcases.cpp" line="0">
+        </SubCase>
+      </SubCase>
+      <SubCase name="generate data variant 1" filename="subcases.cpp" line="0">
+        <SubCase name="check data 1" filename="subcases.cpp" line="0">
+        </SubCase>
+      </SubCase>
+      <SubCase name="generate data variant 1" filename="subcases.cpp" line="0">
+        <SubCase name="check data 2" filename="subcases.cpp" line="0">
+        </SubCase>
+      </SubCase>
+      <OverallResultsAsserts successes="4" failures="0"/>
+    </TestCase>
   </TestSuite>
-  <OverallResultsAsserts successes="15" failures="6"/>
-  <OverallResultsTestCases successes="1" failures="4"/>
+  <OverallResultsAsserts successes="19" failures="6"/>
+  <OverallResultsTestCases successes="2" failures="4"/>
 </doctest>
 Program code.