diff --git a/XCSummary/Additions/NSArrayAdditions.h b/XCSummary/Additions/NSArrayAdditions.h old mode 100644 new mode 100755 diff --git a/XCSummary/Additions/NSArrayAdditions.m b/XCSummary/Additions/NSArrayAdditions.m old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMActivitySummary.h b/XCSummary/Models/CMActivitySummary.h old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMActivitySummary.m b/XCSummary/Models/CMActivitySummary.m old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMEntity.h b/XCSummary/Models/CMEntity.h old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMEntity.m b/XCSummary/Models/CMEntity.m old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMTest.h b/XCSummary/Models/CMTest.h old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMTest.m b/XCSummary/Models/CMTest.m old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMTestableSummary.h b/XCSummary/Models/CMTestableSummary.h old mode 100644 new mode 100755 diff --git a/XCSummary/Models/CMTestableSummary.m b/XCSummary/Models/CMTestableSummary.m old mode 100644 new mode 100755 diff --git a/XCSummary/Parser/CMTestSummaryParser.h b/XCSummary/Parser/CMTestSummaryParser.h old mode 100644 new mode 100755 diff --git a/XCSummary/Parser/CMTestSummaryParser.m b/XCSummary/Parser/CMTestSummaryParser.m old mode 100644 new mode 100755 diff --git a/XCSummary/Templates/ActivityTemplateWithImage.html b/XCSummary/Templates/ActivityTemplateWithImage.html old mode 100644 new mode 100755 diff --git a/XCSummary/Templates/ActivityTemplateWithoutImage.html b/XCSummary/Templates/ActivityTemplateWithoutImage.html old mode 100644 new mode 100755 diff --git a/XCSummary/Templates/CMHTMLReportBuilder.h b/XCSummary/Templates/CMHTMLReportBuilder.h old mode 100644 new mode 100755 diff --git a/XCSummary/Templates/CMHTMLReportBuilder.m b/XCSummary/Templates/CMHTMLReportBuilder.m old mode 100644 new mode 100755 index 1947dcf..ae11219 --- 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:@"
"]; +} + #pragma mark - File Operations - (void)_prepareResourceFolder diff --git a/XCSummary/Templates/SummaryTemplate.html b/XCSummary/Templates/SummaryTemplate.html old mode 100644 new mode 100755 diff --git a/XCSummary/Templates/Template copy.html b/XCSummary/Templates/Template copy.html new file mode 100755 index 0000000..c719e15 --- /dev/null +++ b/XCSummary/Templates/Template copy.html @@ -0,0 +1,14 @@ + + +

11111

+ diff --git a/XCSummary/Templates/Template.html b/XCSummary/Templates/Template.html old mode 100644 new mode 100755 index 112ba7c..2a3c029 --- a/XCSummary/Templates/Template.html +++ b/XCSummary/Templates/Template.html @@ -7,4 +7,17 @@ %@ + + + diff --git a/XCSummary/Templates/TemplateGeneratedHeader.h b/XCSummary/Templates/TemplateGeneratedHeader.h old mode 100644 new mode 100755 index 400d0db..87a336a --- 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 old mode 100644 new mode 100755 diff --git a/XCSummary/Templates/TestCaseTemplate.html b/XCSummary/Templates/TestCaseTemplate.html old mode 100644 new mode 100755 index 7b281b5..4d2099f --- a/XCSummary/Templates/TestCaseTemplate.html +++ b/XCSummary/Templates/TestCaseTemplate.html @@ -2,7 +2,7 @@
- +
%@
(%2.2f sec)
%@
(%2.2f sec)
diff --git a/XCSummary/Templates/TestCaseTemplateFailed.html b/XCSummary/Templates/TestCaseTemplateFailed.html old mode 100644 new mode 100755 index 9a83434..293a92d --- a/XCSummary/Templates/TestCaseTemplateFailed.html +++ b/XCSummary/Templates/TestCaseTemplateFailed.html @@ -2,7 +2,7 @@
- +
%@
(%2.2f sec)
%@
(%2.2f sec)
diff --git a/XCSummary/main.m b/XCSummary/main.m old mode 100644 new mode 100755