diff options
| author | Thomas <> | 2024-01-25 07:04:10 +0100 |
|---|---|---|
| committer | Thomas <> | 2024-01-25 07:04:10 +0100 |
| commit | 7e47eba71b7645a946cb5716d358dcaaa20c639d (patch) | |
| tree | 7b83812df2b6c10b777bef3adc54e84cd20b89ad | |
| parent | 77f3545d58db7719a2a30611b9335574735c22f1 (diff) | |
| download | moa-sig-7e47eba71b7645a946cb5716d358dcaaa20c639d.tar.gz moa-sig-7e47eba71b7645a946cb5716d358dcaaa20c639d.tar.bz2 moa-sig-7e47eba71b7645a946cb5716d358dcaaa20c639d.zip | |
chore(tsl): switch to MOA-TSL-Lib 2.1.3 to support latest sqlLite implementation
| -rw-r--r-- | moaSig/moa-sig-lib/build.gradle | 2 | ||||
| -rw-r--r-- | moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/OfficialEuTslTest.java | 22 |
2 files changed, 8 insertions, 16 deletions
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle index 511857b..6d41c38 100644 --- a/moaSig/moa-sig-lib/build.gradle +++ b/moaSig/moa-sig-lib/build.gradle @@ -14,7 +14,7 @@ dependencies { api fileTree(dir: '../libs', include: '*.jar') //api fileTree(dir: '../libs_debug', include: '*.jar') - api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.1.2' + api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.1.3' api 'commons-logging:commons-logging:1.2' api 'commons-io:commons-io:2.15.1' api 'commons-codec:commons-codec:1.16.0' diff --git a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/OfficialEuTslTest.java b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/OfficialEuTslTest.java index e9c796b..bfa56ac 100644 --- a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/OfficialEuTslTest.java +++ b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/OfficialEuTslTest.java @@ -9,12 +9,7 @@ import static org.junit.Assert.assertTrue; import java.io.FileInputStream; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; - -import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.RandomStringUtils; @@ -31,12 +26,9 @@ import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement; import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; import at.gv.egovernment.moa.spss.server.config.ConfigurationException; import at.gv.egovernment.moa.spss.server.init.SystemInitializer; import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker; -import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker; import at.gv.egovernment.moa.spss.server.monitoring.ServiceStatusContainer; import at.gv.egovernment.moa.spss.test.integration.AbstractIntegrationTest; @@ -46,10 +38,10 @@ public class OfficialEuTslTest extends AbstractIntegrationTest { CMSSignatureVerificationInvoker cadesInvoker; @BeforeClass - public static void classInitializer() throws IOException, ConfigurationException, + public static void classInitializer() throws IOException, ConfigurationException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { jvmStateReset(); - + final String current = new java.io.File(".").getCanonicalPath(); System.setProperty("moa.spss.server.configuration", current + "/src/test/resources/moaspss_config/MOASPSSConfiguration_tsl_eu_official.xml"); @@ -145,10 +137,10 @@ public class OfficialEuTslTest extends AbstractIntegrationTest { final AdESFormResults test = (AdESFormResults) el; if (Arrays.asList("B-B","B-T").contains(test.getName())) { assertEquals("Find wrong form val status", 0, test.getCode().longValue()); - + } else { assertEquals("Find wrong form val status", 0, test.getCode().longValue()); - + } } @@ -161,7 +153,7 @@ public class OfficialEuTslTest extends AbstractIntegrationTest { assertEquals("used sig alg", "SHA1withRSA", cmsResult.getSignatureAlgorithm()); } - + @Ignore @Test public void padesLteTest() throws MOAException, IOException { @@ -176,7 +168,7 @@ public class OfficialEuTslTest extends AbstractIntegrationTest { // verify result assertNotNull("verification result", result); - + } - + } |
