From 61b11635c2eedd1798298e534ce1c7462bb3b793 Mon Sep 17 00:00:00 2001
From: apoorvam <apoorva_rarefriend@yahoo.com>
Date: Tue, 20 Dec 2016 14:39:08 +0530
Subject: [PATCH] Escaping certain elements to avoid code injection #117

The error message, stacktrace, custom messages in report is escaped.
---
 .../expectedE2E/before_suite_fail.html        | 24 +++++-----
 .../expectedE2E/failing_specification_1.html  | 24 +++++-----
 .../integration/after_scenario_fail.html      | 24 +++++-----
 .../integration/after_spec_fail.html          | 24 +++++-----
 .../integration/after_step_fail.html          | 24 +++++-----
 .../integration/after_suite_fail.html         | 24 +++++-----
 .../before_after_scenario_fail.html           | 48 +++++++++----------
 .../integration/before_after_spec_fail.html   | 48 +++++++++----------
 .../integration/before_after_step_fail.html   | 48 +++++++++----------
 .../integration/before_after_suite_fail.html  | 48 +++++++++----------
 .../integration/before_scenario_fail.html     | 24 +++++-----
 .../integration/before_spec_fail.html         | 24 +++++-----
 .../integration/before_step_fail.html         | 24 +++++-----
 .../_testdata/integration/concept_fail.html   | 26 +++++-----
 .../integration/multiple_scenarios.html       | 24 +++++-----
 .../_testdata/integration/step_fail.html      | 24 +++++-----
 generator/generate_test.go                    | 12 +++++
 generator/templates.go                        |  6 +--
 18 files changed, 256 insertions(+), 244 deletions(-)

diff --git a/generator/_testdata/expectedE2E/before_suite_fail.html b/generator/_testdata/expectedE2E/before_suite_fail.html
index 2a2b3c1..2e2d042 100644
--- a/generator/_testdata/expectedE2E/before_suite_fail.html
+++ b/generator/_testdata/expectedE2E/before_suite_fail.html
@@ -95,18 +95,18 @@ <h2 class="project">Project: Gauge Project</h2>
                 <div class="exception-container hidden">
                     <div class="exception">
                         <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
             </pre>
                     </div>
diff --git a/generator/_testdata/expectedE2E/failing_specification_1.html b/generator/_testdata/expectedE2E/failing_specification_1.html
index b8543aa..7954adb 100644
--- a/generator/_testdata/expectedE2E/failing_specification_1.html
+++ b/generator/_testdata/expectedE2E/failing_specification_1.html
@@ -176,18 +176,18 @@ <h4 class="error-message">
                                 <pre>java.lang.RuntimeException</pre>
                               </h4>
                                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                             </pre>
                                                         </div>
diff --git a/generator/_testdata/integration/after_scenario_fail.html b/generator/_testdata/integration/after_scenario_fail.html
index a046174..1560cf3 100644
--- a/generator/_testdata/integration/after_scenario_fail.html
+++ b/generator/_testdata/integration/after_scenario_fail.html
@@ -166,18 +166,18 @@ <h5 class='execution-time'>
                                     <div class="exception-container hidden">
                                         <div class="exception">
                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                       </pre>
                                         </div>
diff --git a/generator/_testdata/integration/after_spec_fail.html b/generator/_testdata/integration/after_spec_fail.html
index 4999318..766dec7 100644
--- a/generator/_testdata/integration/after_spec_fail.html
+++ b/generator/_testdata/integration/after_spec_fail.html
@@ -286,18 +286,18 @@ <h5 class='execution-time'>
                         <div class="exception-container hidden">
                             <div class="exception">
                                 <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
               </pre>
                             </div>
