Index: vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml
===================================================================
diff -u -r49331 -r51147
--- vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 49331)
+++ vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 51147)
@@ -3,11 +3,6 @@
 <Class name="vhUnitTest.AXimpl.Utils.KlantIdConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="OrigineleConfigSetting">
-<Type>%Boolean</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="KlantIdConverter">
 <Type>AXimpl.Utils.KlantIdConverter</Type>
 <Private>1</Private>
@@ -27,54 +22,58 @@
 <Implementation><![CDATA[
 	Do ##super()
 
-	Set ..OrigineleConfigSetting = ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A")
 	Set ..KlantIdConverter = ##class(AXimpl.Utils.KlantIdConverter).%New()
 	Set ..VanHoeckePersonality = ##class(DOM.common.enu.Personality).VanHoecke()
 	Set ..NietVanHoeckePersonality = ##class(DOM.common.enu.Personality).SFS()
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterAllTests">
+<Method name="Test: ConvertToVanHoecke converteert een AX KlantId naar een Van Hoecke KlantId">
 <Implementation><![CDATA[
-	Do ##super()
-	
-	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ..OrigineleConfigSetting, ..#Applicatie)
+	Do ..AssertVanHoeckeKlantId("00123", ..VanHoeckePersonality, "123")
+	Do ..AssertVanHoeckeKlantId("00123", ..NietVanHoeckePersonality, "00123")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ConvertToVanHoecke converteert in modus 2A een AX KlantId naar een Van Hoecke KlantId">
+<Method name="Test: ConvertToAx converteert een Van Hoecke KlantId naar een AX KlantId">
 <Implementation><![CDATA[
-	Do ..AssertVanHoeckeKlantId($$$False, "00123", ..VanHoeckePersonality, "00123")
-	Do ..AssertVanHoeckeKlantId($$$True, "00123", ..VanHoeckePersonality, "123")
-	Do ..AssertVanHoeckeKlantId($$$False, "00123", ..NietVanHoeckePersonality, "00123")
-	Do ..AssertVanHoeckeKlantId($$$True, "00123", ..NietVanHoeckePersonality, "00123")
+	Do ..AssertAxKlantId("123", ..VanHoeckePersonality, "00123")
+	Do ..AssertAxKlantId("123", ..NietVanHoeckePersonality, "123")
+	
+	Do ..AssertAxKlantId("K||123", ..VanHoeckePersonality, "00123")
+	Do ..AssertAxKlantId("K||123", ..NietVanHoeckePersonality, "K||123")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ConvertToAx converteert in modus 2A een Van Hoecke KlantId naar een AX KlantId">
+<Method name="Test: ConvertToAx roept LegacyPartijApi aan bij VanHoecke personality">
 <Implementation><![CDATA[
-	Do ..AssertAxKlantId($$$False, "K||123", ..VanHoeckePersonality, "K||123")
-	Do ..AssertAxKlantId($$$True, "K||123", ..VanHoeckePersonality, "00123")
-	Do ..AssertAxKlantId($$$False, "K||123", ..NietVanHoeckePersonality, "K||123")
-	Do ..AssertAxKlantId($$$True, "K||123", ..NietVanHoeckePersonality, "K||123")
+	#dim RandomPartijId As %String = "K||123"
+	#dim RandomKlantId As %String = "123"
+	
+	#dim LegacyPartijApiMock As vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
+	Do LegacyPartijApiMock.VerwachtMethodCall("IsKlantPartijID", RandomPartijId).DanReturn($$$True)
+	Do LegacyPartijApiMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID", RandomPartijId).DanReturn(RandomKlantId)
+	
+	#dim KlantIdConverter As AXimpl.Utils.KlantIdConverter = ##class(AXimpl.Utils.KlantIdConverter).%New(LegacyPartijApiMock)
+	#dim AxKlantId As %String = KlantIdConverter.ConvertToAx(RandomPartijId, ..VanHoeckePersonality)
+	
+	Do $$$AssertEquals(AxKlantId, "00123")
+	
+	Do LegacyPartijApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="AssertVanHoeckeKlantId">
-<FormalSpec>ConfigFlag:%Boolean,KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
+<FormalSpec>KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ConfigFlag, ..#Applicatie)
-	Do $$$AssertEquals(..KlantIdConverter.ConvertToVanHoecke(KlantId, PersonalityId), VerwachteKlantId)
+<Implementation><![CDATA[	Do $$$AssertEquals(..KlantIdConverter.ConvertToVanHoecke(KlantId, PersonalityId), VerwachteKlantId)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertAxKlantId">
-<FormalSpec>ConfigFlag:%Boolean,KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
+<FormalSpec>KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ConfigFlag, ..#Applicatie)
-	Do $$$AssertEquals(..KlantIdConverter.ConvertToAx(KlantId, PersonalityId), VerwachteKlantId)
+<Implementation><![CDATA[	Do $$$AssertEquals(..KlantIdConverter.ConvertToAx(KlantId, PersonalityId), VerwachteKlantId)
 ]]></Implementation>
 </Method>
 </Class>