MacPaw · ampilogov · Mar 21, 2017 · Mar 27, 2017
diff --git a/XCSummary/Additions/NSArrayAdditions.h b/XCSummary/Additions/NSArrayAdditions.h
diff --git a/XCSummary/Additions/NSArrayAdditions.m b/XCSummary/Additions/NSArrayAdditions.m
diff --git a/XCSummary/Models/CMActivitySummary.h b/XCSummary/Models/CMActivitySummary.h
diff --git a/XCSummary/Models/CMActivitySummary.m b/XCSummary/Models/CMActivitySummary.m
diff --git a/XCSummary/Models/CMEntity.h b/XCSummary/Models/CMEntity.h
diff --git a/XCSummary/Models/CMEntity.m b/XCSummary/Models/CMEntity.m
diff --git a/XCSummary/Models/CMTest.h b/XCSummary/Models/CMTest.h
diff --git a/XCSummary/Models/CMTest.m b/XCSummary/Models/CMTest.m
diff --git a/XCSummary/Models/CMTestableSummary.h b/XCSummary/Models/CMTestableSummary.h
diff --git a/XCSummary/Models/CMTestableSummary.m b/XCSummary/Models/CMTestableSummary.m
diff --git a/XCSummary/Parser/CMTestSummaryParser.h b/XCSummary/Parser/CMTestSummaryParser.h
diff --git a/XCSummary/Parser/CMTestSummaryParser.m b/XCSummary/Parser/CMTestSummaryParser.m
diff --git a/XCSummary/Templates/ActivityTemplateWithImage.html b/XCSummary/Templates/ActivityTemplateWithImage.html
diff --git a/XCSummary/Templates/ActivityTemplateWithoutImage.html b/XCSummary/Templates/ActivityTemplateWithoutImage.html
diff --git a/XCSummary/Templates/CMHTMLReportBuilder.h b/XCSummary/Templates/CMHTMLReportBuilder.h
diff --git a/XCSummary/Templates/CMHTMLReportBuilder.m b/XCSummary/Templates/CMHTMLReportBuilder.m
@@ -88,16 +88,25 @@ - (void)appendTests:(NSArray *)tests indentation:(CGFloat)indentation
             {
                 if (obj.status == CMTestStatusFailure)
                 {
-                    [self _appendActivities:obj.activities indentation:indentation + 50];
+                    [self appendTest:obj indentation:indentation];
                 }
             }
             else
             {
-                [self _appendActivities:obj.activities indentation:indentation + 50];
+                [self appendTest:obj indentation:indentation];
             }
+
         }
     }];
 }
+
+- (void)appendTest:(CMTest *)test indentation:(CGFloat)indentation
+{
+    [self _appendBeginingForTest:test];
+    [self _appendActivities:test.activities indentation:indentation + 50];
+    [self _appendEndForTest:test];
+}
+
 - (NSString *)build
 {
     NSString *templateFormat = [self _decodeTemplateWithName:Template];
@@ -118,7 +127,7 @@ - (void)_appendTestCase:(CMTest *)testCase indentation:(CGFloat)indentation
     NSString *templateFormat = testCase.status == CMTestStatusFailure ?
     [self _decodeTemplateWithName:TestCaseTemplateFailed] :
     [self _decodeTemplateWithName:TestCaseTemplate];
-    NSString *composedString = [NSString stringWithFormat:templateFormat, indentation, @"px", testCase.testName, testCase.duration];
+    NSString *composedString = [NSString stringWithFormat:templateFormat, indentation, @"px", testCase.testName, testCase.testName, testCase.duration];
     [self.resultString appendString:composedString];
 }
 
@@ -154,6 +163,17 @@ - (void)_appendActivity:(CMActivitySummary *)activity indentation:(CGFloat)inden
     [self.resultString appendString:composedString];
 }
 
+- (void)_appendBeginingForTest:(CMTest *)test
+{
+    NSString *testBegining = [NSString stringWithFormat:@"<div id=\"%@\" style=\"display: none\" margin-left: 10.00px; background-color: #CBF4A3; padding:10px; text-align: right;", test.testName];
+    [self.resultString appendString:testBegining];
+}
+
+- (void)_appendEndForTest:(CMTest *)test
+{
+    [self.resultString appendString:@"</div>"];
+}
+
 #pragma mark - File Operations
 
 - (void)_prepareResourceFolder

