From d0d216ff0ccb6fe063899dc28ec78be8d4cf9b35 Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Tue, 20 Feb 2024 17:58:23 +0100
Subject: [PATCH] Fixed tests

---
 .../v1/ves-sch-en16931-ubl-creditnote-1.3.10.xml | 15 ++++++++++-----
 .../v1/ves-sch-en16931-ubl-invoice-1.3.10.xml    | 16 +++++++++++-----
 .../ves/v1/ves-xsd-ubl-creditnote-2.1.xml        | 11 -----------
 .../resources/ves/v1/ves-xsd-ubl-invoice-2.1.xml | 11 -----------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-creditnote-1.3.10.xml b/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-creditnote-1.3.10.xml
index 4f2aceb3..e06423a0 100644
--- a/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-creditnote-1.3.10.xml
+++ b/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-creditnote-1.3.10.xml
@@ -31,11 +31,6 @@
     <groupId>org.oasis-open.ubl</groupId>
     <artifactId>creditnote</artifactId>
     <version>2.1</version>
-    
-    <namespaces>
-      <!-- redefined only this prefix -->
-      <namespace prefix="ubl" uri="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" overwrite="true" />
-    </namespaces>
   </requires>
   
   <schematron>
@@ -47,5 +42,15 @@
       <type>xslt</type>
     </resource>
     <engine>iso-schematron</engine>
+
+    <namespaces>
+      <namespace prefix="ubl" uri="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" />
+      <namespace prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance" />
+      <namespace prefix="xs" uri="http://www.w3.org/2001/XMLSchema" />
+      <namespace prefix="cac" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" />
+      <namespace prefix="cbc" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" />
+      <namespace prefix="cec" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" />
+      <namespace prefix="ds" uri="http://www.w3.org/2000/09/xmldsig#" />
+    </namespaces>
   </schematron>
 </ves>
diff --git a/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-invoice-1.3.10.xml b/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-invoice-1.3.10.xml
index 234ec8d4..404510b4 100644
--- a/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-invoice-1.3.10.xml
+++ b/phive-ves-model/src/test/resources/ves/v1/ves-sch-en16931-ubl-invoice-1.3.10.xml
@@ -31,11 +31,6 @@
     <groupId>org.oasis-open.ubl</groupId>
     <artifactId>invoice</artifactId>
     <version>2.1</version>
-    
-    <namespaces>
-      <!-- redefined only this prefix -->
-      <namespace prefix="ubl" uri="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" overwrite="true" />
-    </namespaces>
   </requires>
   
   <schematron>
@@ -49,6 +44,17 @@
     <!-- 
     <precondition type="xpath">/ubl:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'AT'</precondition>
     -->
+    <!--
+    <namespaces>
+      <namespace prefix="ubl" uri="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" />
+      <namespace prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance" />
+      <namespace prefix="xs" uri="http://www.w3.org/2001/XMLSchema" />
+      <namespace prefix="cac" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" />
+      <namespace prefix="cbc" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" />
+      <namespace prefix="cec" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" />
+      <namespace prefix="ds" uri="http://www.w3.org/2000/09/xmldsig#" />
+    </namespaces>
+    -->
     <!-- 
     <input>
       <option name="language" value="en" />
diff --git a/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-creditnote-2.1.xml b/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-creditnote-2.1.xml
index 659cdaf6..4ffecbb4 100644
--- a/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-creditnote-2.1.xml
+++ b/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-creditnote-2.1.xml
@@ -34,16 +34,5 @@
     </resource>
     <!-- when resource is ZIP, main is needed -->
     <main>xsdrt/maindoc/UBL-CreditNote-2.1.xsd</main>
-    <!-- 
-    <namespaces>
-      <namespace prefix="" uri="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" />
-      <namespace prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance" />
-      <namespace prefix="xs" uri="http://www.w3.org/2001/XMLSchema" />
-      <namespace prefix="cac" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" />
-      <namespace prefix="cbc" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" />
-      <namespace prefix="cec" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" />
-      <namespace prefix="ds" uri="http://www.w3.org/2000/09/xmldsig#" />
-    </namespaces>
-     -->
   </xsd>
 </ves>
diff --git a/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-invoice-2.1.xml b/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-invoice-2.1.xml
index 6f5dcfe0..7f85db6c 100644
--- a/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-invoice-2.1.xml
+++ b/phive-ves-model/src/test/resources/ves/v1/ves-xsd-ubl-invoice-2.1.xml
@@ -57,17 +57,6 @@ REWRITE_SYSTEM "StandardBusinessDocumentHeader.xsd" "maven:com.helger:ph-sbdh:ja
         </resource>
       </system>
     </catalog>
-    <!--
-    <namespaces>
-      <namespace prefix="" uri="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" />
-      <namespace prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance" />
-      <namespace prefix="xs" uri="http://www.w3.org/2001/XMLSchema" />
-      <namespace prefix="cac" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" />
-      <namespace prefix="cbc" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" />
-      <namespace prefix="cec" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" />
-      <namespace prefix="ds" uri="http://www.w3.org/2000/09/xmldsig#" />
-    </namespaces>
-    -->
     <!-- 
     <precondition type="xpath">count(/Invoice/cec:UBLExtensions/cec:UBLExtension/cec:ExtensionContent/ds:Signature)</precondition>
      -->