use XMLUnit

2019-04-07 15:26:03 +02:00
parent 55867bf518
commit 5b8ed483e4
3 changed files with 43 additions and 65 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,12 @@
            <version>5.0.4</version>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <version>2.6.2</version>
+            <scope>test</scope>
+        </dependency>
        <!-- For Toecount -->
        <dependency>
            <groupId>com.sanityinc</groupId>
--- a/src/test/java/org/mustangproject/ZUGFeRD/VersionMigrationTest.java
+++ b/src/test/java/org/mustangproject/ZUGFeRD/VersionMigrationTest.java
@@ -21,6 +21,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.Diff;

 import javax.xml.transform.TransformerException;
 import java.io.File;
@@ -28,10 +30,11 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Scanner;
 import java.util.logging.Level;
 import java.util.logging.Logger;

+import static org.junit.Assert.assertFalse;
+

 /**
 * Every ZUGFeRD 1.0 XML file from <code>src/test/resources/migration/input</code>
@@ -69,9 +72,8 @@ public class VersionMigrationTest {
 	}

 	private static void addFilesFromFolder(final File folder, Collection<Object[]> testSuiteData) {
-		String filePath = null;
 		for (final File fileEntry : folder.listFiles()) {
-			filePath = fileEntry.getAbsolutePath();
+			String filePath = fileEntry.getAbsolutePath();
 			if (fileEntry.isDirectory()) {
 				LOG.log(Level.INFO, "*** testDirectory:{0}", filePath);
 				addFilesFromFolder(fileEntry, testSuiteData);
@@ -100,20 +102,8 @@ public class VersionMigrationTest {
 				// we need to save the string and reload it otherwise two bytes are missing (likely EOF related)
 				String outXML = ResourceUtilities.readFile(StandardCharsets.UTF_8, OUTPUT_DIR + newName);
 				String refXML = ResourceUtilities.readFile(StandardCharsets.UTF_8, REFERENCE_DIR + newName);
-				int t = outXML.length();
-				int r = refXML.length();
-				if (t != r || !(outXML.equals(refXML))) {
-					LOG.info("There are differences between:"
-							+ "\nZUGFeRD 2.0 Test Output @ " + OUTPUT_DIR + newName
-							+ "\nZUGFeRD 2.0 Test Reference @ " + REFERENCE_DIR + newName);
-					LOG.info("\n\nFile sizes:\n "
-							+ "\nZUGFeRD 2.0 Test Output character count: " + t
-							+ "\nZUGFeRD 2.0 Test Refer. character count: " + r);
-					findLineDiffs(outXML, refXML);
-					Assert.fail("Version update failed, as test result and reference are different!");
-				} else {
-					LOG.log(Level.INFO, "\n*** Tested successfull migration from ZUGFeRD 1.0 to 2.0: '" + newName + "'' ***\n", OUTPUT_DIR);
-				}
+				Diff myDiff = DiffBuilder.compare(refXML).withTest(outXML).checkForSimilar().ignoreComments().ignoreWhitespace().build();
+				assertFalse(myDiff.toString(), myDiff.hasDifferences());
 			} else {
 				LOG.log(Level.INFO, "\n*** Migrated from ZUGFeRD 1.0 to 2.0 invoice: '" + newName + "'' ***\n", OUTPUT_DIR);
 			}
@@ -123,22 +113,4 @@ public class VersionMigrationTest {
 		}
 	}

-
-	private static void findLineDiffs(String outXML, String refXML) {
-		Scanner outScanner = new Scanner(outXML);
-		Scanner refScanner = new Scanner(refXML);
-		String outLine = null;
-		String refLine = null;
-		while (outScanner.hasNextLine() && refScanner.hasNextLine()) {
-			outLine = outScanner.nextLine();
-			refLine = refScanner.nextLine();
-			if (!outLine.equals(refLine)) {
-				LOG.info("First line difference between reference and output file:" +
-						"\nRefLine: " + refLine +
-						"\nOutLine: " + outLine + "\n");
-			}
-		}
-		refScanner.close();
-		outScanner.close();
-	}
 }
--- a/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml
+++ b/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml
@@ -18,9 +18,9 @@
 <rsm:CrossIndustryInvoice xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
                          xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:qdt="urn:un:unece:uncefact:data:Standard:QualifiedDataType:100"
-                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!--
-Migrated by Mustangproject XSLT
--><rsm:ExchangedDocumentContext>
+                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+    <!--Migrated by Mustangproject XSLT-->
+    <rsm:ExchangedDocumentContext>
        <ram:TestIndicator>
            <udt:Indicator>false</udt:Indicator>
        </ram:TestIndicator>
@@ -28,7 +28,7 @@ Migrated by Mustangproject XSLT
            <ram:ID>urn:ferd:CrossIndustryDocument:invoice:1p0:extended</ram:ID>
        </ram:GuidelineSpecifiedDocumentContextParameter>
    </rsm:ExchangedDocumentContext>
-   <rsm:ExchangedDocument xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100">
+    <rsm:ExchangedDocument xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100">
        <ram:ID>RE-20170509/505</ram:ID>
        <ram:Name>RECHNUNG</ram:Name>
        <ram:TypeCode>380</ram:TypeCode>
@@ -36,16 +36,16 @@ Migrated by Mustangproject XSLT
            <udt:DateTimeString format="102">20170509</udt:DateTimeString>
        </ram:IssueDateTime>
    </rsm:ExchangedDocument>
-   <rsm:SupplyChainTradeTransaction xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100">
-      <ram:IncludedSupplyChainTradeLineItem>
-         <ram:AssociatedDocumentLineDocument>
+    <rsm:SupplyChainTradeTransaction xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100">
+        <ram:IncludedSupplyChainTradeLineItem>
+            <ram:AssociatedDocumentLineDocument>
                <ram:LineID>1</ram:LineID>
            </ram:AssociatedDocumentLineDocument>
-         <ram:SpecifiedTradeProduct>
+            <ram:SpecifiedTradeProduct>
                <ram:Name>Künstlerische Gestaltung (Stunde): Einer Beispielrechnung</ram:Name>
                <ram:Description/>
            </ram:SpecifiedTradeProduct>
-         <ram:SpecifiedLineTradeAgreement>
+            <ram:SpecifiedLineTradeAgreement>
                <ram:GrossPriceProductTradePrice>
                    <ram:ChargeAmount currencyID="EUR">160.0000</ram:ChargeAmount>
                    <ram:BasisQuantity unitCode="HUR">1.0000</ram:BasisQuantity>
@@ -55,10 +55,10 @@ Migrated by Mustangproject XSLT
                    <ram:BasisQuantity unitCode="HUR">1.0000</ram:BasisQuantity>
                </ram:NetPriceProductTradePrice>
            </ram:SpecifiedLineTradeAgreement>
-         <ram:SpecifiedLineTradeDelivery>
+            <ram:SpecifiedLineTradeDelivery>
                <ram:BilledQuantity unitCode="HUR">1.0000</ram:BilledQuantity>
            </ram:SpecifiedLineTradeDelivery>
-         <ram:SpecifiedLineTradeSettlement>
+            <ram:SpecifiedLineTradeSettlement>
                <ram:ApplicableTradeTax>
                    <ram:TypeCode>VAT</ram:TypeCode>
                    <ram:CategoryCode>S</ram:CategoryCode>
@@ -68,16 +68,16 @@ Migrated by Mustangproject XSLT
                    <ram:LineTotalAmount currencyID="EUR">160.00</ram:LineTotalAmount>
                </ram:SpecifiedTradeSettlementLineMonetarySummation>
            </ram:SpecifiedLineTradeSettlement>
-      </ram:IncludedSupplyChainTradeLineItem>
-      <ram:IncludedSupplyChainTradeLineItem>
-         <ram:AssociatedDocumentLineDocument>
+        </ram:IncludedSupplyChainTradeLineItem>
+        <ram:IncludedSupplyChainTradeLineItem>
+            <ram:AssociatedDocumentLineDocument>
                <ram:LineID>2</ram:LineID>
            </ram:AssociatedDocumentLineDocument>
-         <ram:SpecifiedTradeProduct>
+            <ram:SpecifiedTradeProduct>
                <ram:Name>Luftballon: Bunt, ca. 500ml</ram:Name>
                <ram:Description/>
            </ram:SpecifiedTradeProduct>
-         <ram:SpecifiedLineTradeAgreement>
+            <ram:SpecifiedLineTradeAgreement>
                <ram:GrossPriceProductTradePrice>
                    <ram:ChargeAmount currencyID="EUR">0.7900</ram:ChargeAmount>
                    <ram:BasisQuantity unitCode="C62">1.0000</ram:BasisQuantity>
@@ -87,10 +87,10 @@ Migrated by Mustangproject XSLT
                    <ram:BasisQuantity unitCode="C62">1.0000</ram:BasisQuantity>
                </ram:NetPriceProductTradePrice>
            </ram:SpecifiedLineTradeAgreement>
-         <ram:SpecifiedLineTradeDelivery>
+            <ram:SpecifiedLineTradeDelivery>
                <ram:BilledQuantity unitCode="C62">400.0000</ram:BilledQuantity>
            </ram:SpecifiedLineTradeDelivery>
-         <ram:SpecifiedLineTradeSettlement>
+            <ram:SpecifiedLineTradeSettlement>
                <ram:ApplicableTradeTax>
                    <ram:TypeCode>VAT</ram:TypeCode>
                    <ram:CategoryCode>S</ram:CategoryCode>
@@ -100,16 +100,16 @@ Migrated by Mustangproject XSLT
                    <ram:LineTotalAmount currencyID="EUR">316.00</ram:LineTotalAmount>
                </ram:SpecifiedTradeSettlementLineMonetarySummation>
            </ram:SpecifiedLineTradeSettlement>
-      </ram:IncludedSupplyChainTradeLineItem>
-      <ram:IncludedSupplyChainTradeLineItem>
-         <ram:AssociatedDocumentLineDocument>
+        </ram:IncludedSupplyChainTradeLineItem>
+        <ram:IncludedSupplyChainTradeLineItem>
+            <ram:AssociatedDocumentLineDocument>
                <ram:LineID>3</ram:LineID>
            </ram:AssociatedDocumentLineDocument>
-         <ram:SpecifiedTradeProduct>
+            <ram:SpecifiedTradeProduct>
                <ram:Name>Heiße Luft pro Liter</ram:Name>
                <ram:Description/>
            </ram:SpecifiedTradeProduct>
-         <ram:SpecifiedLineTradeAgreement>
+            <ram:SpecifiedLineTradeAgreement>
                <ram:GrossPriceProductTradePrice>
                    <ram:ChargeAmount currencyID="EUR">0.1000</ram:ChargeAmount>
                    <ram:BasisQuantity unitCode="LTR">1.0000</ram:BasisQuantity>
@@ -119,10 +119,10 @@ Migrated by Mustangproject XSLT
                    <ram:BasisQuantity unitCode="LTR">1.0000</ram:BasisQuantity>
                </ram:NetPriceProductTradePrice>
            </ram:SpecifiedLineTradeAgreement>
-         <ram:SpecifiedLineTradeDelivery>
+            <ram:SpecifiedLineTradeDelivery>
                <ram:BilledQuantity unitCode="LTR">200.0000</ram:BilledQuantity>
            </ram:SpecifiedLineTradeDelivery>
-         <ram:SpecifiedLineTradeSettlement>
+            <ram:SpecifiedLineTradeSettlement>
                <ram:ApplicableTradeTax>
                    <ram:TypeCode>VAT</ram:TypeCode>
                    <ram:CategoryCode>S</ram:CategoryCode>
@@ -132,8 +132,8 @@ Migrated by Mustangproject XSLT
                    <ram:LineTotalAmount currencyID="EUR">20.00</ram:LineTotalAmount>
                </ram:SpecifiedTradeSettlementLineMonetarySummation>
            </ram:SpecifiedLineTradeSettlement>
-      </ram:IncludedSupplyChainTradeLineItem>
-      <ram:ApplicableHeaderTradeAgreement>
+        </ram:IncludedSupplyChainTradeLineItem>
+        <ram:ApplicableHeaderTradeAgreement>
            <ram:SellerTradeParty>
                <ram:Name>Bei Spiel GmbH</ram:Name>
                <ram:PostalTradeAddress>
@@ -162,14 +162,14 @@ Migrated by Mustangproject XSLT
                </ram:SpecifiedTaxRegistration>
            </ram:BuyerTradeParty>
        </ram:ApplicableHeaderTradeAgreement>
-      <ram:ApplicableHeaderTradeDelivery>
+        <ram:ApplicableHeaderTradeDelivery>
            <ram:ActualDeliverySupplyChainEvent>
                <ram:OccurrenceDateTime>
                    <udt:DateTimeString format="102">20170507</udt:DateTimeString>
                </ram:OccurrenceDateTime>
            </ram:ActualDeliverySupplyChainEvent>
        </ram:ApplicableHeaderTradeDelivery>
-      <ram:ApplicableHeaderTradeSettlement>
+        <ram:ApplicableHeaderTradeSettlement>
            <ram:PaymentReference>RE-20170509/505</ram:PaymentReference>
            <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
            <ram:SpecifiedTradeSettlementPaymentMeans>
@@ -215,6 +215,6 @@ Migrated by Mustangproject XSLT
                <ram:DuePayableAmount currencyID="EUR">571.04</ram:DuePayableAmount>
            </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
        </ram:ApplicableHeaderTradeSettlement>
-   </rsm:SupplyChainTradeTransaction>
+    </rsm:SupplyChainTradeTransaction>
 </rsm:CrossIndustryInvoice>