[JEDI.NET-commits] nunit/source Jedi.Timers.EventScheduler_NUnit.pas,1.1,1.2

[Marcel B. <jed...@us...>]

Update of /cvsroot/jedidotnet/nunit/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1152/nunit/source

Modified Files:
	Jedi.Timers.EventScheduler_NUnit.pas 
Log Message:
Adapted to changes in ScheduledEvents

Index: Jedi.Timers.EventScheduler_NUnit.pas
===================================================================
RCS file: /cvsroot/jedidotnet/nunit/source/Jedi.Timers.EventScheduler_NUnit.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Jedi.Timers.EventScheduler_NUnit.pas	25 Jan 2005 10:25:56 -0000	1.1
--- Jedi.Timers.EventScheduler_NUnit.pas	16 Jun 2005 13:20:10 -0000	1.2
***************
*** 5,10 ****
  uses
    System.Collections,
    NUnit.Framework,
!   Jedi.Timers.EventScheduler;
  
  type
--- 5,13 ----
  uses
    System.Collections,
+   System.Globalization,
+   System.Threading,
    NUnit.Framework,
!   Jedi.Timers.EventScheduler,
!   Jedi.Timers.Schedules;
  
  type
***************
*** 15,19 ****
      FEveryTwoSecondsList: ArrayList;
    strict protected
!     procedure EventCallback(event: ScheduledEvent);
    public
      [Test] procedure SingleScheduleEveryPointTwoSeconds;
--- 18,22 ----
      FEveryTwoSecondsList: ArrayList;
    strict protected
!     procedure EventCallback(event: ScheduledEventBase);
    public
      [Test] procedure SingleScheduleEveryPointTwoSeconds;
***************
*** 23,31 ****
  implementation
  
! uses
!   System.Globalization,
!   System.Threading;
! 
! procedure EventScheduler.EventCallback(event: ScheduledEvent);
  begin
    if event = FEveryTwoSeconds then
--- 26,30 ----
  implementation
  
! procedure EventScheduler.EventCallback(event: ScheduledEventBase);
  begin
    if event = FEveryTwoSeconds then
***************
*** 38,45 ****
  begin
    FEveryTwoSecondsList := ArrayList.Create;
!   FEveryTwoSeconds := ScheduledEvent.Create(2000000, EventCallback);
    FirstTicks := FEveryTwoSeconds.ScheduledFor;
    Thread.Sleep(410);
!   FEveryTwoSeconds.Interval := 0; // no more events
    Thread.Sleep(410);
    Assert.IsTrue(ScheduledEvents.HasStarted, 'Thread never started.');
--- 37,44 ----
  begin
    FEveryTwoSecondsList := ArrayList.Create;
!   FEveryTwoSeconds := ScheduledEvent.Create(MillisecondSchedule.Create(200), EventCallback);
    FirstTicks := FEveryTwoSeconds.ScheduledFor;
    Thread.Sleep(410);
!   FEveryTwoSeconds.Schedule := nil; // no more events
    Thread.Sleep(410);
    Assert.IsTrue(ScheduledEvents.HasStarted, 'Thread never started.');
***************
*** 57,69 ****
  begin
    FEveryTwoSecondsList := ArrayList.Create;
!   FEveryTwoSeconds := ScheduledEvent.Create(2000000, EventCallback);
    FirstTicks := FEveryTwoSeconds.ScheduledFor;
    repeat
!   until DateTime.UtcNow.Ticks > (FirstTicks + 2100000);
  //  Thread.Sleep(410);
!   FEveryTwoSeconds.Interval := 0; // no more events
  //  Thread.Sleep(410);
    repeat
!   until DateTime.UtcNow.Ticks > (FirstTicks + 4200000);
    Console.WriteLine('Events {0}; Notifications: {0}', &Object(ScheduledEvents.EventsWaiting), &Object(ScheduledEvents.NotificationsWaiting));
    Assert.IsTrue(ScheduledEvents.HasStarted, 'Thread never started.');
--- 56,68 ----
  begin
    FEveryTwoSecondsList := ArrayList.Create;
!   FEveryTwoSeconds := ScheduledEvent.Create(MillisecondSchedule.Create(200), EventCallback);
    FirstTicks := FEveryTwoSeconds.ScheduledFor;
    repeat
!   until DateTime.Now.Ticks > (FirstTicks + 2100000);
  //  Thread.Sleep(410);
!   FEveryTwoSeconds.Schedule := nil; // no more events
  //  Thread.Sleep(410);
    repeat
!   until DateTime.Now.Ticks > (FirstTicks + 4200000);
    Console.WriteLine('Events {0}; Notifications: {0}', &Object(ScheduledEvents.EventsWaiting), &Object(ScheduledEvents.NotificationsWaiting));
    Assert.IsTrue(ScheduledEvents.HasStarted, 'Thread never started.');