diff --git a/generator/_testdata/integration/after_step_fail.html b/generator/_testdata/integration/after_step_fail.html
index 955db4d..d3c19d4 100644
--- a/generator/_testdata/integration/after_step_fail.html
+++ b/generator/_testdata/integration/after_step_fail.html
@@ -149,18 +149,18 @@ <h5 class='execution-time'>
                                                     <div class="exception-container hidden">
                                                         <div class="exception">
                                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                               </pre>
                                                         </div>
diff --git a/generator/_testdata/integration/after_suite_fail.html b/generator/_testdata/integration/after_suite_fail.html
index 9e65f85..cef99af 100644
--- a/generator/_testdata/integration/after_suite_fail.html
+++ b/generator/_testdata/integration/after_suite_fail.html
@@ -95,18 +95,18 @@ <h2 class="project">Project: Gauge Project</h2>
                 <div class="exception-container hidden">
                     <div class="exception">
                         <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
             </pre>
                     </div>
diff --git a/generator/_testdata/integration/before_after_scenario_fail.html b/generator/_testdata/integration/before_after_scenario_fail.html
index 581078e..3484a66 100644
--- a/generator/_testdata/integration/before_after_scenario_fail.html
+++ b/generator/_testdata/integration/before_after_scenario_fail.html
@@ -152,18 +152,18 @@ <h3 class="head borderBottom">Scenario Heading</h3>
                                     <div class="exception-container hidden">
                                         <div class="exception">
                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                       </pre>
                                         </div>
@@ -195,18 +195,18 @@ <h3 class="head borderBottom">Scenario Heading</h3>
                                     <div class="exception-container hidden">
                                         <div class="exception">
                                             <pre class="stacktrace">
-                StepImplementation.foo(StepImplementation.java:16)
-                sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-                sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-                sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-                java.lang.reflect.Method.invoke(Method.java:483)
-                com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-                com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-                com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-                com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-                com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-                com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-                com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+                StepImplementation.foo(StepImplementation.java:16)<br/>
+                sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+                sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+                sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+                java.lang.reflect.Method.invoke(Method.java:483)<br/>
+                com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+                com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+                com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+                com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+                com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+                com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+                com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
                 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                       </pre>
                                         </div>
diff --git a/generator/_testdata/integration/before_after_spec_fail.html b/generator/_testdata/integration/before_after_spec_fail.html
index 8501d3f..7510c76 100644
--- a/generator/_testdata/integration/before_after_spec_fail.html
+++ b/generator/_testdata/integration/before_after_spec_fail.html
@@ -146,18 +146,18 @@ <h3 class="spec-head" title="failing_specification_1.spec">Failing Specification
                             <div class="exception-container hidden">
                                 <div class="exception">
                                     <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                   </pre>
                                 </div>
@@ -190,18 +190,18 @@ <h3 class="spec-head" title="failing_specification_1.spec">Failing Specification
                         <div class="exception-container hidden">
                             <div class="exception">
                                 <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
               </pre>
                             </div>
diff --git a/generator/_testdata/integration/before_after_step_fail.html b/generator/_testdata/integration/before_after_step_fail.html
index 67de929..e70baa7 100644
--- a/generator/_testdata/integration/before_after_step_fail.html
+++ b/generator/_testdata/integration/before_after_step_fail.html
@@ -149,18 +149,18 @@ <h5 class='execution-time'>
                                                     <div class="exception-container hidden">
                                                         <div class="exception">
                                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                               </pre>
                                                         </div>
@@ -181,18 +181,18 @@ <h5 class='execution-time'>
                                                     <div class="exception-container hidden">
                                                         <div class="exception">
                                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                             </pre>
                                                         </div>
diff --git a/generator/_testdata/integration/before_after_suite_fail.html b/generator/_testdata/integration/before_after_suite_fail.html
index 34b9466..8c98a4a 100644
--- a/generator/_testdata/integration/before_after_suite_fail.html
+++ b/generator/_testdata/integration/before_after_suite_fail.html
@@ -95,18 +95,18 @@ <h2 class="project">Project: Gauge Project</h2>
                 <div class="exception-container">
                     <div class="exception">
                         <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
             </pre>
                     </div>
@@ -127,18 +127,18 @@ <h2 class="project">Project: Gauge Project</h2>
                 <div class="exception-container" id="hookFailureDetails">
                     <div class="exception">
                         <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
             </pre>
                     </div>
diff --git a/generator/_testdata/integration/before_scenario_fail.html b/generator/_testdata/integration/before_scenario_fail.html
index 54d5c66..a48b783 100644
--- a/generator/_testdata/integration/before_scenario_fail.html
+++ b/generator/_testdata/integration/before_scenario_fail.html
@@ -152,18 +152,18 @@ <h3 class="head borderBottom">Scenario Heading</h3>
                                     <div class="exception-container hidden">
                                         <div class="exception">
                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                       </pre>
                                         </div>
diff --git a/generator/_testdata/integration/before_spec_fail.html b/generator/_testdata/integration/before_spec_fail.html
index d21a995..049d2fa 100644
--- a/generator/_testdata/integration/before_spec_fail.html
+++ b/generator/_testdata/integration/before_spec_fail.html
@@ -146,18 +146,18 @@ <h3 class="spec-head" title="failing_specification_1.spec">Failing Specification
                             <div class="exception-container hidden">
                                 <div class="exception">
                                     <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                   </pre>
                                 </div>
diff --git a/generator/_testdata/integration/before_step_fail.html b/generator/_testdata/integration/before_step_fail.html
index 7dc86c2..8032c22 100644
--- a/generator/_testdata/integration/before_step_fail.html
+++ b/generator/_testdata/integration/before_step_fail.html
@@ -149,18 +149,18 @@ <h5 class='execution-time'>
                                                     <div class="exception-container hidden">
                                                         <div class="exception">
                                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                               </pre>
                                                         </div>
diff --git a/generator/_testdata/integration/concept_fail.html b/generator/_testdata/integration/concept_fail.html
index 8a15024..a766b91 100644
--- a/generator/_testdata/integration/concept_fail.html
+++ b/generator/_testdata/integration/concept_fail.html
@@ -227,19 +227,19 @@ <h4 class="error-message">
                                     <pre>java.lang.RuntimeException</pre>
                                   </h4>
                                                                     <pre class="stacktrace">
-      StepImplementation.foo(StepImplementation.java:16)
-      sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-      sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-      sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-      java.lang.reflect.Method.invoke(Method.java:483)
-      com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-      com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-      com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-      com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-      com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-      com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-      com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
-      com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
+      StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
+com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                                   </pre>
                                                                 </div>
                                                                 <div class="screenshot-container">
diff --git a/generator/_testdata/integration/multiple_scenarios.html b/generator/_testdata/integration/multiple_scenarios.html
index a430f89..a510c40 100644
--- a/generator/_testdata/integration/multiple_scenarios.html
+++ b/generator/_testdata/integration/multiple_scenarios.html
@@ -173,18 +173,18 @@ <h4 class="error-message">
                                 <pre>java.lang.RuntimeException</pre>
                               </h4>
                                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                             </pre>
                                                         </div>
diff --git a/generator/_testdata/integration/step_fail.html b/generator/_testdata/integration/step_fail.html
index 7ff96bd..9e61216 100644
--- a/generator/_testdata/integration/step_fail.html
+++ b/generator/_testdata/integration/step_fail.html
@@ -162,18 +162,18 @@ <h4 class="error-message">
                                 <pre>java.lang.RuntimeException</pre>
                               </h4>
                                                             <pre class="stacktrace">
