RSCH

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@99 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 9 insertions, 9 deletions

diff --git a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java b/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
index d9e69eba4..de4fe8fbf 100644
--- a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
+++ b/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
@@ -11,7 +11,7 @@ import at.gv.egovernment.moa.id.ParseException;
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataAssertionBuilder;
 import at.gv.egovernment.moa.id.auth.builder.PersonDataBuilder;
-import at.gv.egovernment.moa.id.auth.builder.VPKBuilder;
+import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
 import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
@@ -563,9 +563,9 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
     authData.setAssertionID(Random.nextRandom());
     authData.setIssuer(session.getAuthURL());
     authData.setIssueInstant(DateTimeUtils.buildDateTime(Calendar.getInstance()));
-    String vpkBase64 = new VPKBuilder().buildVPK(
-      identityLink.getIdentificationValue(), identityLink.getDateOfBirth(), session.getTarget());
-    authData.setVPK(vpkBase64);
+    String vpkBase64 = new BPKBuilder().buildBPK(
+      identityLink.getIdentificationValue(), session.getTarget());
+    authData.setPBK(vpkBase64);
     authData.setGivenName(identityLink.getGivenName());
     authData.setFamilyName(identityLink.getFamilyName());
     authData.setDateOfBirth(identityLink.getDateOfBirth());
@@ -576,7 +576,7 @@ public class Test300VerifyAuthBlock extends AbnahmeTestCase {
       AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(
         session.getPublicOAURLPrefix());
     String prPerson = new PersonDataBuilder().build(
-      identityLink, oaParam.getProvideZMRZahl());
+      identityLink, oaParam.getProvideStammzahl());
       
     try {     
       String ilAssertion = 
diff --git a/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java b/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java
index 8b7b2002f..ede69dd8b 100644
--- a/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java
+++ b/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java
@@ -84,7 +84,7 @@ public class Test100LoginParameterResolver extends AbnahmeTestCase {
       String DATE_OF_BIRTH = "1963-12-29";
       String VPK = "kp6hOq6LRAkLtrqm6EvDm6bMwJw=";
       authData.setDateOfBirth(DATE_OF_BIRTH);
-      authData.setVPK(VPK);
+      authData.setPBK(VPK);
 
       // resolve login parameters
       Map loginParameters = lpr.getAuthenticationParameters(oaConf, authData, CLIENT_IP_ADDRESS);
@@ -115,11 +115,11 @@ public class Test100LoginParameterResolver extends AbnahmeTestCase {
       boolean PUBLIC_AUTH = true;
       String BKZ = "FinanzamtWien23Leitstelle";
       boolean QUAL_CERT = false;
-      String ZMR_ZAHL = "3456789012";
+      String STAMMZAHL = "3456789012";
       authData.setPublicAuthority(PUBLIC_AUTH);
       authData.setPublicAuthorityCode(BKZ);
       authData.setQualifiedCertificate(QUAL_CERT);
-      authData.setIdentificationValue(ZMR_ZAHL);
+      authData.setIdentificationValue(STAMMZAHL);
 
       // resolve login headers
       Map loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, CLIENT_IP_ADDRESS);
@@ -134,7 +134,7 @@ public class Test100LoginParameterResolver extends AbnahmeTestCase {
       assertEquals(String.valueOf(PUBLIC_AUTH), loginHeaders.get("Param1"));
       assertEquals(BKZ, loginHeaders.get("Param2"));
       assertEquals(String.valueOf(QUAL_CERT), loginHeaders.get("Param3"));
-      assertEquals(ZMR_ZAHL, loginHeaders.get("Param4"));
+      assertEquals(STAMMZAHL, loginHeaders.get("Param4"));
       assertEquals(CLIENT_IP_ADDRESS, loginHeaders.get("Param5"));
       System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
     }