Indent section names

Closes #1556
catchorg · Apr 14, 2022 · 50e725d · 50e725d
1 parent 62fd660
commit 50e725d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/include/reporters/catch_reporter_console.cpp b/include/reporters/catch_reporter_console.cpp
@@ -547,8 +547,8 @@ void ConsoleReporter::printTestCaseAndSectionHeader() {
         auto
             it = m_sectionStack.begin() + 1, // Skip first section (test case)
             itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
+        for (size_t indent = 2; it != itEnd; ++it, indent += 2)
+            printHeaderString(it->name, indent);
     }
 
     SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;

diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -697,7 +697,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   A
-  1
+    1
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................
@@ -707,7 +707,7 @@ Condition.tests.cpp:<line number>: FAILED:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   A
-  2
+    2
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................
@@ -717,7 +717,7 @@ Condition.tests.cpp:<line number>: FAILED:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   B
-  1
+    1
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................
@@ -727,7 +727,7 @@ Condition.tests.cpp:<line number>: FAILED:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   B
-  2
+    2
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................

diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -6498,7 +6498,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   A
-  1
+    1
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................
@@ -6508,7 +6508,7 @@ Condition.tests.cpp:<line number>: FAILED:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   A
-  2
+    2
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................
@@ -6518,7 +6518,7 @@ Condition.tests.cpp:<line number>: FAILED:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   B
-  1
+    1
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................
@@ -6528,7 +6528,7 @@ Condition.tests.cpp:<line number>: FAILED:
 -------------------------------------------------------------------------------
 Mayfail test case with nested sections
   B
-  2
+    2
 -------------------------------------------------------------------------------
 Condition.tests.cpp:<line number>
 ...............................................................................

diff --git a/single_include/catch2/catch.hpp b/single_include/catch2/catch.hpp
@@ -16647,8 +16647,8 @@ void ConsoleReporter::printTestCaseAndSectionHeader() {
         auto
             it = m_sectionStack.begin() + 1, // Skip first section (test case)
             itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
+        for (size_t indent = 2; it != itEnd; ++it, indent += 2)
+            printHeaderString(it->name, indent);
     }
 
     SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;