fix wrong bPK calculation for XZVR and XERSB bpkTargets

1 files changed, 12 insertions, 12 deletions

diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java
index 889a62ee..b8c630fe 100644
--- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilderTest.java
@@ -228,7 +228,7 @@ public class BpkBuilderTest {
     Pair<String, String> result1 = BpkBuilder.generateAreaSpecificPersonIdentifier(
         BASEID, EaafConstants.URN_PREFIX_WBPK + "ZVR+123456");
     
-    Assert.assertEquals("wbPK", "g4JRKGS+AJxd9FU8k2tG8Lxrx6M=",
+    Assert.assertEquals("wbPK", "1WvaBLiTxcc3kVzfB71Zh2sCtvA=",
         result1.getFirst());
     Assert.assertEquals("wbPK", "urn:publicid:gv.at:wbpk+XZVR+123456",
         result1.getSecond());
@@ -241,7 +241,7 @@ public class BpkBuilderTest {
     Pair<String, String> result1 = BpkBuilder.generateAreaSpecificPersonIdentifier(
         BASEID, EaafConstants.URN_PREFIX_WBPK + "ERSB+123456");
     
-    Assert.assertEquals("wbPK", "Bjnl0BofeJGgqynJP1r/ff6E1Rk=",
+    Assert.assertEquals("wbPK", "xtAWGAiblvhYJiCpUB3dwdRFPpg=",
         result1.getFirst());
     Assert.assertEquals("wbPK", "urn:publicid:gv.at:wbpk+XERSB+123456",
         result1.getSecond());
@@ -267,7 +267,7 @@ public class BpkBuilderTest {
     Pair<String, String> result1 = BpkBuilder.generateAreaSpecificPersonIdentifier(
         BASEID, EaafConstants.URN_PREFIX_WBPK + "XZVR+123456");
     
-    Assert.assertEquals("wbPK", "g4JRKGS+AJxd9FU8k2tG8Lxrx6M=",
+    Assert.assertEquals("wbPK", "1WvaBLiTxcc3kVzfB71Zh2sCtvA=",
         result1.getFirst());
     Assert.assertEquals("wbPK", "urn:publicid:gv.at:wbpk+XZVR+123456",
         result1.getSecond());
@@ -280,7 +280,7 @@ public class BpkBuilderTest {
     Pair<String, String> result1 = BpkBuilder.generateAreaSpecificPersonIdentifier(
         BASEID, EaafConstants.URN_PREFIX_WBPK + "XERSB+123456");
     
-    Assert.assertEquals("wbPK", "Bjnl0BofeJGgqynJP1r/ff6E1Rk=",
+    Assert.assertEquals("wbPK", "xtAWGAiblvhYJiCpUB3dwdRFPpg=",
         result1.getFirst());
     Assert.assertEquals("wbPK", "urn:publicid:gv.at:wbpk+XERSB+123456",
         result1.getSecond());
@@ -384,7 +384,7 @@ public class BpkBuilderTest {
   @Test
   public void calcNormalizeNullTarget() {
     Assert.assertNull("Wrong normalized target",  
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(null));
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(null));
      
   }
   
@@ -393,7 +393,7 @@ public class BpkBuilderTest {
     String target = EaafConstants.URN_PREFIX_CDID + RandomStringUtils.randomAlphabetic(2);
     Assert.assertEquals("Wrong normalized target", 
         target, 
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(target));
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(target));
     
   }
   
@@ -402,7 +402,7 @@ public class BpkBuilderTest {
 
     Assert.assertEquals("Wrong normalized target", 
         EaafConstants.URN_PREFIX_WBPK + "FN+123456i", 
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(EaafConstants.URN_PREFIX_WBPK + "FN+123456i"));
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(EaafConstants.URN_PREFIX_WBPK + "FN+123456i"));
     
   }
   
@@ -411,7 +411,7 @@ public class BpkBuilderTest {
     String target = EaafConstants.URN_PREFIX_WBPK + RandomStringUtils.randomAlphabetic(2);
     Assert.assertEquals("Wrong normalized target", 
         target, 
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(target));
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(target));
     
   }
   
@@ -419,7 +419,7 @@ public class BpkBuilderTest {
   public void calcNormalizeWbpkTargetWithXMappingFn() {
     Assert.assertEquals("Wrong normalized target", 
         EaafConstants.URN_PREFIX_WBPK + "FN+123456i", 
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(EaafConstants.URN_PREFIX_WBPK + "XFN+123456i"));
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(EaafConstants.URN_PREFIX_WBPK + "XFN+123456i"));
     
   }
   
@@ -427,7 +427,7 @@ public class BpkBuilderTest {
   public void calcNormalizeWbpkTargetWithXMappingZvr() {
     Assert.assertEquals("Wrong normalized target", 
         EaafConstants.URN_PREFIX_WBPK + "ZVR+1122334455", 
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(EaafConstants.URN_PREFIX_WBPK + "XZVR+1122334455"));
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(EaafConstants.URN_PREFIX_WBPK + "XZVR+1122334455"));
     
   }
   
@@ -435,7 +435,7 @@ public class BpkBuilderTest {
   public void calcNormalizeWbpkTargetWithXMappingErsb() {
     Assert.assertEquals("Wrong normalized target", 
         EaafConstants.URN_PREFIX_WBPK + "ERSB+998877665544", 
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(
             EaafConstants.URN_PREFIX_WBPK + "XERSB+998877665544"));
     
   }
@@ -446,7 +446,7 @@ public class BpkBuilderTest {
         + "+" + RandomStringUtils.randomAlphabetic(2);
     Assert.assertEquals("Wrong normalized target", 
         target, 
-        BpkBuilder.normalizeBpkTargetIdentifierToCalculationFormat(target));
+        BpkBuilder.normalizeBpkTargetIdentifierToNonXFormat(target));
     
   }