diff --git a/XCSummary/Templates/SummaryTemplate.html b/XCSummary/Templates/SummaryTemplate.html
diff --git a/XCSummary/Templates/Template copy.html b/XCSummary/Templates/Template copy.html
@@ -0,0 +1,14 @@
+<script language="javascript">
+function toggle(contentDiv) {
+	var block = document.getElementById(contentDiv);
+	if(block.style.display == "block") {
+    		block.style.display = "none";
+  	}
+	else {
+		block.style.display = "block";
+	}
+}
+</script>
+
+<div onclick="javascript:toggle('toggleText');"><h1>11111</h1></div>
+<div id="toggleText" style="display: none"><h1>peek-a-boo</h1></div>
diff --git a/XCSummary/Templates/Template.html b/XCSummary/Templates/Template.html
@@ -7,4 +7,17 @@
     <body>
         %@
     </body>
+
+    <script language="javascript">
+        function toggle(contentDiv) {
+            var block = document.getElementById(contentDiv);
+            if(block.style.display == "block") {
+                block.style.display = "none";
+            }
+            else {
+                block.style.display = "block";
+            }
+        }
+    </script>
+
 </html>
diff --git a/XCSummary/Templates/TemplateGeneratedHeader.h b/XCSummary/Templates/TemplateGeneratedHeader.h
@@ -1,7 +1,7 @@
-#define TestCaseTemplate @"PCEtLSBDb21tb24gVGVzdGNhc2UgLS0+CjxkaXYgc3R5bGU9Im1hcmdpbi1sZWZ0OiAlMi4yZiVAOyBiYWNrZ3JvdW5kLWNvbG9yOiAjQ0JGNEEzOyBwYWRkaW5nOjEwcHg7IHRleHQtYWxpZ246IHJpZ2h0OyI+CiAgICA8dGFibGUgc3R5bGU9IndpZHRoOiAxMDAlIj4KICAgICAgICA8dHI+CiAgICAgICAgICAgIDx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDsiPiVAIDxkaXYgc3R5bGU9ImRpc3BsYXk6aW5saW5lOyBjb2xvcjogZ3JleSI+KCUyLjJmIHNlYyk8L2Rpdj4gPC90ZD4KICAgICAgICA8L3RyPgogICAgPC90YWJsZT4KPC9kaXY+CjwhLS0gU2VwYXJhdG9yIC0tPgo8ZGl2IHN0eWxlPSJtYXJnaW46MTBweCI+PC9kaXY+Cg=="
+#define TestCaseTemplate @"PCEtLSBDb21tb24gVGVzdGNhc2UgLS0+CjxkaXYgc3R5bGU9Im1hcmdpbi1sZWZ0OiAlMi4yZiVAOyBiYWNrZ3JvdW5kLWNvbG9yOiAjQ0JGNEEzOyBwYWRkaW5nOjEwcHg7IHRleHQtYWxpZ246IHJpZ2h0OyI+CiAgICA8dGFibGUgc3R5bGU9IndpZHRoOiAxMDAlIj4KICAgICAgICA8dHI+CiAgICAgICAgICAgIDx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDsiIG9uY2xpY2s9ImphdmFzY3JpcHQ6dG9nZ2xlKCclQCcpOyI+JUAgPGRpdiBzdHlsZT0iZGlzcGxheTppbmxpbmU7IGNvbG9yOiBncmV5Ij4oJTIuMmYgc2VjKTwvZGl2PiA8L3RkPgogICAgICAgIDwvdHI+CiAgICA8L3RhYmxlPgo8L2Rpdj4KPCEtLSBTZXBhcmF0b3IgLS0+CjxkaXYgc3R5bGU9Im1hcmdpbjoxMHB4Ij48L2Rpdj4K"
 
 
-#define TestCaseTemplateFailed @"PCEtLSBUZXN0Y2FzZSBGYWlsZWQgLS0+CjxkaXYgc3R5bGU9Im1hcmdpbi1sZWZ0OiAlMi4yZiVAOyBiYWNrZ3JvdW5kLWNvbG9yOiAjRkY2MjdDOyBwYWRkaW5nOjEwcHg7IHRleHQtYWxpZ246IHJpZ2h0OyI+CiAgICA8dGFibGUgc3R5bGU9IndpZHRoOiAxMDAlIj4KICAgICAgICA8dHI+CiAgICAgICAgICAgIDx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDsiPiVAIDxkaXYgc3R5bGU9ImRpc3BsYXk6aW5saW5lOyBjb2xvcjogI2QzZDNkMyI+KCUyLjJmIHNlYyk8L2Rpdj48L3RkPgogICAgICAgIDwvdHI+CiAgICA8L3RhYmxlPgo8L2Rpdj4KPCEtLSBTZXBhcmF0b3IgLS0+CjxkaXYgc3R5bGU9Im1hcmdpbjoxMHB4Ij48L2Rpdj4K"
+#define TestCaseTemplateFailed @"PCEtLSBUZXN0Y2FzZSBGYWlsZWQgLS0+CjxkaXYgc3R5bGU9Im1hcmdpbi1sZWZ0OiAlMi4yZiVAOyBiYWNrZ3JvdW5kLWNvbG9yOiAjRkY2MjdDOyBwYWRkaW5nOjEwcHg7IHRleHQtYWxpZ246IHJpZ2h0OyI+CiAgICA8dGFibGUgc3R5bGU9IndpZHRoOiAxMDAlIj4KICAgICAgICA8dHI+CiAgICAgICAgICAgIDx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDsiIG9uY2xpY2s9ImphdmFzY3JpcHQ6dG9nZ2xlKCclQCcpOyI+JUAgPGRpdiBzdHlsZT0iZGlzcGxheTppbmxpbmU7IGNvbG9yOiAjOTk5OTk5Ij4oJTIuMmYgc2VjKTwvZGl2PjwvdGQ+CiAgICAgICAgPC90cj4KICAgIDwvdGFibGU+CjwvZGl2Pgo8IS0tIFNlcGFyYXRvciAtLT4KPGRpdiBzdHlsZT0ibWFyZ2luOjEwcHgiPjwvZGl2Pgo="
 
 
 #define ActivityTemplateWithoutImage @"PCEtLSBDb21tb24gQWN0aXZpdHkgV2l0aG91dCBJbWFnZSAtLT4KPGRpdiBzdHlsZT0ibWFyZ2luLWxlZnQ6ICUyLjJmJUA7IGJhY2tncm91bmQtY29sb3I6ICNGM0YzRjM7IHBhZGRpbmc6MnB4OyB0ZXh0LWFsaWduOiByaWdodDsgZm9udC1zaXplOjkwJSUiPgogICAgPHRhYmxlIHN0eWxlPSJ3aWR0aDogMTAwJSI+CiAgICAgICAgPHRyPgogICAgICAgICAgICA8dGQgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Ij4lQCA8ZGl2IHN0eWxlPSJkaXNwbGF5OmlubGluZTsgY29sb3I6IGdyZXkiPiglMi4yZiBzZWMpPC9kaXY+PC90ZD4KICAgICAgICA8L3RyPgogICAgPC90YWJsZT4KPC9kaXY+CjwhLS0gU2VwYXJhdG9yIC0tPgo8ZGl2IHN0eWxlPSJtYXJnaW46NHB4Ij48L2Rpdj4K"
