1 files changed, 37 insertions, 6 deletions
diff --git a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/PadesIntegrationTest.java b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/PadesIntegrationTest.java
index e210ddf..9cee722 100644
--- a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/PadesIntegrationTest.java
+++ b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/PadesIntegrationTest.java
@@ -11,6 +11,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
+import java.util.Base64;
 import java.util.Date;
 
 import org.apache.commons.io.IOUtils;
@@ -88,7 +89,6 @@ public class PadesIntegrationTest extends AbstractIntegrationTest {
 
   }
 
-  @Ignore
   @Test
   public void basicValidationCadesSignature() throws MOAException, IOException {
     final VerifyCMSSignatureRequest request = buildVerfifyCmsRequest(
@@ -124,7 +124,6 @@ public class PadesIntegrationTest extends AbstractIntegrationTest {
 
   }
 
-  @Ignore
   @Test
   public void extendedValidationCadesSignature() throws MOAException, IOException {
     final VerifyCMSSignatureRequest request = buildVerfifyCmsRequest(
@@ -163,7 +162,9 @@ public class PadesIntegrationTest extends AbstractIntegrationTest {
 
     assertNotNull("extended val. result", cmsResult.getExtendedCertificateCheck());
     assertEquals("ext. val major", 1, cmsResult.getExtendedCertificateCheck().getMajorCode());
-    assertEquals("ext. val major", 24, cmsResult.getExtendedCertificateCheck().getMinorCode());
+    
+    // because was signed by using SHA1 after xxxx
+    assertEquals("ext. val major", 2, cmsResult.getExtendedCertificateCheck().getMinorCode());
 
     assertNotNull("byteRange", cmsResult.getByteRangeOfSignature());
     assertEquals("used sig alg", "SHA1withRSA", cmsResult.getSignatureAlgorithm());
@@ -202,11 +203,38 @@ public class PadesIntegrationTest extends AbstractIntegrationTest {
 
     // perform test
     final VerifyCMSSignatureResponse result = cadesInvoker.verifyCMSSignature(request);
-
+    
     // verify result
     assertNotNull("verification result", result);
 
+    final VerifyCMSSignatureResponseElement cmsResult = (VerifyCMSSignatureResponseElement) result
+        .getResponseElements().get(0);
+    assertEquals("sigCode", 0, cmsResult.getSignatureCheck().getCode());
+    assertEquals("certCode", 0, cmsResult.getCertificateCheck().getCode());
+    
+    assertTrue("Amtssignatur", cmsResult.getSignerInfo().isPublicAuthority());
+    assertEquals("Amtssignatur", "L4AL", cmsResult.getSignerInfo().getPublicAuhtorityID());
+    
+    assertFalse("QC", cmsResult.getSignerInfo().isQualifiedCertificate());
+    assertFalse("SSCD", cmsResult.getSignerInfo().isSSCD());
+    
+    assertEquals("CountryCode", "AT", cmsResult.getSignerInfo().getIssuerCountryCode());
+    
+    assertNotNull("extended val. result", cmsResult.getExtendedCertificateCheck());
+    assertEquals("ext. val major", 2, cmsResult.getExtendedCertificateCheck().getMajorCode());
     
+    // it's no valid CAdES signature because it does not include SignatureCertificateInfo extension 
+    assertEquals("ext. val major", 13, cmsResult.getExtendedCertificateCheck().getMinorCode());
+        
+    assertNotNull("form val. result", cmsResult.getAdESFormResults());
+    assertEquals("form val. result size", 4, cmsResult.getAdESFormResults().size());
+
+    //it's not valid because it's no CAdES signature, it's a "adbe.pkcs7.detached"
+    for (final Object el : cmsResult.getAdESFormResults()) {
+      assertEquals("Find wrong form val status", 2, ((AdESFormResults) el).getCode().longValue());
+
+    }
+        
   }
   
   @Ignore
@@ -224,8 +252,11 @@ public class PadesIntegrationTest extends AbstractIntegrationTest {
     // verify result
     assertNotNull("verification result", result);
 
-
-    
+    final VerifyCMSSignatureResponseElement cmsResult = (VerifyCMSSignatureResponseElement) result
+        .getResponseElements().get(0);
+    assertEquals("sigCode", 0, cmsResult.getSignatureCheck().getCode());
+    assertEquals("certCode", 0, cmsResult.getCertificateCheck().getCode());
+    assertEquals("Amtssignatur", "", cmsResult.getSignerInfo().getPublicAuhtorityID());
     
   }