Merge branch 'develop' of github.com:open-eid/SiGa into develop

open-eid · Dec 10, 2020 · 40aa2c4 · 40aa2c4
2 parents d78f963 + c2ad80a
commit 40aa2c4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/siga-test/src/test/java/ee/openeid/siga/test/asic/SmartIdSigningAsicContainerT.java b/siga-test/src/test/java/ee/openeid/siga/test/asic/SmartIdSigningAsicContainerT.java
@@ -100,7 +100,7 @@ public void signWithSmartIdWithCertificateChoiceSuccessfullyLithuania() throws E
     public void signWithSmartIdCertificateChoiceMultipleSignaturesPerContainerSuccessfully() throws Exception {
         postCreateContainer(flow, asicContainersDataRequestWithDefault());
 
-        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "LT"));
+        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "EE"));
         String generatedCertificateId1 = certificateChoice1.as(CreateContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId1);
 
@@ -109,7 +109,7 @@ public void signWithSmartIdCertificateChoiceMultipleSignaturesPerContainerSucces
         String signatureId1 = signingRequest1.as(CreateContainerSmartIdSigningResponse.class).getGeneratedSignatureId();
         pollForSidSigning(flow, signatureId1);
 
-        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "LT"));
+        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "EE"));
         String generatedCertificateId2 = certificateChoice2.as(CreateContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId2);
 
@@ -129,7 +129,7 @@ public void signWithSmartIdCertificateChoiceMultipleSignaturesPerContainerSucces
     public void signWithSmartIdCertificateChoiceRetryAfterUserCancel() throws Exception {
         postCreateContainer(flow, asicContainersDataRequestWithDefault());
 
-        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010016", "LT"));
+        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010016", "EE"));
         String generatedCertificateId1 = certificateChoice1.as(CreateContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId1);
 
@@ -138,7 +138,7 @@ public void signWithSmartIdCertificateChoiceRetryAfterUserCancel() throws Except
         String signatureId1 = signingRequest1.as(CreateContainerSmartIdSigningResponse.class).getGeneratedSignatureId();
         pollForSidSigning(flow, signatureId1);
 
-        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "LT"));
+        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "EE"));
         String generatedCertificateId2 = certificateChoice2.as(CreateContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId2);
 

diff --git a/siga-test/src/test/java/ee/openeid/siga/test/hashcode/SmartIdSigningHashcodeContainerT.java b/siga-test/src/test/java/ee/openeid/siga/test/hashcode/SmartIdSigningHashcodeContainerT.java
@@ -93,7 +93,7 @@ public void signWithSmartIdWithCertificateChoiceSuccessfullyLithuania() throws E
     public void signWithSmartIdCertificateChoiceMultipleSignaturesPerContainerSuccessfully() throws Exception {
         postCreateContainer(flow, hashcodeContainersDataRequestWithDefault());
 
-        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "LT"));
+        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "EE"));
         String generatedCertificateId1 = certificateChoice1.as(CreateHashcodeContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId1);
 
@@ -102,7 +102,7 @@ public void signWithSmartIdCertificateChoiceMultipleSignaturesPerContainerSucces
         String signatureId1 = signingRequest1.as(CreateHashcodeContainerSmartIdSigningResponse.class).getGeneratedSignatureId();
         pollForSidSigning(flow, signatureId1);
 
-        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "LT"));
+        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "EE"));
         String generatedCertificateId2 = certificateChoice2.as(CreateHashcodeContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId2);
 
@@ -122,7 +122,7 @@ public void signWithSmartIdCertificateChoiceMultipleSignaturesPerContainerSucces
     public void signWithSmartIdCertificateChoiceRetryAfterUserCancel() throws Exception {
         postCreateContainer(flow, hashcodeContainersDataRequestWithDefault());
 
-        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010016", "LT"));
+        Response certificateChoice1 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010016", "EE"));
         String generatedCertificateId1 = certificateChoice1.as(CreateHashcodeContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId1);
 
@@ -131,7 +131,7 @@ public void signWithSmartIdCertificateChoiceRetryAfterUserCancel() throws Except
         String signatureId1 = signingRequest1.as(CreateHashcodeContainerSmartIdSigningResponse.class).getGeneratedSignatureId();
         pollForSidSigning(flow, signatureId1);
 
-        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "LT"));
+        Response certificateChoice2 = postSidCertificateChoice(flow, smartIdCertificateChoiceRequest("10101010005", "EE"));
         String generatedCertificateId2 = certificateChoice2.as(CreateHashcodeContainerSmartIdCertificateChoiceResponse.class).getGeneratedCertificateId();
         pollForSidCertificateStatus(flow, generatedCertificateId2);
 

diff --git a/siga-test/src/test/java/ee/openeid/siga/test/hashcode/UploadHashcodeContainerT.java b/siga-test/src/test/java/ee/openeid/siga/test/hashcode/UploadHashcodeContainerT.java
@@ -165,6 +165,12 @@ public void uploadContainerWithDuplicateDataFilesInSignature() throws Exception
         expectError(response, 400, DUPLICATE_DATA_FILE);
     }
 
+    @Test
+    public void uploadContainerWithInvalidStructure() throws Exception {
+        Response response = postUploadContainer(flow, hashcodeContainerRequestFromFile("hashcode_invalid_structure.asice"));
+        expectError(response, 400, INVALID_CONTAINER_EXCEPTION);
+    }
+
     @Test
     public void uploadContainerWithInvalidDatafileXmlStructure() throws Exception {
         Response response = postUploadContainer(flow, hashcodeContainerRequestFromFile("hashcodeWrongFileStructureInDatafileDescriptorFile.asice"));

diff --git a/siga-test/src/test/resources/hashcode/hashcode_duplicate_data_files.asice b/siga-test/src/test/resources/hashcode/hashcode_duplicate_data_files.asice
diff --git a/siga-test/src/test/resources/hashcode/hashcode_duplicate_data_files_in_manifest.asice b/siga-test/src/test/resources/hashcode/hashcode_duplicate_data_files_in_manifest.asice
diff --git a/siga-test/src/test/resources/hashcode/hashcode_duplicate_data_files_in_signature.asice b/siga-test/src/test/resources/hashcode/hashcode_duplicate_data_files_in_signature.asice
diff --git a/siga-test/src/test/resources/hashcode/hashcode_invalid_structure.asice b/siga-test/src/test/resources/hashcode/hashcode_invalid_structure.asice