louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove \t and whitespaces from xml

Browse Source
This commit is contained in:
Sebastian Sieber
2022-03-21 16:23:53 +01:00
parent 577ac0e930
commit 4077700b2e
4 changed files with 223 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementDebit.java
View File

@@ -24,6 +24,7 @@ public interface IZUGFeRDTradeSettlementDebit extends IZUGFeRDTradeSettlement {
@Override
default String getSettlementXML() { default String getSettlementXML() {
@@ -38,6 +39,7 @@ public interface IZUGFeRDTradeSettlementDebit extends IZUGFeRDTradeSettlement {
return xml; return xml;
} }
@Override
default String getPaymentXML() { default String getPaymentXML() {
return "<ram:DirectDebitMandateID>"+XMLTools.encodeXML(getMandate())+"</ram:DirectDebitMandateID>"; return "<ram:DirectDebitMandateID>"+XMLTools.encodeXML(getMandate())+"</ram:DirectDebitMandateID>";
} }

20
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDTradeSettlementPayment.java
View File

@@ -66,19 +66,19 @@ public interface IZUGFeRDTradeSettlementPayment extends IZUGFeRDTradeSettlement
} }
String xml = " <ram:SpecifiedTradeSettlementPaymentMeans>" String xml = "<ram:SpecifiedTradeSettlementPaymentMeans>"
+ " <ram:TypeCode>58</ram:TypeCode>" + "<ram:TypeCode>58</ram:TypeCode>"
+ " <ram:Information>SEPA credit transfer</ram:Information>" + "<ram:Information>SEPA credit transfer</ram:Information>"
+ " <ram:PayeePartyCreditorFinancialAccount>" + "<ram:PayeePartyCreditorFinancialAccount>"
+ " <ram:IBANID>" + XMLTools.encodeXML(getOwnIBAN()) + "</ram:IBANID>"; + "<ram:IBANID>" + XMLTools.encodeXML(getOwnIBAN()) + "</ram:IBANID>";
xml+= accountNameStr; xml+= accountNameStr;
xml+= " </ram:PayeePartyCreditorFinancialAccount>" xml+= "</ram:PayeePartyCreditorFinancialAccount>"
+ " <ram:PayeeSpecifiedCreditorFinancialInstitution>" + "<ram:PayeeSpecifiedCreditorFinancialInstitution>"
+ " <ram:BICID>" + XMLTools.encodeXML(getOwnBIC()) + "</ram:BICID>" + "<ram:BICID>" + XMLTools.encodeXML(getOwnBIC()) + "</ram:BICID>"
// + " <ram:Name>"+trans.getOwnBankName()+"</ram:Name>" // + " <ram:Name>"+trans.getOwnBankName()+"</ram:Name>"
// //
+ " </ram:PayeeSpecifiedCreditorFinancialInstitution>" + "</ram:PayeeSpecifiedCreditorFinancialInstitution>"
+ " </ram:SpecifiedTradeSettlementPaymentMeans>"; + "</ram:SpecifiedTradeSettlementPaymentMeans>";
return xml; return xml;
} }

376
library/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java
View File

