RSCH

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

4 files changed, 7 insertions, 7 deletions

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());