bugfix: registered activity with alias in test suite (#344)

* bugfix: registered activity with alias in test suite

Author: wxing1292

internal/error.go

@@ -188,7 +188,7 @@ func NewCanceledError(details ...interface{}) *CanceledError {
 //
 func NewContinueAsNewError(ctx Context, wfn interface{}, args ...interface{}) *ContinueAsNewError {
 	// Validate type and its arguments.
-	workflowType, input, err := getValidatedWorkerFunction(wfn, args)
+	workflowType, input, err := getValidatedWorkflowFunction(wfn, args)
 	if err != nil {
 		panic(err)
 	}

internal/internal_workflow.go

@@ -942,7 +942,7 @@ func newWorkflowDefinition(workflow workflow) workflowDefinition {
 	return &syncWorkflowDefinition{workflow: workflow}
 }
 
-func getValidatedWorkerFunction(workflowFunc interface{}, args []interface{}) (*WorkflowType, []byte, error) {
+func getValidatedWorkflowFunction(workflowFunc interface{}, args []interface{}) (*WorkflowType, []byte, error) {
 	fnName := ""
 	fType := reflect.TypeOf(workflowFunc)
 	switch fType.Kind() {

internal/internal_workflow_client.go

@@ -153,7 +153,7 @@ func (wc *workflowClient) StartWorkflow(
 	}
 
 	// Validate type and its arguments.
-	workflowType, input, err := getValidatedWorkerFunction(workflowFunc, args)
+	workflowType, input, err := getValidatedWorkflowFunction(workflowFunc, args)
 	if err != nil {
 		return nil, err
 	}

internal/internal_workflow_testsuite.go

@@ -298,25 +298,11 @@ func (env *testWorkflowEnvironmentImpl) setActivityTaskList(tasklist string, act
 }
 
 func (env *testWorkflowEnvironmentImpl) executeWorkflow(workflowFn interface{}, args ...interface{}) {
-	var workflowType string
-	fnType := reflect.TypeOf(workflowFn)
-	switch fnType.Kind() {
-	case reflect.String:
-		workflowType = workflowFn.(string)
-	case reflect.Func:
-		workflowType = getFunctionName(workflowFn)
-		if alias, ok := getHostEnvironment().getWorkflowAlias(workflowType); ok {
-			workflowType = alias
-		}
-	default:
-		panic("unsupported workflowFn")
-	}
-
-	input, err := getHostEnvironment().encodeArgs(args)
+	workflowType, input, err := getValidatedWorkflowFunction(workflowFn, args)
 	if err != nil {
 		panic(err)
 	}
-	env.executeWorkflowInternal(workflowType, input)
+	env.executeWorkflowInternal(workflowType.Name, input)
 }
 
 func (env *testWorkflowEnvironmentImpl) executeWorkflowInternal(workflowType string, input []byte) {
@@ -353,15 +339,13 @@ func (env *testWorkflowEnvironmentImpl) executeActivity(
 	activityFn interface{},
 	args ...interface{},
 ) (encoded.Value, error) {
-	fnName := getFunctionName(activityFn)
-
-	input, err := getHostEnvironment().encodeArgs(args)
+	activityType, input, err := getValidatedActivityFunction(activityFn, args)
 	if err != nil {
 		panic(err)
 	}
 
 	params := executeActivityParameters{
-		ActivityType: ActivityType{Name: fnName},
+		ActivityType: *activityType,
 		Input:        input,
 		ScheduleToCloseTimeoutSeconds: 600,
 		StartToCloseTimeoutSeconds:    600,

internal/internal_workflow_testsuite_test.go

@@ -959,6 +959,42 @@ func (s *WorkflowTestSuiteUnitTest) Test_ActivityWithThriftTypes() {
 	s.EqualValues(expectedValues, actualValues)
 }
 
+func (s *WorkflowTestSuiteUnitTest) Test_ActivityRegistration() {
+	activityFn := func(msg string) (string, error) {
+		return msg, nil
+	}
+	activityAlias := "some-random-activity-alias"
+
+	RegisterActivityWithOptions(activityFn, RegisterActivityOptions{Name: activityAlias})
+	env := s.NewTestActivityEnvironment()
+	input := "some random input"
+
+	encodedValue, err := env.ExecuteActivity(activityFn, input)
+	s.NoError(err)
+	output := ""
+	encodedValue.Get(&output)
+	s.Equal(input, output)
+
+	encodedValue, err = env.ExecuteActivity(activityAlias, input)
+	s.NoError(err)
+	output = ""
+	encodedValue.Get(&output)
+	s.Equal(input, output)
+}
+
+func (s *WorkflowTestSuiteUnitTest) Test_WorkflowRegistration() {
+	workflowFn := func(ctx Context) error {
+		return nil
+	}
+	workflowAlias := "some-random-workflow-alias"
+
+	RegisterWorkflowWithOptions(workflowFn, RegisterWorkflowOptions{Name: workflowAlias})
+	env := s.NewTestWorkflowEnvironment()
+
+	env.ExecuteWorkflow(workflowFn)
+	env.ExecuteWorkflow(workflowAlias)
+}
+
 func (s *WorkflowTestSuiteUnitTest) Test_ActivityFriendlyName() {
 	activityFn := func(msg string) (string, error) {
 		return "hello_" + msg, nil

internal/workflow.go

@@ -359,7 +359,7 @@ func ExecuteChildWorkflow(ctx Context, childWorkflow interface{}, args ...interf
 	result := childWorkflowFutureImpl{
 		decodeFutureImpl: mainFuture.(*decodeFutureImpl),
 		executionFuture:  executionFuture.(*futureImpl)}
-	wfType, input, err := getValidatedWorkerFunction(childWorkflow, args)
+	wfType, input, err := getValidatedWorkflowFunction(childWorkflow, args)
 	if err != nil {
 		mainSettable.Set(nil, err)
 		return result