Merge pull request #159 from cschleiden/cschleiden/test-workflow-before-activities

Handle workflow events before activities

Author: cschleiden

tester/tester.go

@@ -299,16 +299,7 @@ func (wt *workflowTester[TResult]) Execute(args ...interface{}) {
 				}
 			}
 
-			// Schedule activities
-			for _, event := range result.ActivityEvents {
-				gotNewEvents = true
-
-				a := event.Attributes.(*history.ActivityScheduledAttributes)
-				wt.logger.Debug("Activity event", "activity", a.Name)
-
-				wt.scheduleActivity(tw.instance, event)
-			}
-
+			// Schedule sub-workflows and handle x-workflow events
 			for _, workflowEvent := range result.WorkflowEvents {
 				gotNewEvents = true
 				wt.logger.Debug("Workflow event", "event_type", workflowEvent.HistoryEvent.Type)
@@ -322,6 +313,17 @@ func (wt *workflowTester[TResult]) Execute(args ...interface{}) {
 				}
 			}
 
+			// Schedule activities
+			for _, event := range result.ActivityEvents {
+				gotNewEvents = true
+
+				a := event.Attributes.(*history.ActivityScheduledAttributes)
+				wt.logger.Debug("Activity event", "activity", a.Name)
+
+				wt.scheduleActivity(tw.instance, event)
+			}
+
+			// Schedule timers
 			for _, timerEvent := range result.TimerEvents {
 				gotNewEvents = true
 				wt.logger.Debug("Timer event", "event_type", timerEvent.Type)