Support mixed children test types in test suites (#349)

* Support mixed children test types in test suites * Add verbose logging for test case and group initialization * Add XCTestHTMLReportSampleApp build folder to gitignore --------- Co-authored-by: Kevin Brotcke <brotckek@amazon.com> Co-authored-by: Tyler Vick <1395852+tylervick@users.noreply.github.com>
XCTestHTMLReport · Jan 23, 2024 · 9229533 · 9229533
1 parent 04b4812
commit 9229533
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ RetryResults*
 SanityResults*
 .DS_Store
 /.build
+/XCTestHTMLReportSampleApp/Build
 /Packages
 
 /*.xcodeproj

diff --git a/Sources/XCTestHTMLReportCore/Classes/HTMLTemplates.swift b/Sources/XCTestHTMLReportCore/Classes/HTMLTemplates.swift
@@ -1027,12 +1027,13 @@ struct HTMLTemplates
       for (var i = 0; i < testSummaryGroups.length; i++) {
           var testSummaryGroup = testSummaryGroups[i];
           var children = Array.prototype.slice.call(testSummaryGroup.children);
-          var testSummaries = children.filter(function(a) { return a.classList.contains('test-summary'); });
-          if (testSummaries.length == 0) {
+          var testSummaryChildren = children.filter(function(a) { return a.classList.contains('test-summary'); });
+          var testSummaryGroupChildren = children.filter(function(a) { return a.classList.contains('test-summary-group'); });
+          if (testSummaryChildren == 0 || testSummaryGroupChildren.length > 0) {
             continue;
           }
 
-          if (testSummaries.filter(function(a) { return a.style.display == 'block' }).length == 0) {
+          if (testSummaryChildren.filter(function(a) { return a.style.display == 'block' }).length == 0) {
             testSummaryGroup.style.display = 'none';
           } else {
             testSummaryGroup.style.display = 'block';

diff --git a/Sources/XCTestHTMLReportCore/Classes/Models/Test.swift b/Sources/XCTestHTMLReportCore/Classes/Models/Test.swift
@@ -74,7 +74,7 @@ public struct TestGroup: Test {
         return .unknown
     }
 
-    let subTests: [Test]
+    var subTests: [Test] = []
 
     var descendantSubTests: [Test] {
         subTests.flatMap { subTest -> [Test] in
@@ -98,31 +98,35 @@ public struct TestGroup: Test {
         identifier = group.identifier ?? "---group-identifier-not-found---"
         duration = group.duration
 
-        if group.subtests.isEmpty {
-            subTests = group.subtestGroups.map { TestGroup(
-                group: $0,
-                resultFile: resultFile,
-                renderingMode: renderingMode,
-                downsizeImagesEnabled: downsizeImagesEnabled,
-                downsizeScaleFactor: downsizeScaleFactor
-            ) }
-        } else {
-            subTests = Array(group.subtests.reduce(into: Set<TestCase>()) { subTestSet, metadata in
-                let newTest = TestCase(
-                    metadata: metadata,
-                    resultFile: resultFile,
-                    renderingMode: renderingMode,
-                    downsizeImagesEnabled: downsizeImagesEnabled,
-                    downsizeScaleFactor: downsizeScaleFactor
-                )
-                if let index = subTestSet.firstIndex(of: newTest) {
-                    var existingTest = subTestSet[index]
-                    existingTest.iterations.append(contentsOf: newTest.iterations)
-                    subTestSet.update(with: existingTest)
-                } else {
-                    subTestSet.insert(newTest)
-                }
-            })
+        Logger.substep("Initializing TestGroup \(identifier)")
+
+        if !group.subtests.isEmpty {
+          subTests += Array(group.subtests.reduce(into: Set<TestCase>()) { subTestSet, metadata in
+            let newTest = TestCase(
+              metadata: metadata,
+              resultFile: resultFile,
+              renderingMode: renderingMode,
+              downsizeImagesEnabled: downsizeImagesEnabled,
+              downsizeScaleFactor: downsizeScaleFactor
+            )
+            if let index = subTestSet.firstIndex(of: newTest) {
+              var existingTest = subTestSet[index]
+              existingTest.iterations.append(contentsOf: newTest.iterations)
+              subTestSet.update(with: existingTest)
+            } else {
+              subTestSet.insert(newTest)
+            }
+          })
+        }
+
+        if !group.subtestGroups.isEmpty {
+          subTests += group.subtestGroups.map { TestGroup(
+            group: $0,
+            resultFile: resultFile,
+            renderingMode: renderingMode,
+            downsizeImagesEnabled: downsizeImagesEnabled,
+            downsizeScaleFactor: downsizeScaleFactor
+          ) }
         }
     }
 }
@@ -203,6 +207,8 @@ struct TestCase: Test {
         title = metadata.name ?? ""
         identifier = metadata.identifier ?? ""
 
+        Logger.substep("Initializing TestCase \(identifier)")
+
         iterations = [Iteration(
             metadata: metadata,
             resultFile: resultFile,