Index: vhUnitTest/APPS/Halux/Planning/TestEventCatcher.cls.xml
===================================================================
diff -u -r915 -r956
--- vhUnitTest/APPS/Halux/Planning/TestEventCatcher.cls.xml	(.../TestEventCatcher.cls.xml)	(revision 915)
+++ vhUnitTest/APPS/Halux/Planning/TestEventCatcher.cls.xml	(.../TestEventCatcher.cls.xml)	(revision 956)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-22 08:16:45">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-24 16:23:21">
 <Class name="vhUnitTest.APPS.Halux.Planning.TestEventCatcher">
 <Description>
 do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.Halux.Planning.TestEventCatcher")</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
-<TimeChanged>62144,29867.008511</TimeChanged>
+<TimeChanged>62174,59087.103062</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="OnBeforeAllTests">
@@ -28,18 +28,16 @@
 <Method name="TestEvents">
 <Implementation><![CDATA[
 	Set ToeleveringsNummer = 296195
-	
 	Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringsNummer)
  	Set ToeleveringCreatedEventData = ##class(TECH.Events.ToeleveringCreatedEventData).%New(Toelevering)
  	Set ToeleveringCreatedEvent = ##class(TECH.Events.ToeleveringCreatedEvent).%New(ToeleveringCreatedEventData)
 	
 	Do ##class(APPS.Halux.Planning.impl.EventCatcher).ToeleveringCreatedEventListener(ToeleveringCreatedEvent)
 	
-	&SQL(SELECT ID INTO :ID FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE ToeleveringsNummer = :ToeleveringsNummer)
-	Set Bestaat = ($Get(ID,0) > 0)
+	Set Bestaat = ##class(APPS.Halux.Planning.impl.ToeleveringInfo).%ExistsId(ToeleveringsNummer)
 	
-	Set Gepland = "2011-02-11 12:00:00"
-	&SQL(UPDATE APPS_Halux_Planning_impl.PlanningDataItem SET Gepland = :Gepland WHERE ToeleveringsNummer = :ToeleveringsNummer)
+	Set Gepland = 62137
+	&SQL(UPDATE APPS_Halux_Planning_impl.ToeleveringInfo SET Dag = :Gepland WHERE ToeleveringNummer = :ToeleveringsNummer)
 	
 	Do $$$AssertTrue(Bestaat,"Het data item voor de planning werd bewaard")
 	
@@ -52,7 +50,7 @@
  	
  	Do ##class(APPS.Halux.Planning.impl.EventCatcher).ToeleveringModEventListener(ToeleveringModifiedEvent)
  	
- 	&SQL(SELECT DueOut,Gepland INTO :GevondenTijd,:GevondenGepland FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE ToeleveringsNummer = :ToeleveringsNummer)
+ 	&SQL(SELECT DueOut,Dag INTO :GevondenTijd,:GevondenGepland FROM APPS_Halux_Planning_impl.ToeleveringInfo WHERE ToeleveringNummer = :ToeleveringsNummer)
  	
  	Do $$$AssertEquals($zdt(NieuweDueOut,3),GevondenTijd,"De tijd werd niet overschreven bij het herberekenen")
  	Do $$$AssertEquals(Gepland,GevondenGepland,"De geplande tijd is niet gewijzigd")
@@ -61,12 +59,12 @@
  	Set ToeleveringDeletedEvent = ##class(TECH.Events.ToeleveringDeletedEvent).%New(ToeleveringDeletedEventData)
  	
  	Do ##class(APPS.Halux.Planning.impl.EventCatcher).ToeleveringDeletedEventListener(ToeleveringDeletedEvent)
- 	
-	&SQL(SELECT ID INTO :DELID FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE ToeleveringsNummer = :ToeleveringsNummer)
+
+	Set Bestaat = ##class(APPS.Halux.Planning.impl.ToeleveringInfo).%ExistsId(ToeleveringsNummer)
 		
-	Do $$$AssertEquals(DELID,"","Het data item voor de planning werd verwijderd")
+	Do $$$AssertFalse(Bestaat,"Het data item voor de planning werd verwijderd")
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="2697964196"/>
+<Checksum value="1604929850"/>
 </Export>