From dff0414d4881f127e9040b0d29ca2cc3ee05ca9c Mon Sep 17 00:00:00 2001
From: Jostein Austvik Jacobsen <josteinaj@gmail.com>
Date: Wed, 19 Oct 2016 12:25:57 +0200
Subject: [PATCH] Fixed regression test for #4 and #44. Added catalog.xml.

---
 .../regression-tests/issue-4_temp-dir-option.xprocspec    | 8 ++++----
 xprocspec/catalog.xml                                     | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 xprocspec/catalog.xml

diff --git a/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec b/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec
index 6a3ddeb..201783b 100644
--- a/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec
+++ b/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec
@@ -2,17 +2,17 @@
 <?xml-model href="http://www.daisy.org/ns/xprocspec/xprocspec.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <x:description xmlns:x="http://www.daisy.org/ns/xprocspec" xmlns:ex="http://example.net/ns" script="../../steps/temp-dir-option.xpl">
 
-    <x:scenario label="temp-dir">
+    <x:scenario label="temp-dir" pending="Not clear yet whether this is a bug or not; see #44">
         <x:call step="ex:temp-dir-option">
             <x:option name="temp-dir" select="'xprocspec temp-dir value'"/>
-            <x:option name="output-dir" select="'xprocspec output-dir value'"/>
+            <x:option name="output-dir" select="$temp-dir"/>
         </x:call>
         <x:context label="the result">
             <x:document type="port" port="result"/>
         </x:context>
         <x:expect type="count" label="there should be one document on the result port" min="1" max="1"/>
-        <x:expect type="xpath" label="the value of the temp-dir attribute should be 'xprocspec temp-dir value'" test="/*/@temp-dir" equals="'xprocspec temp-dir value'"/>
-        <x:expect type="xpath" label="the value of the output-dir attribute should be 'xprocspec output-dir value'" test="/*/@output-dir" equals="'xprocspec output-dir value'"/>
+        <x:expect type="xpath" label="the value of the output-dir option should not equal the temp-dir value" test="/*/@output-dir" equals="/*/@temp-dir" xfail="true"/>
+        <x:expect type="xpath" label="the value of the $temp-dir variable should not equal the temp-dir value" test="$temp-dir" equals="/*/@temp-dir" xfail="true"/>
     </x:scenario>
 
 </x:description>
diff --git a/xprocspec/catalog.xml b/xprocspec/catalog.xml
new file mode 100644
index 0000000..1563939
--- /dev/null
+++ b/xprocspec/catalog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+   <nextCatalog catalog="src/main/resources/META-INF/catalog.xml"/>
+</catalog>