From 6da779ff027c126a38c534b69c67119346a1aeae Mon Sep 17 00:00:00 2001
From: naare <19222741+naare@users.noreply.github.com>
Date: Tue, 4 Jun 2019 11:42:59 +0300
Subject: [PATCH] MAINTENANCE fix of tests and ignoring Allure reports on git
 commit.

---
 .gitignore                                                  | 1 +
 .../openeid/siga/test/MobileSigningHashcodeContainerT.java  | 6 +++---
 .../openeid/siga/test/RemoteSigningHachcodeContainerT.java  | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index aebf1e49..67059676 100644
--- 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
index b0813d33..93628c81 100644
--- 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
index 1e151308..1d27297d 100644
--- 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