@@ -67,194 +67,194 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
* */ * */
String ownZUGFeRDXML = new String(UTF8ByteOrderMark, StandardCharsets.UTF_8) + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + String ownZUGFeRDXML = new String(UTF8ByteOrderMark, StandardCharsets.UTF_8) + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<rsm:CrossIndustryInvoice xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rsm=\"urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100\" xmlns:ram=\"urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100\" xmlns:udt=\"urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100\">\n" + "<rsm:CrossIndustryInvoice xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rsm=\"urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100\" xmlns:ram=\"urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100\" xmlns:udt=\"urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100\">\n" +
" <rsm:ExchangedDocumentContext>\n" + "<rsm:ExchangedDocumentContext>\n" +
" <ram:TestIndicator><udt:Indicator>false</udt:Indicator></ram:TestIndicator>\n" + "<ram:TestIndicator><udt:Indicator>false</udt:Indicator></ram:TestIndicator>\n" +
" <ram:GuidelineSpecifiedDocumentContextParameter>\n" + "<ram:GuidelineSpecifiedDocumentContextParameter>\n" +
" <ram:ID>urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended</ram:ID>\n" + "<ram:ID>urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended</ram:ID>\n" +
" </ram:GuidelineSpecifiedDocumentContextParameter>\n" + "</ram:GuidelineSpecifiedDocumentContextParameter>\n" +
" </rsm:ExchangedDocumentContext>\n" + "</rsm:ExchangedDocumentContext>\n" +
" <rsm:ExchangedDocument>\n" + "<rsm:ExchangedDocument>\n" +
" <ram:ID>RE-20171118/506</ram:ID>\n" + "<ram:ID>RE-20171118/506</ram:ID>\n" +
" <ram:Name>RECHNUNG</ram:Name>\n" + "<ram:Name>RECHNUNG</ram:Name>\n" +
" <ram:TypeCode>380</ram:TypeCode>\n" + "<ram:TypeCode>380</ram:TypeCode>\n" +
" <ram:IssueDateTime><udt:DateTimeString format=\"102\">20171118</udt:DateTimeString></ram:IssueDateTime>\n" + "<ram:IssueDateTime><udt:DateTimeString format=\"102\">20171118</udt:DateTimeString></ram:IssueDateTime>\n" +
" </rsm:ExchangedDocument>\n" + "</rsm:ExchangedDocument>\n" +
" <rsm:SupplyChainTradeTransaction>\n" + "<rsm:SupplyChainTradeTransaction>\n" +
" <ram:IncludedSupplyChainTradeLineItem>\n" + "<ram:IncludedSupplyChainTradeLineItem>\n" +
" <ram:AssociatedDocumentLineDocument>\n" + "<ram:AssociatedDocumentLineDocument>\n" +
" <ram:LineID>1</ram:LineID>\n" + "<ram:LineID>1</ram:LineID>\n" +
" </ram:AssociatedDocumentLineDocument>\n" + "</ram:AssociatedDocumentLineDocument>\n" +
" <ram:SpecifiedTradeProduct>\n" + "<ram:SpecifiedTradeProduct>\n" +
" <ram:Name>Künstlerische Gestaltung (Stunde): Einer Beispielrechnung</ram:Name>\n" + "<ram:Name>Künstlerische Gestaltung (Stunde): Einer Beispielrechnung</ram:Name>\n" +
" <ram:Description></ram:Description>\n" + "<ram:Description></ram:Description>\n" +
" </ram:SpecifiedTradeProduct>\n" + "</ram:SpecifiedTradeProduct>\n" +
" <ram:SpecifiedLineTradeAgreement>\n" + "<ram:SpecifiedLineTradeAgreement>\n" +
" <ram:GrossPriceProductTradePrice>\n" + "<ram:GrossPriceProductTradePrice>\n" +
" <ram:ChargeAmount currencyID=\"EUR\">160.0000</ram:ChargeAmount>\n" + "<ram:ChargeAmount currencyID=\"EUR\">160.0000</ram:ChargeAmount>\n" +
" <ram:BasisQuantity unitCode=\"HUR\">1.0000</ram:BasisQuantity>\n" + "<ram:BasisQuantity unitCode=\"HUR\">1.0000</ram:BasisQuantity>\n" +
" </ram:GrossPriceProductTradePrice>\n" + "</ram:GrossPriceProductTradePrice>\n" +
" <ram:NetPriceProductTradePrice>\n" + "<ram:NetPriceProductTradePrice>\n" +
" <ram:ChargeAmount currencyID=\"EUR\">160.0000</ram:ChargeAmount>\n" + "<ram:ChargeAmount currencyID=\"EUR\">160.0000</ram:ChargeAmount>\n" +
" <ram:BasisQuantity unitCode=\"HUR\">1.0000</ram:BasisQuantity>\n" + "<ram:BasisQuantity unitCode=\"HUR\">1.0000</ram:BasisQuantity>\n" +
" </ram:NetPriceProductTradePrice>\n" + "</ram:NetPriceProductTradePrice>\n" +
" </ram:SpecifiedLineTradeAgreement>\n" + "</ram:SpecifiedLineTradeAgreement>\n" +
" <ram:SpecifiedLineTradeDelivery>\n" + "<ram:SpecifiedLineTradeDelivery>\n" +
" <ram:BilledQuantity unitCode=\"HUR\">1.0000</ram:BilledQuantity>\n" + "<ram:BilledQuantity unitCode=\"HUR\">1.0000</ram:BilledQuantity>\n" +
" </ram:SpecifiedLineTradeDelivery>\n" + "</ram:SpecifiedLineTradeDelivery>\n" +
" <ram:SpecifiedLineTradeSettlement>\n" + "<ram:SpecifiedLineTradeSettlement>\n" +
" <ram:ApplicableTradeTax>\n" + "<ram:ApplicableTradeTax>\n" +
" <ram:TypeCode>VAT</ram:TypeCode>\n" + "<ram:TypeCode>VAT</ram:TypeCode>\n" +
" <ram:CategoryCode>S</ram:CategoryCode>\n" + "<ram:CategoryCode>S</ram:CategoryCode>\n" +
" <ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>\n" + "<ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>\n" +
" </ram:ApplicableTradeTax>\n" + "</ram:ApplicableTradeTax>\n" +
" <ram:SpecifiedTradeSettlementLineMonetarySummation>\n" + "<ram:SpecifiedTradeSettlementLineMonetarySummation>\n" +
" <ram:LineTotalAmount currencyID=\"EUR\">160.00</ram:LineTotalAmount>\n" + "<ram:LineTotalAmount currencyID=\"EUR\">160.00</ram:LineTotalAmount>\n" +
" </ram:SpecifiedTradeSettlementLineMonetarySummation>\n" + "</ram:SpecifiedTradeSettlementLineMonetarySummation>\n" +
" </ram:SpecifiedLineTradeSettlement>\n" + "</ram:SpecifiedLineTradeSettlement>\n" +
" </ram:IncludedSupplyChainTradeLineItem>\n" + "</ram:IncludedSupplyChainTradeLineItem>\n" +
" <ram:IncludedSupplyChainTradeLineItem>\n" + "<ram:IncludedSupplyChainTradeLineItem>\n" +
" <ram:AssociatedDocumentLineDocument>\n" + "<ram:AssociatedDocumentLineDocument>\n" +
" <ram:LineID>2</ram:LineID>\n" + "<ram:LineID>2</ram:LineID>\n" +
" </ram:AssociatedDocumentLineDocument>\n" + "</ram:AssociatedDocumentLineDocument>\n" +
" <ram:SpecifiedTradeProduct>\n" + "<ram:SpecifiedTradeProduct>\n" +
" <ram:Name>Luftballon: Bunt, ca. 500ml</ram:Name>\n" + "<ram:Name>Luftballon: Bunt, ca. 500ml</ram:Name>\n" +
" <ram:Description></ram:Description>\n" + "<ram:Description></ram:Description>\n" +
" </ram:SpecifiedTradeProduct>\n" + "</ram:SpecifiedTradeProduct>\n" +
" <ram:SpecifiedLineTradeAgreement>\n" + "<ram:SpecifiedLineTradeAgreement>\n" +
" <ram:GrossPriceProductTradePrice>\n" + "<ram:GrossPriceProductTradePrice>\n" +
" <ram:ChargeAmount currencyID=\"EUR\">0.7900</ram:ChargeAmount>\n" + "<ram:ChargeAmount currencyID=\"EUR\">0.7900</ram:ChargeAmount>\n" +
" <ram:BasisQuantity unitCode=\"C62\">1.0000</ram:BasisQuantity>\n" + "<ram:BasisQuantity unitCode=\"C62\">1.0000</ram:BasisQuantity>\n" +
" </ram:GrossPriceProductTradePrice>\n" + "</ram:GrossPriceProductTradePrice>\n" +
" <ram:NetPriceProductTradePrice>\n" + "<ram:NetPriceProductTradePrice>\n" +
" <ram:ChargeAmount currencyID=\"EUR\">0.7900</ram:ChargeAmount>\n" + "<ram:ChargeAmount currencyID=\"EUR\">0.7900</ram:ChargeAmount>\n" +
" <ram:BasisQuantity unitCode=\"C62\">1.0000</ram:BasisQuantity>\n" + "<ram:BasisQuantity unitCode=\"C62\">1.0000</ram:BasisQuantity>\n" +
" </ram:NetPriceProductTradePrice>\n" + "</ram:NetPriceProductTradePrice>\n" +
" </ram:SpecifiedLineTradeAgreement>\n" + "</ram:SpecifiedLineTradeAgreement>\n" +
" <ram:SpecifiedLineTradeDelivery>\n" + "<ram:SpecifiedLineTradeDelivery>\n" +
" <ram:BilledQuantity unitCode=\"C62\">400.0000</ram:BilledQuantity>\n" + "<ram:BilledQuantity unitCode=\"C62\">400.0000</ram:BilledQuantity>\n" +
" </ram:SpecifiedLineTradeDelivery>\n" + "</ram:SpecifiedLineTradeDelivery>\n" +
" <ram:SpecifiedLineTradeSettlement>\n" + "<ram:SpecifiedLineTradeSettlement>\n" +
" <ram:ApplicableTradeTax>\n" + "<ram:ApplicableTradeTax>\n" +
" <ram:TypeCode>VAT</ram:TypeCode>\n" + "<ram:TypeCode>VAT</ram:TypeCode>\n" +
" <ram:CategoryCode>S</ram:CategoryCode>\n" + "<ram:CategoryCode>S</ram:CategoryCode>\n" +
" <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>\n" + "<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>\n" +
" </ram:ApplicableTradeTax>\n" + "</ram:ApplicableTradeTax>\n" +
" <ram:SpecifiedTradeSettlementLineMonetarySummation>\n" + "<ram:SpecifiedTradeSettlementLineMonetarySummation>\n" +
" <ram:LineTotalAmount currencyID=\"EUR\">316.00</ram:LineTotalAmount>\n" + "<ram:LineTotalAmount currencyID=\"EUR\">316.00</ram:LineTotalAmount>\n" +
" </ram:SpecifiedTradeSettlementLineMonetarySummation>\n" + "</ram:SpecifiedTradeSettlementLineMonetarySummation>\n" +
" </ram:SpecifiedLineTradeSettlement>\n" + "</ram:SpecifiedLineTradeSettlement>\n" +
" </ram:IncludedSupplyChainTradeLineItem>\n" + "</ram:IncludedSupplyChainTradeLineItem>\n" +
" <ram:IncludedSupplyChainTradeLineItem>\n" + "<ram:IncludedSupplyChainTradeLineItem>\n" +
" <ram:AssociatedDocumentLineDocument>\n" + "<ram:AssociatedDocumentLineDocument>\n" +
" <ram:LineID>3</ram:LineID>\n" + "<ram:LineID>3</ram:LineID>\n" +
" </ram:AssociatedDocumentLineDocument>\n" + "</ram:AssociatedDocumentLineDocument>\n" +
" <ram:SpecifiedTradeProduct>\n" + "<ram:SpecifiedTradeProduct>\n" +
" <ram:Name>Heiße Luft pro Liter</ram:Name>\n" + "<ram:Name>Heiße Luft pro Liter</ram:Name>\n" +
" <ram:Description></ram:Description>\n" + "<ram:Description></ram:Description>\n" +
" </ram:SpecifiedTradeProduct>\n" + "</ram:SpecifiedTradeProduct>\n" +
" <ram:SpecifiedLineTradeAgreement>\n" + "<ram:SpecifiedLineTradeAgreement>\n" +
" <ram:GrossPriceProductTradePrice>\n" + "<ram:GrossPriceProductTradePrice>\n" +
" <ram:ChargeAmount currencyID=\"EUR\">0.1000</ram:ChargeAmount>\n" + "<ram:ChargeAmount currencyID=\"EUR\">0.1000</ram:ChargeAmount>\n" +
" <ram:BasisQuantity unitCode=\"LTR\">1.0000</ram:BasisQuantity>\n" + "<ram:BasisQuantity unitCode=\"LTR\">1.0000</ram:BasisQuantity>\n" +
" </ram:GrossPriceProductTradePrice>\n" + "</ram:GrossPriceProductTradePrice>\n" +
" <ram:NetPriceProductTradePrice>\n" + "<ram:NetPriceProductTradePrice>\n" +
" <ram:ChargeAmount currencyID=\"EUR\">0.1000</ram:ChargeAmount>\n" + "<ram:ChargeAmount currencyID=\"EUR\">0.1000</ram:ChargeAmount>\n" +
" <ram:BasisQuantity unitCode=\"LTR\">1.0000</ram:BasisQuantity>\n" + "<ram:BasisQuantity unitCode=\"LTR\">1.0000</ram:BasisQuantity>\n" +
" </ram:NetPriceProductTradePrice>\n" + "</ram:NetPriceProductTradePrice>\n" +
" </ram:SpecifiedLineTradeAgreement>\n" + "</ram:SpecifiedLineTradeAgreement>\n" +
" <ram:SpecifiedLineTradeDelivery>\n" + "<ram:SpecifiedLineTradeDelivery>\n" +
" <ram:BilledQuantity unitCode=\"LTR\">200.0000</ram:BilledQuantity>\n" + "<ram:BilledQuantity unitCode=\"LTR\">200.0000</ram:BilledQuantity>\n" +
" </ram:SpecifiedLineTradeDelivery>\n" + "</ram:SpecifiedLineTradeDelivery>\n" +
" <ram:SpecifiedLineTradeSettlement>\n" + "<ram:SpecifiedLineTradeSettlement>\n" +
" <ram:ApplicableTradeTax>\n" + "<ram:ApplicableTradeTax>\n" +
" <ram:TypeCode>VAT</ram:TypeCode>\n" + "<ram:TypeCode>VAT</ram:TypeCode>\n" +
" <ram:CategoryCode>S</ram:CategoryCode>\n" + "<ram:CategoryCode>S</ram:CategoryCode>\n" +
" <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>\n" + "<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>\n" +
" </ram:ApplicableTradeTax>\n" + "</ram:ApplicableTradeTax>\n" +
" <ram:SpecifiedTradeSettlementLineMonetarySummation>\n" + "<ram:SpecifiedTradeSettlementLineMonetarySummation>\n" +
" <ram:LineTotalAmount currencyID=\"EUR\">20.00</ram:LineTotalAmount>\n" + "<ram:LineTotalAmount currencyID=\"EUR\">20.00</ram:LineTotalAmount>\n" +
" </ram:SpecifiedTradeSettlementLineMonetarySummation>\n" + "</ram:SpecifiedTradeSettlementLineMonetarySummation>\n" +
" </ram:SpecifiedLineTradeSettlement>\n" + "</ram:SpecifiedLineTradeSettlement>\n" +
" </ram:IncludedSupplyChainTradeLineItem>\n" + "</ram:IncludedSupplyChainTradeLineItem>\n" +
" <ram:ApplicableHeaderTradeAgreement>\n" + "<ram:ApplicableHeaderTradeAgreement>\n" +
" <ram:SellerTradeParty>\n" + "<ram:SellerTradeParty>\n" +
" <ram:Name>Bei Spiel GmbH</ram:Name>\n" + "<ram:Name>Bei Spiel GmbH</ram:Name>\n" +
" <ram:PostalTradeAddress>\n" + "<ram:PostalTradeAddress>\n" +
" <ram:PostcodeCode>12345</ram:PostcodeCode>\n" + "<ram:PostcodeCode>12345</ram:PostcodeCode>\n" +
" <ram:LineOne>Ecke 12</ram:LineOne>\n" + "<ram:LineOne>Ecke 12</ram:LineOne>\n" +
" <ram:CityName>Stadthausen</ram:CityName>\n" + "<ram:CityName>Stadthausen</ram:CityName>\n" +
" <ram:CountryID>DE</ram:CountryID>\n" + "<ram:CountryID>DE</ram:CountryID>\n" +
" </ram:PostalTradeAddress>\n" + "</ram:PostalTradeAddress>\n" +
" <ram:SpecifiedTaxRegistration>\n" + "<ram:SpecifiedTaxRegistration>\n" +
" <ram:ID schemeID=\"FC\">22/815/0815/4</ram:ID>\n" + "<ram:ID schemeID=\"FC\">22/815/0815/4</ram:ID>\n" +
" </ram:SpecifiedTaxRegistration>\n" + "</ram:SpecifiedTaxRegistration>\n" +
" <ram:SpecifiedTaxRegistration>\n" + "<ram:SpecifiedTaxRegistration>\n" +
" <ram:ID schemeID=\"VA\">DE136695976</ram:ID>\n" + "<ram:ID schemeID=\"VA\">DE136695976</ram:ID>\n" +
" </ram:SpecifiedTaxRegistration>\n" + "</ram:SpecifiedTaxRegistration>\n" +
" </ram:SellerTradeParty>\n" + "</ram:SellerTradeParty>\n" +
" <ram:BuyerTradeParty>\n" + "<ram:BuyerTradeParty>\n" +
" <ram:Name>Theodor Est</ram:Name>\n" + "<ram:Name>Theodor Est</ram:Name>\n" +
" <ram:PostalTradeAddress>\n" + "<ram:PostalTradeAddress>\n" +
" <ram:PostcodeCode>88802</ram:PostcodeCode>\n" + "<ram:PostcodeCode>88802</ram:PostcodeCode>\n" +
" <ram:LineOne>Bahnstr. 42</ram:LineOne>\n" + "<ram:LineOne>Bahnstr. 42</ram:LineOne>\n" +
" <ram:CityName>Spielkreis</ram:CityName>\n" + "<ram:CityName>Spielkreis</ram:CityName>\n" +
" <ram:CountryID>DE</ram:CountryID>\n" + "<ram:CountryID>DE</ram:CountryID>\n" +
" </ram:PostalTradeAddress>\n" + "</ram:PostalTradeAddress>\n" +
" <ram:SpecifiedTaxRegistration>\n" + "<ram:SpecifiedTaxRegistration>\n" +
" <ram:ID schemeID=\"VA\">DE999999999</ram:ID>\n" + "<ram:ID schemeID=\"VA\">DE999999999</ram:ID>\n" +
" </ram:SpecifiedTaxRegistration>\n" + "</ram:SpecifiedTaxRegistration>\n" +
" </ram:BuyerTradeParty>\n" + "</ram:BuyerTradeParty>\n" +
" </ram:ApplicableHeaderTradeAgreement>\n" + "</ram:ApplicableHeaderTradeAgreement>\n" +
" <ram:ApplicableHeaderTradeDelivery>\n" + "<ram:ApplicableHeaderTradeDelivery>\n" +
" <ram:ActualDeliverySupplyChainEvent>\n" + "<ram:ActualDeliverySupplyChainEvent>\n" +
" <ram:OccurrenceDateTime><udt:DateTimeString format=\"102\">20171117</udt:DateTimeString></ram:OccurrenceDateTime>\n" + "<ram:OccurrenceDateTime><udt:DateTimeString format=\"102\">20171117</udt:DateTimeString></ram:OccurrenceDateTime>\n" +
" </ram:ActualDeliverySupplyChainEvent>\n" + "</ram:ActualDeliverySupplyChainEvent>\n" +
" </ram:ApplicableHeaderTradeDelivery>\n" + "</ram:ApplicableHeaderTradeDelivery>\n" +
" <ram:ApplicableHeaderTradeSettlement>\n" + "<ram:ApplicableHeaderTradeSettlement>\n" +
" <ram:PaymentReference>RE-20171118/506</ram:PaymentReference>\n" + "<ram:PaymentReference>RE-20171118/506</ram:PaymentReference>\n" +
" <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>\n" + "<ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>\n" +
" <ram:SpecifiedTradeSettlementPaymentMeans>\n" + "<ram:SpecifiedTradeSettlementPaymentMeans>\n" +
" <ram:TypeCode>42</ram:TypeCode>\n" + "<ram:TypeCode>42</ram:TypeCode>\n" +
" <ram:Information>Überweisung</ram:Information>\n" + "<ram:Information>Überweisung</ram:Information>\n" +
" <ram:PayeePartyCreditorFinancialAccount>\n" + "<ram:PayeePartyCreditorFinancialAccount>\n" +
" <ram:IBANID>DE88 2008 0000 0970 3757 00</ram:IBANID>\n" + "<ram:IBANID>DE88 2008 0000 0970 3757 00</ram:IBANID>\n" +
" <ram:ProprietaryID>44421800</ram:ProprietaryID>\n" + "<ram:ProprietaryID>44421800</ram:ProprietaryID>\n" +
" </ram:PayeePartyCreditorFinancialAccount>\n" + "</ram:PayeePartyCreditorFinancialAccount>\n" +
" <ram:PayeeSpecifiedCreditorFinancialInstitution>\n" + "<ram:PayeeSpecifiedCreditorFinancialInstitution>\n" +
" <ram:BICID>COBADEFFXXX</ram:BICID>\n" + "<ram:BICID>COBADEFFXXX</ram:BICID>\n" +
" <ram:GermanBankleitzahlID>41441604</ram:GermanBankleitzahlID>\n" + "<ram:GermanBankleitzahlID>41441604</ram:GermanBankleitzahlID>\n" +
" <ram:Name>Commerzbank</ram:Name>\n" + "<ram:Name>Commerzbank</ram:Name>\n" +
" </ram:PayeeSpecifiedCreditorFinancialInstitution>\n" + "</ram:PayeeSpecifiedCreditorFinancialInstitution>\n" +
" </ram:SpecifiedTradeSettlementPaymentMeans>\n" + "</ram:SpecifiedTradeSettlementPaymentMeans>\n" +
" <ram:ApplicableTradeTax>\n" + "<ram:ApplicableTradeTax>\n" +
" <ram:CalculatedAmount currencyID=\"EUR\">11.20</ram:CalculatedAmount>\n" + "<ram:CalculatedAmount currencyID=\"EUR\">11.20</ram:CalculatedAmount>\n" +
" <ram:TypeCode>VAT</ram:TypeCode>\n" + "<ram:TypeCode>VAT</ram:TypeCode>\n" +
" <ram:BasisAmount currencyID=\"EUR\">160.00</ram:BasisAmount>\n" + "<ram:BasisAmount currencyID=\"EUR\">160.00</ram:BasisAmount>\n" +
" <ram:CategoryCode>S</ram:CategoryCode>\n" + "<ram:CategoryCode>S</ram:CategoryCode>\n" +
" <ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>\n" + "<ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>\n" +
" </ram:ApplicableTradeTax>\n" + "</ram:ApplicableTradeTax>\n" +
" <ram:ApplicableTradeTax>\n" + "<ram:ApplicableTradeTax>\n" +
" <ram:CalculatedAmount currencyID=\"EUR\">63.84</ram:CalculatedAmount>\n" + "<ram:CalculatedAmount currencyID=\"EUR\">63.84</ram:CalculatedAmount>\n" +
" <ram:TypeCode>VAT</ram:TypeCode>\n" + "<ram:TypeCode>VAT</ram:TypeCode>\n" +
" <ram:BasisAmount currencyID=\"EUR\">336.00</ram:BasisAmount>\n" + "<ram:BasisAmount currencyID=\"EUR\">336.00</ram:BasisAmount>\n" +
" <ram:CategoryCode>S</ram:CategoryCode>\n" + "<ram:CategoryCode>S</ram:CategoryCode>\n" +
" <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>\n" + "<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>\n" +
" </ram:ApplicableTradeTax>\n" + "</ram:ApplicableTradeTax>\n" +
" <ram:SpecifiedTradePaymentTerms>\n" + "<ram:SpecifiedTradePaymentTerms>\n" +
" <ram:Description>Zahlbar ohne Abzug bis 09.12.2017</ram:Description>\n" + "<ram:Description>Zahlbar ohne Abzug bis 09.12.2017</ram:Description>\n" +
" <ram:DueDateDateTime><udt:DateTimeString format=\"102\">20171209</udt:DateTimeString></ram:DueDateDateTime>\n" + "<ram:DueDateDateTime><udt:DateTimeString format=\"102\">20171209</udt:DateTimeString></ram:DueDateDateTime>\n" +
" </ram:SpecifiedTradePaymentTerms>\n" + "</ram:SpecifiedTradePaymentTerms>\n" +
" <ram:SpecifiedTradeSettlementHeaderMonetarySummation>\n" + "<ram:SpecifiedTradeSettlementHeaderMonetarySummation>\n" +
" <ram:LineTotalAmount currencyID=\"EUR\">496.00</ram:LineTotalAmount>\n" + "<ram:LineTotalAmount currencyID=\"EUR\">496.00</ram:LineTotalAmount>\n" +
" <ram:ChargeTotalAmount currencyID=\"EUR\">0.00</ram:ChargeTotalAmount>\n" + "<ram:ChargeTotalAmount currencyID=\"EUR\">0.00</ram:ChargeTotalAmount>\n" +
" <ram:AllowanceTotalAmount currencyID=\"EUR\">0.00</ram:AllowanceTotalAmount>\n" + "<ram:AllowanceTotalAmount currencyID=\"EUR\">0.00</ram:AllowanceTotalAmount>\n" +
" <ram:TaxBasisTotalAmount currencyID=\"EUR\">496.00</ram:TaxBasisTotalAmount>\n" + "<ram:TaxBasisTotalAmount currencyID=\"EUR\">496.00</ram:TaxBasisTotalAmount>\n" +
" <ram:TaxTotalAmount currencyID=\"EUR\">75.04</ram:TaxTotalAmount>\n" + "<ram:TaxTotalAmount currencyID=\"EUR\">75.04</ram:TaxTotalAmount>\n" +
" <ram:GrandTotalAmount currencyID=\"EUR\">571.04</ram:GrandTotalAmount>\n" + "<ram:GrandTotalAmount currencyID=\"EUR\">571.04</ram:GrandTotalAmount>\n" +
" <ram:DuePayableAmount currencyID=\"EUR\">571.04</ram:DuePayableAmount>\n" + "<ram:DuePayableAmount currencyID=\"EUR\">571.04</ram:DuePayableAmount>\n" +
" </ram:SpecifiedTradeSettlementHeaderMonetarySummation>\n" + "</ram:SpecifiedTradeSettlementHeaderMonetarySummation>\n" +
" </ram:ApplicableHeaderTradeSettlement>\n" + "</ram:ApplicableHeaderTradeSettlement>\n" +
" </rsm:SupplyChainTradeTransaction>\n" + "</rsm:SupplyChainTradeTransaction>\n" +
"</rsm:CrossIndustryInvoice>"; "</rsm:CrossIndustryInvoice>";
zea1.setXML(ownZUGFeRDXML.getBytes("UTF-8")); zea1.setXML(ownZUGFeRDXML.getBytes("UTF-8"));
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();

