From 25d9886cac29ada75d97ef13e9c5fad43c671b5c Mon Sep 17 00:00:00 2001
From: markuskivisalu <Markus.Kivisalu@nortal.com>
Date: Fri, 9 Oct 2020 14:59:40 +0300
Subject: [PATCH] SIGA-255 fixed default values in tests for Smart-ID signing
 request

---
 .../openeid/siga/test/asic/SmartIdSigningAsicContainerT.java | 2 +-
 .../siga/test/hashcode/SmartIdSigningHashcodeContainerT.java | 2 +-
 .../test/java/ee/openeid/siga/test/utils/RequestBuilder.java | 5 ++---
 3 files changed, 4 insertions(+), 5 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
index 8148c3b0..5e51bf6f 100644
--- 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
@@ -316,7 +316,7 @@ public void signWithSmartIdNonExistingSignatureProfile() throws Exception {
     @Test
     public void signWithSmartIdInvalidRole() throws Exception {
         postCreateContainer(flow, asicContainersDataRequestWithDefault());
-        Response response = postSmartIdSigningInSession(flow, smartIdSigningRequest("EE", "LT", null, null, null, null, null, "", null));
+        Response response = postSmartIdSigningInSession(flow, smartIdSigningRequest("LT", null, null, null, null, null, "", null));
 
         expectError(response, 400, INVALID_REQUEST);
     }
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
index 0184f3c9..32c49cb8 100644
--- 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
@@ -540,7 +540,7 @@ public void patchToHashcodeSmartIdCertificateStatus() throws NoSuchAlgorithmExce
     @Test
     public void signWithSmartIdInvalidRole() throws NoSuchAlgorithmException, InvalidKeyException, JSONException {
         postCreateContainer(flow, hashcodeContainersDataRequestWithDefault());
-        Response response = postSmartIdSigningInSession(flow, smartIdSigningRequest("EE", "LT", null, null, null, null, null, "",null));
+        Response response = postSmartIdSigningInSession(flow, smartIdSigningRequest("LT", null, null, null, null, null, "",null));
 
         expectError(response, 400, INVALID_REQUEST);
     }
diff --git a/siga-test/src/test/java/ee/openeid/siga/test/utils/RequestBuilder.java b/siga-test/src/test/java/ee/openeid/siga/test/utils/RequestBuilder.java
index f5723c6b..48f2056e 100644
--- a/siga-test/src/test/java/ee/openeid/siga/test/utils/RequestBuilder.java
+++ b/siga-test/src/test/java/ee/openeid/siga/test/utils/RequestBuilder.java
@@ -181,12 +181,11 @@ public static JSONObject smartIdCertificateChoiceRequest(String personIdentifier
         }
 
     public static JSONObject smartIdSigningRequestWithDefault(String signatureProfile, String documentNumber) throws JSONException {
-        return smartIdSigningRequest("EE", signatureProfile, documentNumber, "something", null, null,null, null, null);
+        return smartIdSigningRequest(signatureProfile, documentNumber, "something", null, null,null, null, null);
     }
 
-    public static JSONObject smartIdSigningRequest(String originCountry, String signatureProfile, String documentNumber, String messageToDisplay, String city, String stateOrProvince, String postalCode, String country, String roles) throws JSONException {
+    public static JSONObject smartIdSigningRequest(String signatureProfile, String documentNumber, String messageToDisplay, String city, String stateOrProvince, String postalCode, String country, String roles) throws JSONException {
         JSONObject request = new JSONObject();
-        request.put("country", originCountry);
         request.put("signatureProfile", signatureProfile);
         request.put("documentNumber", documentNumber);