1 files changed, 21 insertions, 14 deletions
diff --git a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java
index 698eb2f..f43ebf8 100644
--- a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java
+++ b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java
@@ -31,7 +31,12 @@ import at.gv.egovernment.moa.spss.server.init.SystemInitializer;
 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;
-
+/**
+ *    https://esignature.ec.europa.eu/efda/validation-tests/#/screen/home
+ * 
+ * @author tlenz
+ *
+ */
 @RunWith(BlockJUnit4ClassRunner.class)
 public class XadesTslEuTestset02Test extends AbstractIntegrationTest {
 
@@ -149,22 +154,24 @@ public class XadesTslEuTestset02Test extends AbstractIntegrationTest {
     assertNotNull("signerInfo", result.getSignerInfo());
     assertEquals("issuerCC", "BE", result.getSignerInfo().getIssuerCountryCode());
     assertFalse("publicAuthority", result.getSignerInfo().isPublicAuthority());
-    assertTrue("QC", result.getSignerInfo().isQualifiedCertificate());
+    
+    //because this signature is not on TSL any more --> EC changes the test setup!!!
+    assertFalse("QC", result.getSignerInfo().isQualifiedCertificate());
     assertTrue("SSCD", result.getSignerInfo().isSSCD());
-    assertEquals("qcSource", "TSL", result.getSignerInfo().getQCSource());
+    assertEquals("qcSource", "Certificate", result.getSignerInfo().getQCSource());
     assertEquals("qcSource", "Certificate", result.getSignerInfo().getSSCDSource());
 
-    assertNotNull("TSL infos", result.getSignerInfo().getTslInfos());
-    assertEquals("TSL CC", "BE", result.getSignerInfo().getTslInfos().getTslIssuerCountry());
-    assertEquals("TSL ServiceType", "http://uri.etsi.org/TrstSvc/Svctype/CA/QC",
-        result.getSignerInfo().getTslInfos().getServiceTypeIdentifier());
-    assertEquals("TSL ServiceStatus", "http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/granted",
-        result.getSignerInfo().getTslInfos().getServiceTypeStatus());
-    assertFalse("TSL addit. status", result.getSignerInfo().getTslInfos().getAdditionalServiceInformation()
-        .isEmpty());
-    assertEquals("TSL addit. status value",
-        "http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/ForeSignatures",
-        result.getSignerInfo().getTslInfos().getAdditionalServiceInformation().get(0));
+    assertNull("TSL infos", result.getSignerInfo().getTslInfos());
+    //assertEquals("TSL CC", "BE", result.getSignerInfo().getTslInfos().getTslIssuerCountry());
+    //assertEquals("TSL ServiceType", "http://uri.etsi.org/TrstSvc/Svctype/CA/QC",
+    //    result.getSignerInfo().getTslInfos().getServiceTypeIdentifier());
+    //assertEquals("TSL ServiceStatus", "http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/granted",
+    //    result.getSignerInfo().getTslInfos().getServiceTypeStatus());
+    //assertFalse("TSL addit. status", result.getSignerInfo().getTslInfos().getAdditionalServiceInformation()
+    //    .isEmpty());
+    //assertEquals("TSL addit. status value",
+    //     "http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/ForeSignatures",
+    //    result.getSignerInfo().getTslInfos().getAdditionalServiceInformation().get(0));
 
     assertNotNull("form val. result", result.getAdESFormResults());
     assertNotNull("extended val. result", result.getExtendedCertificateCheck());