51
validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java
View File

@@ -3,11 +3,6 @@ package org.mustangproject.validator;
import static org.xmlunit.assertj.XmlAssert.assertThat; import static org.xmlunit.assertj.XmlAssert.assertThat;
import java.io.File; import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import javax.xml.transform.Source; import javax.xml.transform.Source;
@@ -21,9 +16,9 @@ public class XMLValidatorTest extends ResourceCase {
// ignored for the // ignored for the
// time being // time being
ValidationContext ctx = new ValidationContext(null); final ValidationContext ctx = new ValidationContext(null);
XMLValidator xv = new XMLValidator(ctx); final XMLValidator xv = new XMLValidator(ctx);
XPathEngine xpath = new JAXPXPathEngine(); final XPathEngine xpath = new JAXPXPathEngine();
File tempFile = getResourceAsFile("invalidV2.xml"); File tempFile = getResourceAsFile("invalidV2.xml");
Source source; Source source;
String content; String content;
@@ -38,31 +33,31 @@ public class XMLValidatorTest extends ResourceCase {
* assertEquals(true, xv.getXMLResult(). * assertEquals(true, xv.getXMLResult().
* contains("<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"(ram:LineTotalAmount)\">\n" * contains("<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"(ram:LineTotalAmount)\">\n"
* + * +
* " Eine Rechnung (INVOICE) muss die Summe der Rechnungspositionen-Nettobeträge „Sum of Invoice line net amount“ (BT-106) enthalten.</error>\n" * "Eine Rechnung (INVOICE) muss die Summe der Rechnungspositionen-Nettobeträge „Sum of Invoice line net amount“ (BT-106) enthalten.</error>\n"
* + * +
* "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"(ram:TaxBasisTotalAmount = ram:LineTotalAmount - ram:AllowanceTotalAmount + ram:ChargeTotalAmount) or ((ram:TaxBasisTotalAmount = ram:LineTotalAmount - ram:AllowanceTotalAmount) and not (ram:ChargeTotalAmount)) or ((ram:TaxBasisTotalAmount = ram:LineTotalAmount + ram:ChargeTotalAmount) and not (ram:AllowanceTotalAmount)) or ((ram:TaxBasisTotalAmount = ram:LineTotalAmount) and not (ram:ChargeTotalAmount) and not (ram:AllowanceTotalAmount))\">\n" * "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"(ram:TaxBasisTotalAmount = ram:LineTotalAmount - ram:AllowanceTotalAmount + ram:ChargeTotalAmount) or ((ram:TaxBasisTotalAmount = ram:LineTotalAmount - ram:AllowanceTotalAmount) and not (ram:ChargeTotalAmount)) or ((ram:TaxBasisTotalAmount = ram:LineTotalAmount + ram:ChargeTotalAmount) and not (ram:AllowanceTotalAmount)) or ((ram:TaxBasisTotalAmount = ram:LineTotalAmount) and not (ram:ChargeTotalAmount) and not (ram:AllowanceTotalAmount))\">\n"
* + * +
* " Der Inhalt des Elementes „Invoice total amount without VAT“ (BT-109) entspricht der Summe aller Inhalte der Elemente „Invoice line net amount“ (BT-131) abzüglich der Summe aller in der Rechnung enthaltenen Nachlässe der Dokumentenebene „Sum of allowances on document level“ (BT-107) zuzüglich der Summe aller in der Rechnung enthaltenen Abgaben der Dokumentenebene „Sum of charges on document level“ (BT-108).</error>\n" * "Der Inhalt des Elementes „Invoice total amount without VAT“ (BT-109) entspricht der Summe aller Inhalte der Elemente „Invoice line net amount“ (BT-131) abzüglich der Summe aller in der Rechnung enthaltenen Nachlässe der Dokumentenebene „Sum of allowances on document level“ (BT-107) zuzüglich der Summe aller in der Rechnung enthaltenen Abgaben der Dokumentenebene „Sum of charges on document level“ (BT-108).</error>\n"
* + * +
* "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"(ram:GrandTotalAmount = round(ram:TaxBasisTotalAmount*100 + ram:TaxTotalAmount[@currencyID=/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceCurrencyCode]*100 +0) div 100) or ((ram:GrandTotalAmount = ram:TaxBasisTotalAmount) and not (ram:TaxTotalAmount[@currencyID=/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceCurrencyCode]))\">\n" * "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"(ram:GrandTotalAmount = round(ram:TaxBasisTotalAmount*100 + ram:TaxTotalAmount[@currencyID=/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceCurrencyCode]*100 +0) div 100) or ((ram:GrandTotalAmount = ram:TaxBasisTotalAmount) and not (ram:TaxTotalAmount[@currencyID=/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceCurrencyCode]))\">\n"
* + * +
* " Der Inhalt des Elementes „Invoice total amount with VAT“ (BT-112) entspricht der Summe des Inhalts des Elementes „Invoice total amount without VAT“ (BT-109) und des Elementes „Invoice total VAT amount“ (BT-110).</error>\n" * "Der Inhalt des Elementes „Invoice total amount with VAT“ (BT-112) entspricht der Summe des Inhalts des Elementes „Invoice total amount without VAT“ (BT-109) und des Elementes „Invoice total VAT amount“ (BT-110).</error>\n"
* + * +
* "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"ram:LineTotalAmount = (round(sum(../../ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount) * 10 * 10)div 100)\">\n" * "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"ram:LineTotalAmount = (round(sum(../../ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount) * 10 * 10)div 100)\">\n"
* + * +
* " Der Inhalt des Elementes „Sum of Invoice line net amount“ (BT-106) entspricht der Summe aller Inhalte der Elemente „Invoice line net amount“ (BT-131).</error>\n" * "Der Inhalt des Elementes „Sum of Invoice line net amount“ (BT-106) entspricht der Summe aller Inhalte der Elemente „Invoice line net amount“ (BT-131).</error>\n"
* + * +
* "<error location=\"/*[local-name()='CrossIndustryInvoice']\" criterion=\"(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTradeParty/ram:Name!='')\">\n" * "<error location=\"/*[local-name()='CrossIndustryInvoice']\" criterion=\"(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTradeParty/ram:Name!='')\">\n"
* + * +
* " Eine Rechnung (INVOICE) muss den Erwerbernamen „Buyer name“ (BT-44) enthalten.</error>\n" * "Eine Rechnung (INVOICE) muss den Erwerbernamen „Buyer name“ (BT-44) enthalten.</error>\n"
* + * +
* "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeAgreement']/*[local-name()='BuyerTradeParty']\" criterion=\"count(ram:Name)=1\">\n" * "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeAgreement']/*[local-name()='BuyerTradeParty']\" criterion=\"count(ram:Name)=1\">\n"
* + " Das Element 'ram:Name' muss genau 1 mal auftreten.</error>\n" + * + "Das Element 'ram:Name' muss genau 1 mal auftreten.</error>\n" +
* "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"count(ram:LineTotalAmount)=1\">\n" * "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='ApplicableHeaderTradeSettlement']/*[local-name()='SpecifiedTradeSettlementHeaderMonetarySummation']\" criterion=\"count(ram:LineTotalAmount)=1\">\n"
* + " Das Element 'ram:LineTotalAmount' muss genau 1 mal auftreten.</error>\n" * + "Das Element 'ram:LineTotalAmount' muss genau 1 mal auftreten.</error>\n"
* + * +
* "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='IncludedSupplyChainTradeLineItem'][2]/*[local-name()='SpecifiedLineTradeDelivery']/*[local-name()='BilledQuantity']\" criterion=\"document('zugferd2p0_extended_codedb.xml')//cl[@id=7]/enumeration[@value=$codeValue7]\">\n" * "<error location=\"/*[local-name()='CrossIndustryInvoice']/*[local-name()='SupplyChainTradeTransaction']/*[local-name()='IncludedSupplyChainTradeLineItem'][2]/*[local-name()='SpecifiedLineTradeDelivery']/*[local-name()='BilledQuantity']\" criterion=\"document('zugferd2p0_extended_codedb.xml')//cl[@id=7]/enumeration[@value=$codeValue7]\">\n"
* + " Wert von '@unitCode' ist unzulässig.</error>\n" + * + "Wert von '@unitCode' ist unzulässig.</error>\n" +
* "</messages><summary status='invalid'/>")); * "</messages><summary status='invalid'/>"));
* *
*/ */
@@ -72,7 +67,7 @@ public class XMLValidatorTest extends ResourceCase {
xv.setFilename(tempFile.getAbsolutePath()); xv.setFilename(tempFile.getAbsolutePath());
xv.validate(); xv.validate();
} catch (IrrecoverableValidationError e) { } catch (final IrrecoverableValidationError e) {
noException = false; //expecting a fatal error, i.e. an exception noException = false; //expecting a fatal error, i.e. an exception
} }
assertFalse(noException); assertFalse(noException);
@@ -87,10 +82,10 @@ public class XMLValidatorTest extends ResourceCase {
xv.setFilename(tempFile.getAbsolutePath()); xv.setFilename(tempFile.getAbsolutePath());
xv.validate(); xv.validate();
} catch (IrrecoverableValidationError e) { } catch (final IrrecoverableValidationError e) {
noException = false; noException = false;
} }
String res = xv.getXMLResult(); final String res = xv.getXMLResult();
/*OutputStream os = null; /*OutputStream os = null;
try { try {
os = new FileOutputStream(new File("return.xml")); os = new FileOutputStream(new File("return.xml"));
@@ -166,7 +161,7 @@ public class XMLValidatorTest extends ResourceCase {
source = Input.fromString("<validation>" + xv.getXMLResult() + "</validation>").build(); source = Input.fromString("<validation>" + xv.getXMLResult() + "</validation>").build();
content = xpath.evaluate("/validation/summary/@status", source); content = xpath.evaluate("/validation/summary/@status", source);
assertEquals("invalid", content); assertEquals("invalid", content);
} catch (IrrecoverableValidationError e) { } catch (final IrrecoverableValidationError e) {
// ignore, will be in XML output anyway // ignore, will be in XML output anyway
noException = false; noException = false;
} }
@@ -177,7 +172,7 @@ public class XMLValidatorTest extends ResourceCase {
xv.setFilename(tempFile.getAbsolutePath()); xv.setFilename(tempFile.getAbsolutePath());
xv.validate(); xv.validate();
} catch (IrrecoverableValidationError e) { } catch (final IrrecoverableValidationError e) {
// do expect this! // do expect this!
noException = false; noException = false;
} }
@@ -187,8 +182,8 @@ public class XMLValidatorTest extends ResourceCase {
} }
public void testZF1XMLValidation() { public void testZF1XMLValidation() {
ValidationContext ctx = new ValidationContext(null); final ValidationContext ctx = new ValidationContext(null);
XMLValidator xv = new XMLValidator(ctx); final XMLValidator xv = new XMLValidator(ctx);
File tempFile = getResourceAsFile("validV1.xml"); File tempFile = getResourceAsFile("validV1.xml");
try { try {
xv.setFilename(tempFile.getAbsolutePath()); xv.setFilename(tempFile.getAbsolutePath());
@@ -205,16 +200,16 @@ public class XMLValidatorTest extends ResourceCase {
xv.validate(); xv.validate();
assertEquals(true, xv.getXMLResult().contains("<error type=\"26\"")); assertEquals(true, xv.getXMLResult().contains("<error type=\"26\""));
} catch (IrrecoverableValidationError e) { } catch (final IrrecoverableValidationError e) {
// ignore, will be in XML output anyway // ignore, will be in XML output anyway
} }
} }
public void testXRValidation() { public void testXRValidation() {
ValidationContext ctx = new ValidationContext(null); final ValidationContext ctx = new ValidationContext(null);
XMLValidator xv = new XMLValidator(ctx); final XMLValidator xv = new XMLValidator(ctx);
XPathEngine xpath = new JAXPXPathEngine(); final XPathEngine xpath = new JAXPXPathEngine();
File tempFile = getResourceAsFile("validXRv2.xml"); File tempFile = getResourceAsFile("validXRv2.xml");
try { try {
@@ -234,7 +229,7 @@ public class XMLValidatorTest extends ResourceCase {
assertEquals("invalid", content); assertEquals("invalid", content);
} catch (IrrecoverableValidationError e) { } catch (final IrrecoverableValidationError e) {
// ignore, will be in XML output anyway // ignore, will be in XML output anyway
} }