From a0e0e755bad3a9192d99521f4eca3c1bc3742aa9 Mon Sep 17 00:00:00 2001
From: Ian Will <ian.will@oracle.com>
Date: Thu, 9 Jul 2020 16:53:39 -0400
Subject: [PATCH 1/2] Consolidate all extra content into a single system.out
 tag

Jenkins only displays the first system-out tag. We'd like to see
_all_ the system output though.
---
 lib/serialize.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/serialize.js b/lib/serialize.js
index c6ba01c..84c12a9 100644
--- a/lib/serialize.js
+++ b/lib/serialize.js
@@ -7,6 +7,7 @@ module.exports = function serialize (testCases) {
     var suiteElement = rootXml.ele('testsuite');
     var skipped;
     var failureElement;
+    var extraContent;
     suiteElement.att('tests', suite.asserts.length);
     skipped = suite.asserts.filter(function (a) {
         return a.skip;
@@ -34,9 +35,11 @@ module.exports = function serialize (testCases) {
           }
       }
       if(i === suite.asserts.length -1) {
+        extraContent = [];
         suite.extra.forEach(function (extraContent) {
-          testCaseElement.ele('system-out', sanitizeString(extraContent));
+          extraContent.push(sanitizeString(extraContent))
         });
+        testCaseElement.ele('system-out', extraContent.join('\n'));
       }
     });
   });

From e9a7750d88fcb647562cef36053a486341523ea6 Mon Sep 17 00:00:00 2001
From: Ian Will <ian.will@oracle.com>
Date: Thu, 9 Jul 2020 17:12:31 -0400
Subject: [PATCH 2/2] Fix bugs & test

---
 lib/serialize.js                  | 8 +++++---
 unit-tests/serialization-tests.js | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/serialize.js b/lib/serialize.js
index 84c12a9..7f8f179 100644
--- a/lib/serialize.js
+++ b/lib/serialize.js
@@ -36,10 +36,12 @@ module.exports = function serialize (testCases) {
       }
       if(i === suite.asserts.length -1) {
         extraContent = [];
-        suite.extra.forEach(function (extraContent) {
-          extraContent.push(sanitizeString(extraContent))
+        suite.extra.forEach(function (extraContentLine) {
+          extraContent.push(sanitizeString(extraContentLine))
         });
-        testCaseElement.ele('system-out', extraContent.join('\n'));
+        if (extraContent.length > 0) {
+          testCaseElement.ele('system-out', extraContent.join(''));
+        }
       }
     });
   });
diff --git a/unit-tests/serialization-tests.js b/unit-tests/serialization-tests.js
index 02232a7..36eb5ab 100644
--- a/unit-tests/serialization-tests.js
+++ b/unit-tests/serialization-tests.js
@@ -106,7 +106,7 @@ var serialize = require('../lib/serialize');
                         { '$': { name: '#1 should be equal' } },
                         {
                             '$': { name: '#2 should be equal' },
-                            'system-out': [ 'see me\n', 'me too\n' ]
+                            'system-out': [ 'see me\nme too\n' ]
                         },
                     ],
                 }]