From 017dfcbff84b59a9cc99631fc4f33f8b2fc7920c Mon Sep 17 00:00:00 2001
From: Marcus Svartmark <marcus.svartmark@redpill-linpro.com>
Date: Thu, 9 Nov 2017 16:32:35 +0100
Subject: [PATCH] Fix null check to work with assertEqual-failures and
 exception messages containing reserved xml characters

---
 .../org/alfresco/rad/test/runtest.get.xml.ftl | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/alfresco-rad/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/rad/test/runtest.get.xml.ftl b/modules/alfresco-rad/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/rad/test/runtest.get.xml.ftl
index 5dce1938..a3bbda65 100644
--- a/modules/alfresco-rad/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/rad/test/runtest.get.xml.ftl
+++ b/modules/alfresco-rad/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/rad/test/runtest.get.xml.ftl
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <response>
-    <test>${test?html}</test>
-    <result>${result?html}</result>
+    <test>${test?xml}</test>
+    <result>${result?xml}</result>
 <#if failures??>
     <failures>
         <#list failures as failure>
-            <trace>${failure.getTrace()?html}</trace>
-            <exception>${failure.getException()?html}</exception>
-            <message>${failure.getMessage()!""?html}</message>
-            <testHeader>${failure.getTestHeader()?html}</testHeader>
+            <trace>${failure.getTrace()?xml}</trace>
+            <exception>${failure.getException()?xml}</exception>
+            <message>${failure.getMessage()!?xml}</message>
+            <testHeader>${failure.getTestHeader()?xml}</testHeader>
         </#list>
     </failures>
 </#if>
-    <failureCount>${failureCount?html}</failureCount>
-    <ignoreCount>${ignoreCount?html}</ignoreCount>
-    <runCount>${runCount?html}</runCount>
-    <runTime>${runTime?html}</runTime>
+    <failureCount>${failureCount?xml}</failureCount>
+    <ignoreCount>${ignoreCount?xml}</ignoreCount>
+    <runCount>${runCount?xml}</runCount>
+    <runTime>${runTime?xml}</runTime>
 <#if throwables??>
     <throwables>
         <#list throwables as throwable>
-            <throwable>${throwable?html}</throwable>
+            <throwable>${throwable?xml}</throwable>
         </#list>
     </throwables>
 </#if>