RSCH

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

6 files changed, 16 insertions, 16 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! -----------------------");
     }
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
index 13f86efee..ebc61e5c4 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
+++ b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
@@ -51,7 +51,7 @@ TRANSFORMS_INFO +
 
 	public void testBuild() throws Exception {
 		String request = new CreateXMLSignatureRequestBuilder().build(
-			AuthenticationBlockAssertionBuilderTest.ASSERTION_SHOULD,
+			AuthenticationBlockAssertionBuilderTest.ASSERTION_SHOULD, "SecureSignatureKeypair",
 			new String[] {TRANSFORMS_INFO});
 		assertXmlEquals(REQUEST_SHOULD, request);
 	}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
index 7935c5179..655c33fd9 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
+++ b/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
@@ -77,12 +77,12 @@ public class MOAIDAuthConfigurationProviderTest extends UnitTestCase {
     OAAuthParameter[] result = provider.getOnlineApplicationParameters();
 
      assertEquals(result[0].getPublicURLPrefix(),"StringOALoginURL");
-     assertEquals(result[0].getProvideZMRZahl(),false);      
+     assertEquals(result[0].getProvideStammzahl(),false);      
      assertEquals(result[0].getProvideAuthBlock(),false);      
      assertEquals(result[0].getProvideIdentityLink(),false);
 
      assertEquals(result[1].getPublicURLPrefix(),"StringOALoginURL2");
-     assertEquals(result[1].getProvideZMRZahl(),true);      
+     assertEquals(result[1].getProvideStammzahl(),true);      
      assertEquals(result[1].getProvideAuthBlock(),true);      
      assertEquals(result[1].getProvideIdentityLink(),true);
 
@@ -90,7 +90,7 @@ public class MOAIDAuthConfigurationProviderTest extends UnitTestCase {
 /*    for (int i = 0; i < result.length; i++) {
       System.out.println();
       System.out.println("getOnlineApplicationParameters Url: " + result[i].getUrl());
-      System.out.println("getOnlineApplicationParameters ProvideZMRZahl: " + result[i].getProvideZMRZahl());      
+      System.out.println("getOnlineApplicationParameters ProvideStammzahl: " + result[i].getProvideStammzahl());      
       System.out.println("getOnlineApplicationParameters ProvideAuthBlock: " + result[i].getProvideAuthBlock());      
       System.out.println("getOnlineApplicationParameters ProvideIdentityLink: " + result[i].getProvideIdentityLink());
     }*/
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
index 12eddf8c3..ec6a65581 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
+++ b/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
@@ -105,14 +105,14 @@ public class MOAIDProxyConfigurationProviderTest extends UnitTestCase {
   OAConfiguration oac1 = result[0].getOaConfiguration();
   assertEquals(OAConfiguration.PARAM_AUTH, oac1.getAuthType());
   assertEquals("MOADateOfBirth", oac1.getParamAuthMapping().get("Param1"));
-  assertEquals("MOAVPK", oac1.getParamAuthMapping().get("Param2"));
+  assertEquals("MOABPK", oac1.getParamAuthMapping().get("Param2"));
   // sollte HeaderAuth sein
   OAConfiguration oac2 = result[1].getOaConfiguration();
   assertEquals(OAConfiguration.HEADER_AUTH, oac2.getAuthType());
   assertEquals("MOAPublicAuthority", oac2.getHeaderAuthMapping().get("Param1"));  
   assertEquals("MOABKZ", oac2.getHeaderAuthMapping().get("Param2"));  
   assertEquals("MOAQualifiedCertificate", oac2.getHeaderAuthMapping().get("Param3"));  
-  assertEquals("MOAZMRZahl", oac2.getHeaderAuthMapping().get("Param4"));  
+  assertEquals("MOAStammzahl", oac2.getHeaderAuthMapping().get("Param4"));  
   assertEquals("MOAIPAddress", oac2.getHeaderAuthMapping().get("Param5"));  
   
   // sollte BasicAuth sein
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java b/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
index 39e7240d1..69e5958bf 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
+++ b/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
@@ -170,7 +170,7 @@ public class SAMLResponseParserTest extends UnitTestCase {
     assertEquals("http://localhost:8080/moa-id-auth/", authData.getIssuer());
     assertEquals("2003-04-02T14:55:42+02:00", authData.getIssueInstant());
     assertEquals("123456789012", authData.getIdentificationValue());
-    assertEquals("MTk2OC0xMC0yMmdi", authData.getVPK());
+    assertEquals("MTk2OC0xMC0yMmdi", authData.getPBK());
     assertEquals("Hermann", authData.getGivenName());
     assertEquals("Muster", authData.getFamilyName());
     assertEquals("1968-10-22", authData.getDateOfBirth());