From 6b4e59234163c449c0e66e82ee9ed87785e7702c Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 12 Jul 2022 21:18:41 +0200
Subject: refact(szr): only use alreadymatched eID data for SZR communication

---
 .../auth/eidas/v2/test/clients/SzrClientProductionTest.java  |  9 ++++-----
 .../modules/auth/eidas/v2/test/clients/SzrClientTest.java    | 12 ++++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'modules/authmodule-eIDAS-v2/src/test/java/at')

diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java
index d2bfe662..ecffaa19 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientProductionTest.java
@@ -45,7 +45,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.szr.SzrClient;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MatchedPersonResult;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SzrCommunicationException;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
@@ -127,13 +126,13 @@ public class SzrClientProductionTest {
 
   }
 
-  private SimpleEidasData getEidData() {
-    return SimpleEidasData.builder()
+  private MatchedPersonResult getEidData() {
+    return MatchedPersonResult.builder()
         .familyName("Mustermann")
         .givenName("Franz")
         .dateOfBirth("1989-05-04")
-        .citizenCountryCode("IS")
-        .pseudonym("1234ffgsdfg56789ABCDEF")
+        .bpk("1234ffgsdfg56789ABCDEF")
+        .countryCode("XX")
         .build();
   }
 
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java
index e61532a3..a35f9bad 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/SzrClientTest.java
@@ -58,7 +58,7 @@ import com.github.skjolber.mockito.soap.SoapServiceRule;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.szr.SzrClient;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MatchedPersonResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SzrCommunicationException;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
@@ -270,15 +270,15 @@ public class SzrClientTest {
 
   }
 
-  private SimpleEidasData getEidData() {
-    return SimpleEidasData.builder()
+  private MatchedPersonResult getEidData() {
+    return MatchedPersonResult.builder()
         .familyName("Mustermann")
         .givenName("Franz")
         .dateOfBirth("1989-05-05")
-        .citizenCountryCode("IS")
-        .pseudonym("1234sdgsdfg56789ABCDEF")
+        .bpk("1234sdgsdfg56789ABCDEF")
+        .countryCode("IS")
         .build();
   }
-
+  
 
 }
-- 
cgit v1.2.3