Remove WallClockAt

Author: cschleiden

tester/tester.go

@@ -48,9 +48,6 @@ type testTimer struct {
 	// At is the time this timer is scheduled for in test time
 	At time.Time
 
-	// WallClockAt is the time this timer is scheduled for in wall-clock time
-	WallClockAt time.Time
-
 	// Callback is called when the timer should fire.
 	Callback *func()
 
@@ -428,28 +425,21 @@ func (wt *workflowTester[TResult]) fireTimer() bool {
 		{
 			t := wt.timers[0]
 
-			wt.logger.Debug("Scheduling wall-clock timer", "at", t.WallClockAt)
-
-			// wt.nextTimer = t
+			wt.logger.Debug("Scheduling wall-clock timer", "at", t.At)
 
-			if wt.wallClock.Now().After(t.WallClockAt) {
-				// Fire timer
-				wt.timers = wt.timers[1:]
-				wt.callbacks <- t.fire
+			// Determine when this should run
+			remainingTime := t.At.Sub(wt.clock.Now())
 
-				return true
-			} else if wt.wallClockTimer == nil {
-				// Schedule timer
-				wt.wallClockTimer = wt.wallClock.AfterFunc(t.WallClockAt.Sub(wt.wallClock.Now()), func() {
-					wt.callbacks <- func() *history.WorkflowEvent {
-						// Remove timer
-						wt.timers = wt.timers[1:]
-						wt.wallClockTimer = nil
+			// Schedule timer
+			wt.wallClockTimer = wt.wallClock.AfterFunc(remainingTime, func() {
+				wt.callbacks <- func() *history.WorkflowEvent {
+					// Remove timer
+					wt.timers = wt.timers[1:]
+					wt.wallClockTimer = nil
 
-						return t.fire()
-					}
-				})
-			}
+					return t.fire()
+				}
+			})
 		}
 	}
 
@@ -633,7 +623,6 @@ func (wt *workflowTester[TResult]) scheduleTimer(instance *core.WorkflowInstance
 		Instance:        instance,
 		ScheduleEventID: event.ScheduleEventID,
 		At:              e.At,
-		WallClockAt:     wt.wallClock.Now().Add(e.At.Sub(wt.clock.Now())),
 		TimerEvent: &history.WorkflowEvent{
 			WorkflowInstance: instance,
 			HistoryEvent:     event,

tester/tester_activity_test.go

@@ -60,8 +60,6 @@ func Test_LongActivity(t *testing.T) {
 
 func Test_ActivityRaceWithSignal(t *testing.T) {
 	activity1 := func() (string, error) {
-		time.Sleep(200 * time.Millisecond)
-
 		return "activity", nil
 	}
 
@@ -92,7 +90,9 @@ func Test_ActivityRaceWithSignal(t *testing.T) {
 
 	tester := NewWorkflowTester[string](wf, WithTestTimeout(time.Second*3))
 
-	tester.OnActivity(activity1).Return("activity", nil)
+	tester.OnActivity(activity1).Run(func(args mock.Arguments) {
+		time.Sleep(200 * time.Millisecond)
+	}).Return("activity", nil)
 
 	tester.ScheduleCallback(time.Millisecond*100, func() {
 		tester.SignalWorkflow("signal", "stop")