- Revision
- 1389
- Author
- mauro
- Date
- 2009-11-25 07:55:54 -0600 (Wed, 25 Nov 2009)
Log Message
Cleaned up html.
Modified Paths
- trunk/core/jbehave-core/src/java/org/jbehave/scenario/reporters/HtmlPrintStreamScenarioReporter.java
Diff
Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/reporters/HtmlPrintStreamScenarioReporter.java (1388 => 1389)
--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/reporters/HtmlPrintStreamScenarioReporter.java 2009-11-25 13:11:41 UTC (rev 1388) +++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/reporters/HtmlPrintStreamScenarioReporter.java 2009-11-25 13:55:54 UTC (rev 1389) @@ -48,24 +48,23 @@ } public void successful(String step) { - String defaultPattern = "<li class=\"step\"><span class=\"step.successful\"><span class=\"step.text\">{0}</span></span></li>\n"; + String defaultPattern = "<div class=\"step.successful\">{0}</div>\n"; output.print(format("successful.html", defaultPattern, escapeHtml(step))); } public void pending(String step) { - String defaultPattern = "<li class=\"step\"><span class=\"step.pending\"><span class=\"step.text\">{0}</span> - {1}</span></li>\n"; + String defaultPattern = "<div class=\"step.pending\">{0}<span class=\"keyword.pending\">({1})</span></div>\n"; output.print(format("pending.html", defaultPattern, escapeHtml(step), keywords.pending())); } public void notPerformed(String step) { - String defaultPattern = "<li class=\"step\"><span class=\"step.notPerformed\"><span class=\"step.text\">{0}</span> - {1}</span></li>\n"; - output.print(format("pending.html", defaultPattern, escapeHtml(step), keywords.notPerformed())); + String defaultPattern = "<div class=\"step.notPerformed\">{0}<span class=\"keyword.notPerformed\">({1})</span></div>\n"; + output.print(format("notPerformed.html", defaultPattern, escapeHtml(step), keywords.notPerformed())); } public void failed(String step, Throwable cause) { this.cause = cause; - String defaultPattern = "<li class=\"step\"><span class=\"step.failed\">" - + "<span class=\"step.text\">{0}</span> - {1} </span>\n"; + String defaultPattern = "<div class=\"step.failed\">{0}<span class=\"keyword.failed\">({1})</span></div>\n"; output.print(format("failed.html", defaultPattern, escapeHtml(step), keywords.failed())); } @@ -74,24 +73,24 @@ } public void beforeStory(Blurb blurb) { - String defaultPattern = "<html>\n<head>\n<title>{0}</title>\n</head>\n<body>\n<h1 class=\"story\">{0}</h1>\n"; + String defaultPattern = "<div class=\"story\">\n<h1>{0}</h1>\n"; output.print(format("beforeStory.html", defaultPattern, blurb.asString())); } + public void afterStory() { + output.print(format("afterStory.html", "</div>\n")); + } + public void beforeScenario(String title) { cause = null; - String defaultPattern = "<h2>{0} {1}</h2>\n<ol title=\"{1}\" class=\"scenario\">\n"; + String defaultPattern = "<div class=\"scenario\">\n<h2>{0} {1}</h2>\n"; output.print(format("beforeScenario.html", defaultPattern, keywords.scenario(), escapeHtml(title))); } public void afterScenario() { - output.print(format("afterScenario.html", "</ol>\n")); + output.print(format("afterScenario.html", "</div>\n")); } - public void afterStory() { - output.print(format("afterStory.html", "<body>\n</html>\n")); - } - public void givenScenarios(List<String> givenScenarios) { String defaultPattern = "<span class=\"givenScenarios\">{0} {1}</span>\n"; output.print(format("givenScenarios.html", defaultPattern, keywords.givenScenarios(), escapeHtml(givenScenarios.toString())));
To unsubscribe from this list please visit:
