From 927eaaeb85989437c919f94536291fbe1911b945 Mon Sep 17 00:00:00 2001
From: Ralf Teusner <ralf.teusner@hpi.de>
Date: Fri, 13 Jul 2018 11:01:53 +0200
Subject: [PATCH 1/2] fix raw output, prevent angle brackets < and > from
 beeing interpreted as html tags

---
 app/assets/javascripts/editor/evaluation.js.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/editor/evaluation.js.erb b/app/assets/javascripts/editor/evaluation.js.erb
index 3aa4e25d..55e106d8 100644
--- a/app/assets/javascripts/editor/evaluation.js.erb
+++ b/app/assets/javascripts/editor/evaluation.js.erb
@@ -152,19 +152,19 @@ CodeOceanEditorEvaluation = {
     var element = this.findOrCreateOutputElement(index);
     if (!colorize) {
       if (output.stdout != undefined && output.stdout != '') {
-        element.append(output.stdout)
+        element.text(element.text() + output.stdout)
       }
 
       if (output.stderr != undefined && output.stderr != '') {
-        element.append('StdErr: ' + output.stderr);
+        element.text('StdErr: ' + element.text() + output.stderr);
       }
 
     } else if (output.stderr) {
-      element.addClass('text-warning').append(output.stderr);
+      element.addClass('text-warning').text(element.text() + output.stderr);
       this.flowrOutputBuffer += output.stderr;
       this.QaApiOutputBuffer.stderr += output.stderr;
     } else if (output.stdout) {
-      element.addClass('text-success').append(output.stdout);
+      element.addClass('text-success').text(element.text() + output.stdout);
       this.flowrOutputBuffer += output.stdout;
       this.QaApiOutputBuffer.stdout += output.stdout;
     } else {

From 1093968782247aa7bdab01589d5b0e90c0c2bc3d Mon Sep 17 00:00:00 2001
From: Ralf Teusner <ralf.teusner@hpi.de>
Date: Fri, 13 Jul 2018 11:12:07 +0200
Subject: [PATCH 2/2] fix error parsing for result boxes

---
 lib/junit_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/junit_adapter.rb b/lib/junit_adapter.rb
index 6230a785..df0eff5d 100644
--- a/lib/junit_adapter.rb
+++ b/lib/junit_adapter.rb
@@ -2,7 +2,7 @@ class JunitAdapter < TestingFrameworkAdapter
   COUNT_REGEXP = /Tests run: (\d+)/
   FAILURES_REGEXP = /Failures: (\d+)/
   SUCCESS_REGEXP = /OK \((\d+) test[s]?\)/
-  ASSERTION_ERROR_REGEXP = /java\.lang\.AssertionError:\s(.*)|org\.junit\.ComparisonFailure:\s(.*)/
+  ASSERTION_ERROR_REGEXP = /java\.lang\.AssertionError:?\s(.*?)\tat org.junit|org\.junit\.ComparisonFailure:\s(.*?)\tat org.junit/m
 
   def self.framework_name
     'JUnit'