-StepImplementation.foo(StepImplementation.java:16)
-sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-java.lang.reflect.Method.invoke(Method.java:483)
-com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)
-com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)
-com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)
-com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)
-com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)
-com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)
+StepImplementation.foo(StepImplementation.java:16)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)<br/>
+sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)<br/>
+sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)<br/>
+java.lang.reflect.Method.invoke(Method.java:483)<br/>
+com.thoughtworks.gauge.execution.MethodExecutor.execute(MethodExecutor.java:32)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.executeHook(HooksExecutor.java:98)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor$TaggedHookExecutor.execute(HooksExecutor.java:84)<br/>
+com.thoughtworks.gauge.execution.HooksExecutor.execute(HooksExecutor.java:41)<br/>
+com.thoughtworks.gauge.processor.MethodExecutionMessageProcessor.executeHooks(MethodExecutionMessageProcessor.java:55)<br/>
+com.thoughtworks.gauge.processor.SuiteExecutionStartingProcessor.process(SuiteExecutionStartingProcessor.java:26)<br/>
+com.thoughtworks.gauge.connection.MessageDispatcher.dispatchMessages(MessageDispatcher.java:72)<br/>
 com.thoughtworks.gauge.GaugeRuntime.main(GaugeRuntime.java:37)
                             </pre>
                                                         </div>
diff --git a/generator/generate_test.go b/generator/generate_test.go
index 5dd160e..2d46c8c 100644
--- a/generator/generate_test.go
+++ b/generator/generate_test.go
@@ -322,6 +322,17 @@ var wStepWithSpecialTableParam = `
     </span>
 </div>`
 
+var wStepFailDiv = `<div class="error-container failed">
+  <div class="exception-container">
+      <div class="exception">
+        <h4 class="error-message">
+          <pre>expected:&lt;foo [foo] foo&gt; but was:&lt;foo [bar] foo&gt;</pre>
+        </h4>
+        <pre class="stacktrace">stacktrace</pre>
+      </div>
+  </div>
+</div>`
+
 var stepWithBracketsInFragment = &step{
 	Fragments: []*fragment{
 		{FragmentKind: textFragmentKind, Text: "Say "},
@@ -414,6 +425,7 @@ var reportGenTests = []reportGenTest{
 	{"generate skipped step skipped reason div", skippedReasonDiv, skippedStepRes, wSkippedStepWithSkippedReason},
 	{"generate step body div with file special param", stepBodyDiv, stepWithFileParam, wStepWithFileParam},
 	{"generate step body div with special table param", stepBodyDiv, stepWithSpecialTableParam, wStepWithSpecialTableParam},
+	{"generate step failure div", stepFailureDiv, &result{ErrorMessage: "expected:<foo [foo] foo> but was:<foo [bar] foo>", StackTrace: "stacktrace"}, wStepFailDiv},
 }
 
 func TestExecute(t *testing.T) {
diff --git a/generator/templates.go b/generator/templates.go
index cbb20ec..40b13a6 100644
--- a/generator/templates.go
+++ b/generator/templates.go
@@ -120,7 +120,7 @@ const hookFailureDiv = `<div class="error-container failed">
   </div>
   <div class="exception-container hidden">
       <div class="exception">
-        <pre class="stacktrace">{{.StackTrace}}</pre>
+        <pre class="stacktrace">{{.StackTrace | escapeHTML | encodeNewLine}}</pre>
       </div>
       {{if .Screenshot}}<div class="screenshot-container">
         <a href="data:image/png;base64,{{.Screenshot}}" rel="lightbox">
@@ -291,9 +291,9 @@ const stepFailureDiv = `<div class="error-container failed">
   <div class="exception-container">
       <div class="exception">
         <h4 class="error-message">
-          <pre>{{.ErrorMessage}}</pre>
+          <pre>{{.ErrorMessage | escapeHTML | encodeNewLine}}</pre>
         </h4>
-        <pre class="stacktrace">{{.StackTrace}}</pre>
+        <pre class="stacktrace">{{.StackTrace | escapeHTML | encodeNewLine}}</pre>
       </div>
       {{if .Screenshot}}<div class="screenshot-container">
         <a href="data:image/png;base64,{{.Screenshot}}" rel="lightbox">