@@ -10,7 +10,7 @@
 #define ActivityTemplateWithImage @"PCEtLSBDb21tb24gQWN0aXZpdHkgV2l0aCBJbWFnZSAtLT4KPGRpdiBzdHlsZT0ibWFyZ2luLWxlZnQ6ICUyLjJmJUA7IGJhY2tncm91bmQtY29sb3I6ICNGM0YzRjM7IHBhZGRpbmc6MnB4OyB0ZXh0LWFsaWduOiByaWdodDsgZm9udC1zaXplOjkwJSUiPgogICAgPHRhYmxlIHN0eWxlPSJ3aWR0aDogMTAwJSUiPgogICAgICAgIDx0cj4KICAgICAgICAgICAgPHRkIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0OyI+JUAgPGRpdiBzdHlsZT0iZGlzcGxheTppbmxpbmU7IGNvbG9yOiBncmV5Ij4oJTIuMmYgc2VjKTwvZGl2PiA8L3RkPgogICAgICAgICAgICA8dGQ+PGltZyBzdHlsZT0idGV4dC1hbGlnbjogcmlnaHQ7IHdpZHRoOiA2MDBweDsgaGVpZ2h0OiBhdXRvOyIgc3JjPSIlQCI+PC90ZD4KICAgICAgICA8L3RyPgogICAgPC90YWJsZT4KPC9kaXY+CjwhLS0gU2VwYXJhdG9yIC0tPgo8ZGl2IHN0eWxlPSJtYXJnaW46NHB4Ij48L2Rpdj4K"
 
 
-#define Template @"PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPG1ldGEgY2hhcnNldD0iVVRGLTgiPgogICAgICAgIDx0aXRsZT48L3RpdGxlPgogICAgPC9oZWFkPgogICAgPGJvZHk+CiAgICAgICAgJUAKICAgIDwvYm9keT4KPC9odG1sPgo="
+#define Template @"PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPG1ldGEgY2hhcnNldD0iVVRGLTgiPgogICAgICAgIDx0aXRsZT48L3RpdGxlPgogICAgPC9oZWFkPgogICAgPGJvZHk+CiAgICAgICAgJUAKICAgIDwvYm9keT4KICAgIAogICAgPHNjcmlwdCBsYW5ndWFnZT0iamF2YXNjcmlwdCI+CiAgICAgICAgZnVuY3Rpb24gdG9nZ2xlKGNvbnRlbnREaXYpIHsKICAgICAgICAgICAgdmFyIGJsb2NrID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoY29udGVudERpdik7CiAgICAgICAgICAgIGlmKGJsb2NrLnN0eWxlLmRpc3BsYXkgPT0gImJsb2NrIikgewogICAgICAgICAgICAgICAgYmxvY2suc3R5bGUuZGlzcGxheSA9ICJub25lIjsKICAgICAgICAgICAgfQogICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgIGJsb2NrLnN0eWxlLmRpc3BsYXkgPSAiYmxvY2siOwogICAgICAgICAgICB9CiAgICAgICAgfQogICAgPC9zY3JpcHQ+CiAgICAKPC9odG1sPgo="
 
 
 #define SummaryTemplate @"PCEtLSBUZXN0IFN1bW1hcnkgLS0+CjxkaXYgc3R5bGU9Im1hcmdpbi1sZWZ0OiAxMHB4OyBiYWNrZ3JvdW5kLWNvbG9yOiAjZWVlZWVlOyBwYWRkaW5nOjRweDsgdGV4dC1hbGlnbjogcmlnaHQ7IGZvbnQtc2l6ZToyMHB4Ij4KICAgIDx0YWJsZSBzdHlsZT0id2lkdGg6IDEwMCUiPgogICAgICAgIDx0cj4KICAgICAgICAgICAgPHRkIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O3BhZGRpbmc6MTBweDsiPlRlc3QgUmVzdWx0czo8L3RkPgogICAgICAgICAgICA8dGQgc3R5bGU9InRleHQtYWxpZ246IHJpZ2h0O3BhZGRpbmc6MTBweDsiPgogICAgICAgICAgICAgICAgPGRpdiBzdHlsZT0iZGlzcGxheTppbmxpbmU7bWFyZ2luOjEwcHgiPgogICAgICAgICAgICAgICAgICAgICVkIFRlc3RzCiAgICAgICAgICAgICAgICAgICAgPGRpdiBzdHlsZT0iZGlzcGxheTppbmxpbmU7Y29sb3I6Z3JheTtmb250LXNpemU6MTRweCI+CiAgICAgICAgICAgICAgICAgICAgICAgICglQCkKICAgICAgICAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICAgICAgPGRpdiBzdHlsZT0iZGlzcGxheTppbmxpbmU7bWFyZ2luOjEwcHg7Y29sb3I6IzAwQUU0RCI+JWQgc3VjY2Vzc2Z1bDwvZGl2PgogICAgICAgICAgICAgICAgPGRpdiBzdHlsZT0iZGlzcGxheTolQDttYXJnaW46MTBweDtjb2xvcjojRkY2MjdDIj4lZCBmYWlsZWQ8L2Rpdj4KICAgICAgICAgICAgPC90ZD4KICAgICAgICA8L3RyPgogICAgPC90YWJsZT4KPC9kaXY+Cgo8IS0tIFNlcGFyYXRvciAtLT4KPGRpdiBzdHlsZT0ibWFyZ2luOjEwcHgiPjwvZGl2Pgo="
diff --git a/XCSummary/Templates/TemplateHeader.h b/XCSummary/Templates/TemplateHeader.h
diff --git a/XCSummary/Templates/TestCaseTemplate.html b/XCSummary/Templates/TestCaseTemplate.html
@@ -2,7 +2,7 @@
 <div style="margin-left: %2.2f%@; background-color: #CBF4A3; padding:10px; text-align: right;">
     <table style="width: 100%">
         <tr>
-            <td style="text-align: left;">%@ <div style="display:inline; color: grey">(%2.2f sec)</div> </td>
+            <td style="text-align: left;" onclick="javascript:toggle('%@');">%@ <div style="display:inline; color: grey">(%2.2f sec)</div> </td>
         </tr>
     </table>
 </div>

diff --git a/XCSummary/Templates/TestCaseTemplateFailed.html b/XCSummary/Templates/TestCaseTemplateFailed.html
@@ -2,7 +2,7 @@
 <div style="margin-left: %2.2f%@; background-color: #FF627C; padding:10px; text-align: right;">
     <table style="width: 100%">
         <tr>
-            <td style="text-align: left;">%@ <div style="display:inline; color: #d3d3d3">(%2.2f sec)</div></td>
+            <td style="text-align: left;" onclick="javascript:toggle('%@');">%@ <div style="display:inline; color: #999999">(%2.2f sec)</div></td>
         </tr>
     </table>
 </div>

diff --git a/XCSummary/main.m b/XCSummary/main.m