MAINTENANCE fix of tests and ignoring Allure reports on git commit.

open-eid · Jun 4, 2019 · 6da779f · 6da779f
1 parent c737d11
commit 6da779f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 **/target/
+**/allure-results/
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###

diff --git a/siga-test/src/test/java/ee/openeid/siga/test/MobileSigningHashcodeContainerT.java b/siga-test/src/test/java/ee/openeid/siga/test/MobileSigningHashcodeContainerT.java
@@ -54,9 +54,9 @@ public void signWithMultipleSignaturesPerContainerSuccessfully() throws Exceptio
         await().atMost(16, SECONDS).with().pollInterval(5, SECONDS).until(() -> "SIGNATURE".equals(pollForMidSigning(flow, signatureId7s).body().as(GetHashcodeContainerMobileIdSigningStatusResponse.class).getMidStatus()));
 
         Response validationResponse = getValidationReportForContainerInSession(flow);
-        validationResponse.then().statusCode(200);
-        GetHashcodeContainerValidationReportResponse r = validationResponse.body().as(GetHashcodeContainerValidationReportResponse.class);
-        assertEquals(2, r.getValidationConclusion().getSignatures().stream().filter(signature -> signatureId5s.equals(signature.getId()) || signatureId7s.equals(signature.getId())).count());
+        validationResponse.then()
+                .statusCode(200)
+                .body("validationConclusion.validSignaturesCount", equalTo(2));
     }
 
     @Ignore ("OCSP is not fetched for some reason, needs investigation")

diff --git a/siga-test/src/test/java/ee/openeid/siga/test/RemoteSigningHachcodeContainerT.java b/siga-test/src/test/java/ee/openeid/siga/test/RemoteSigningHachcodeContainerT.java
@@ -67,10 +67,6 @@ public void signContainerRemotelyWithMultipleSignatures() throws Exception {
                 .statusCode(200)
                 .body("validationConclusion.validSignaturesCount", equalTo(3))
                 .body("validationConclusion.signaturesCount", equalTo(3));
-
-        GetHashcodeContainerValidationReportResponse r = validationResponse.body().as(GetHashcodeContainerValidationReportResponse.class);
-
-        assertEquals(2, r.getValidationConclusion().getSignatures().stream().filter(signature -> dataToSignResponse1.getGeneratedSignatureId().equals(signature.getId()) || dataToSignResponse2.getGeneratedSignatureId().equals(signature.getId())).count());
     }
 
     @Test