Index: vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestOrderIngaveService.cls.xml
===================================================================
diff -u -r34668 -r34678
--- vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestOrderIngaveService.cls.xml	(.../TestOrderIngaveService.cls.xml)	(revision 34668)
+++ vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestOrderIngaveService.cls.xml	(.../TestOrderIngaveService.cls.xml)	(revision 34678)
@@ -3,72 +3,8 @@
 <Class name="vhUnitTest.APPS.VKP.OrderIngaveService.MaakOrderVanOfferte.TestOrderIngaveService">
 <Description>
 Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VKP.OrderIngaveService.MaakOrderVanOfferte.TestOrderIngaveService")</Description>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.APPS.VKP.OrderIngaveService.MaakOrderVanOfferte.TestBase</Super>
 
-<Parameter name="GebruiktVariabeleControle">
-<Default>0</Default>
-</Parameter>
-
-<Parameter name="LevertijdTekst">
-<Type>%String</Type>
-<Default>31-12-2099</Default>
-</Parameter>
-
-<Property name="Offerte">
-<Type>APPS.VKP.impl.Offerte</Type>
-</Property>
-
-<Property name="Winkelkar">
-<Type>DOM.EC.Winkelkar.Winkelkar</Type>
-</Property>
-
-<Property name="Data">
-<Type>vhUnitTest.DOM.PM.TestData</Type>
-</Property>
-
-<Property name="EersteOrderID">
-<Type>%String</Type>
-</Property>
-
-<Property name="OrderID">
-<Type>%String</Type>
-</Property>
-
-<Property name="OrderIngaveService">
-<Type>APPS.VKP.OrderIngaveService</Type>
-</Property>
-
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	do ##super()
-	Set ..Data = ##class(vhUnitTest.DOM.PM.TestData).%New()
-	Do ..VerwijderTestData()
-]]></Implementation>
-</Method>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	do ##super(aTestName)
-	do ##class(TECH.Context).Instance().PushDateTimeAPIClassName(##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).%ClassName(1))
-	do ..MaakData()
-	
-	set EventRaiserMock = ##class(vhTest.Fake.TECH.PubSub.EventRaiser).%New()
-	#dim FakePubSubAPI As vhTest.Mock.TECH.PubSub.PubSubAPI = ##class(vhTest.Mock.TECH.PubSub.PubSubAPI).MockInstance()
-	do FakePubSubAPI.IndienMethodCall("GeefEventRaiser").DanReturn(EventRaiserMock)
-	
-	Set ..OrderIngaveService = ##class(APPS.VKP.OrderIngaveService).%New()
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	do ..VerwijderData()
-	do ##super(aTestName)
-]]></Implementation>
-</Method>
-
 <Method name="TestMaakOrderVanOfferte">
 <Implementation><![CDATA[
 	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
@@ -165,92 +101,6 @@
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="TestMaakOrderVanOfferteMetVerzendItemVanTAXExport">
-<Implementation><![CDATA[
-	Set ..Offerte.VerzendingItem = ##class(APPS.VKP.impl.Offerte.VerzendingItem).%New()
-	Set ..Offerte.VerzendingItem.Code = 1
-	Do ..Offerte.Save()
-
-	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
-	
-	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
-
-	If $$$AssertTrue($IsObject(Order)) {
-		Do $$$AssertEquals(Order.GeefLeveringVoorwaarde(),##class(DOM.CRM.enu.LeveringVoorwaarde).KostInManueleLijn())
-	}
-]]></Implementation>
-</Method>
-
-<Method name="TestMaakOrderVanOfferteZonderVerzendItemVanTAXExport">
-<Implementation><![CDATA[
-	Set ..Offerte.VerzendingItem = ""
-	Do ..Offerte.Save()
-
-	#Dim Order As DOM.VKP.Order = ..OrderIngaveService.MaakOrderVanOfferte(..Offerte.GeefID())
-	
-	Do $$$AssertEquals(Order.GeefKlantID(),..Offerte.KlantID)
-
-	If $$$AssertTrue($IsObject(Order)) {
-		Do $$$AssertNotEquals(Order.GeefLeveringVoorwaarde(),##class(DOM.CRM.enu.LeveringVoorwaarde).KostInManueleLijn())
-	}
-]]></Implementation>
-</Method>
-
-<Method name="VerwijderData">
-<Private>1</Private>
-<Implementation><![CDATA[
-	If (..EersteOrderID'=""){
-		Do ##class(DOM.DomeinContext).Instance().GeefOrderAPI().VerwijderOrder(..EersteOrderID)
-		Set ..EersteOrderID = ""
-	}
-	If (..OrderID'=""){
-		If ##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatOrder(..OrderID) {
-			Do ##class(DOM.DomeinContext).Instance().GeefOrderAPI().VerwijderOrder(..OrderID)
-		}
-	}
-	If $IsObject(..Winkelkar) {
-		Do ..Winkelkar.Delete()
-	}
-	
-	Do ..VerwijderTestData()
-]]></Implementation>
-</Method>
-
-<Method name="VerwijderTestData">
-<Private>1</Private>
-<Implementation><![CDATA[	Do ..Data.VerwijderTestData(1000,1000)
-]]></Implementation>
-</Method>
-
-<Method name="MaakData">
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(..GeefTestUserID())
-	Do ..Data.CreeerTestData(1000,1000)
-
-	set ExterneVerkoopService = ##class(WS.EC.ExterneVerkoopService).%New()
-	#dim OfferteIDEnWinkelkarID As APPS.EC.dto.OfferteIDEnWinkelkarID = ExterneVerkoopService.MaakOfferte("K||1000")
-	
-	Set ..Offerte = ##class(APPS.VKP.impl.Offerte).OpenId(OfferteIDEnWinkelkarID.OfferteID)
-	
-	Set ..Offerte.DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
-	Set ..Offerte.BestelOpmerking = "De bestelopmerking"	
-	Set ..Offerte.DocumentReferenties.OrderReferentie = "UnitTestOrderReferentie"
-	Set ..Offerte.DocumentReferenties.CommissieReferentie = "UnitTestCommissieReferentie"
-	Set ..Offerte.DocumentReferenties.KlantOrderNummer = "UnitTestKlantOrderNummer"
-	Do ..Offerte.DocumentReferenties.Save()
-	
-	Do ..Offerte.ZetLeverDatum($$INTDATE^vhLib.DataTypes(..#LevertijdTekst))
-	Do ..Offerte.Save()
-	
-	Set ..Winkelkar = ##class(DOM.EC.Winkelkar.Winkelkar).OpenId(OfferteIDEnWinkelkarID.WinkelkarID)
-	Set Product = ##class(Prod.Product).%OpenId(1000)
-	Set ProductLijn = ##class(DOM.EC.Winkelkar.ProductLijn).%New(Product,5)
-	Do ..Winkelkar.VoegToe(ProductLijn)
-	Do ..Winkelkar.Save()
-]]></Implementation>
-</Method>
 </Class>