From 3bc793d95293d40dbab62c593ce4ceaa86fae25b Mon Sep 17 00:00:00 2001
From: Adrian Kummerländer
Date: Thu, 29 May 2014 13:26:37 +0200
Subject: Improved TransformationFacade error handling * ErrorHandler class
 created in 5859cb6 now caches all errors instead of pushing them to std::cerr
 ** cached errors are retrieved by TransformationFacade's "generate" member
 method * test frontend pushes all errors to std::cerr * FunctionTransform
 returns errors to the calling template as XML ** FunctionTransform test case
 demonstrates how one may test for successful transformation * "generate"
 member method returns std::string vector wrapped in a std::unique_ptr ** this
 is used as a kind of optional pointer, as the std::unique_ptr instance only
 wraps a vector if errors where actually generated

---
 test/transform/transformation.xsl | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/transform/transformation.xsl b/test/transform/transformation.xsl
index f2cc787..19c42ae 100644
--- a/test/transform/transformation.xsl
+++ b/test/transform/transformation.xsl
@@ -23,21 +23,30 @@
 		)
 	</xsl:variable>
 
-	<xsl:variable name="result" select="dyn:evaluate($command)"/>
+	<xsl:copy-of select="dyn:evaluate($command)"/>
 </xsl:template>
 
 <xsl:template name="implementation">
-	<xsl:call-template name="transformer">
-		<xsl:with-param name="transformation">test.xsl</xsl:with-param>
-		<xsl:with-param name="target">test_actual.xml</xsl:with-param>
-		<xsl:with-param name="parameters">
-			<test>21</test>
-		</xsl:with-param>
-	</xsl:call-template>
+	<xsl:variable name="result">
+		<xsl:call-template name="transformer">
+			<xsl:with-param name="transformation">test.xsl</xsl:with-param>
+			<xsl:with-param name="target">test_actual.xml</xsl:with-param>
+			<xsl:with-param name="parameters">
+				<test>21</test>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:variable>
 
-	<xsl:copy-of select="
-		InputXSLT:read-xml-file('test_actual.xml')/test_case/transform_test/*
-	"/>
+	<xsl:choose>
+		<xsl:when test="xalan:nodeset($result)/result/error">
+			<xsl:copy-of select="xalan:nodeset($result)/result/error"/>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:copy-of select="
+				InputXSLT:read-xml-file('test_actual.xml')/test_case/transform_test/*
+			"/>
+		</xsl:otherwise>
+	</xsl:choose>
 </xsl:template>
 
 </xsl:stylesheet>
-- 
cgit v1.2.3