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

Merge remote-tracking branch 'origin/issues/503-ubl' into issues/503-ubl

Browse Source
This commit is contained in:
Bharti
2024-11-18 10:58:44 +01:00
parent 135a577c9f 10cff03986
commit b8382ea627
3 changed files with 5 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/main/java/org/mustangproject/TradeParty.java
View File

@@ -656,7 +656,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
@Override
public String getCountry() {
return taxScheme;
return country;
}
/***
@@ -665,7 +665,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
* @return fluent setter
*/
public TradeParty setCountry(String country) {
this.taxScheme = country;
this.country = country;
return this;
}

60
library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
View File

@@ -350,11 +350,7 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
}
public void testImportMinimum() {
File CIIinputFile = getResourceAsFile("cii/facturFrMinimum.xml");
try {
@@ -375,59 +371,5 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
}
/*
this would test if for all elements/attributes
*/
public void testEEISI_300_cii_Import() throws XPathExpressionException, ParseException {
boolean hasExceptions = false;
File inputCII = getResourceAsFile("not_validating_full_invoice_based_onTest_EeISI_300_CENfullmodel.cii.xml");
File inputUBL = getResourceAsFile("not_validating_full_invoice_based_onTest_EeISI_300_CENfullmodel.ubl.xml");
ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter();
try {
zii.fromXML(new String(Files.readAllBytes(inputCII.toPath()), StandardCharsets.UTF_8));
} catch (IOException e) {
hasExceptions = true;
}
Invoice invoiceUBL = null;
invoiceUBL = zii.extractInvoice();
try {
zii.fromXML(new String(Files.readAllBytes(inputUBL.toPath()), StandardCharsets.UTF_8));
} catch (IOException e) {
hasExceptions = true;
}
Invoice invoiceCII = null;
try {
invoiceCII = zii.extractInvoice();
ObjectMapper mapper = new ObjectMapper();
String ubl=mapper.writeValueAsString(invoiceUBL).replace("," ,"\n");
String cii=mapper.writeValueAsString(invoiceCII).replace("," ,"\n");
assertEquals(cii,ubl);
/*
<cbc:Name>Seller contact point</cbc:Name>
<cbc:Telephone>+41 345 654455</cbc:Telephone>
<cbc:ElectronicMail>seller@contact.de);*/
} catch (XPathExpressionException | ParseException e) {
hasExceptions = true;
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
assertFalse(hasExceptions);
// TransactionCalculator tc = new TransactionCalculator(invoiceCII);
// assertEquals(new BigDecimal("205.00"), tc.getGrandTotal());
}
}

4
validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java
View File

@@ -224,10 +224,10 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
assertThat(res).valueByXPath("count(//error)")
.asInt()
.isEqualTo(3);
.isEqualTo(1);
assertThat(res).valueByXPath("count(//warning)")
.asInt()
.isEqualTo(1);
.isEqualTo(3);
assertThat(res).valueByXPath("count(//notice)")
.asInt()