libeufin

commit 88a44b7ea06413d0e64322750f1a8ef4152dfea8
parent 00137637638ad04989f60f6def9d95a69715893b
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Thu, 12 Dec 2019 16:30:16 +0100

unignore test, and indent

Diffstat:
M
nexus/src/test/kotlin/SignatureDataTest.kt
 | 
4
++--
M
sandbox/src/test/kotlin/XmlUtilTest.kt
 | 
53
+++++++++++++++++++++++++----------------------------

2 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/nexus/src/test/kotlin/SignatureDataTest.kt b/nexus/src/test/kotlin/SignatureDataTest.kt
@@ -4,8 +4,8 @@ import tech.libeufin.util.XMLUtil
 import org.apache.xml.security.binding.xmldsig.SignatureType
 import org.junit.Test
 import tech.libeufin.util.CryptoUtil
-import tech.libeufin.schema.ebics_h004.EbicsRequest
-import tech.libeufin.schema.ebics_h004.EbicsTypes
+import tech.libeufin.util.schema.ebics_h004.EbicsRequest
+import tech.libeufin.util.schema.ebics_h004.EbicsTypes
 import java.math.BigInteger
 
 class SignatureDataTest {
diff --git a/sandbox/src/test/kotlin/XmlUtilTest.kt b/sandbox/src/test/kotlin/XmlUtilTest.kt
@@ -19,7 +19,6 @@ class XmlUtilTest {
     @Test
     fun deserializeConsecutiveLists() {
 
-        // NOTE: this needs wrapping elements to be parsed into a JAXB object.
         val tmp = XMLUtil.convertStringToJaxb<HTDResponseOrderData>("""
             <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
             <HTDResponseOrderData xmlns="urn:org:ebics:H004">
@@ -30,31 +29,31 @@ class XmlUtilTest {
                 <BankInfo>
                   <HostID>host01</HostID>
                 </BankInfo>
-                  <AccountInfo Currency="EUR" Description="ACCT" ID="acctid1">
-                    <AccountNumber international="true">DE21500105174751659277</AccountNumber>
-                    <BankCode international="true">INGDDEFFXXX</BankCode>
-                    <AccountHolder>Mina Musterfrau</AccountHolder>
-                  </AccountInfo>
-                  <AccountInfo Currency="EUR" Description="glsdemoacct" ID="glsdemo">
-                    <AccountNumber international="true">DE91430609670123123123</AccountNumber>
-                    <BankCode international="true">GENODEM1GLS</BankCode>
-                    <AccountHolder>Mina Musterfrau</AccountHolder>
-                  </AccountInfo>
-                  <OrderInfo>
-                    <OrderType>C53</OrderType>
-                    <TransferType>Download</TransferType>
-                    <Description>foo</Description>
-                  </OrderInfo>
-                  <OrderInfo>
-                    <OrderType>C52</OrderType>
-                    <TransferType>Download</TransferType>
-                    <Description>foo</Description>
-                  </OrderInfo>
-                  <OrderInfo>
-                    <OrderType>CCC</OrderType>
-                    <TransferType>Upload</TransferType>
-                    <Description>foo</Description>
-                  </OrderInfo>
+                <AccountInfo Currency="EUR" Description="ACCT" ID="acctid1">
+                  <AccountNumber international="true">DE21500105174751659277</AccountNumber>
+                  <BankCode international="true">INGDDEFFXXX</BankCode>
+                  <AccountHolder>Mina Musterfrau</AccountHolder>
+                </AccountInfo>
+                <AccountInfo Currency="EUR" Description="glsdemoacct" ID="glsdemo">
+                  <AccountNumber international="true">DE91430609670123123123</AccountNumber>
+                  <BankCode international="true">GENODEM1GLS</BankCode>
+                  <AccountHolder>Mina Musterfrau</AccountHolder>
+                </AccountInfo>
+                <OrderInfo>
+                  <OrderType>C53</OrderType>
+                  <TransferType>Download</TransferType>
+                  <Description>foo</Description>
+                </OrderInfo>
+                <OrderInfo>
+                  <OrderType>C52</OrderType>
+                  <TransferType>Download</TransferType>
+                  <Description>foo</Description>
+                </OrderInfo>
+                <OrderInfo>
+                  <OrderType>CCC</OrderType>
+                  <TransferType>Upload</TransferType>
+                  <Description>foo</Description>
+                </OrderInfo>
               </PartnerInfo>
               <UserInfo>
                 <UserID Status="5">USER1</UserID>
@@ -78,7 +77,6 @@ class XmlUtilTest {
             LOGGER.info("caught")
             return
         }
-
         assertTrue(false)
     }
 
@@ -113,7 +111,6 @@ class XmlUtilTest {
         kotlin.test.assertFalse(XMLUtil.verifyEbicsDocument(doc, otherPair.public))
     }
 
-    @Ignore
     @Test
     fun verifySigningWithConversion() {