fix: Unit test template bug

--bug=1
zeromicro · Nov 8, 2024 · 057c48f · 057c48f
1 parent 7b631c7
commit 057c48f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/tools/goctl/api/gogen/genlogictest.go b/tools/goctl/api/gogen/genlogictest.go
@@ -69,6 +69,7 @@ func genLogicTestByRoute(dir, rootPkg string, cfg *config.Config, group spec.Gro
 			"returnString": returnString,
 			"request":      requestString,
 			"hasRequest":   len(requestType) > 0,
+			"hasResponse":  len(route.ResponseTypeName()) > 0,
 			"requestType":  requestType,
 			"hasDoc":       len(route.JoinedDoc()) > 0,
 			"doc":          getDoc(route.JoinedDoc()),

diff --git a/tools/goctl/api/gogen/handler_test.tpl b/tools/goctl/api/gogen/handler_test.tpl
@@ -17,6 +17,7 @@ func Test{{.HandlerName}}(t *testing.T) {
 	// new service context
 	c := config.Config{}
 	svcCtx := svc.NewServiceContext(c)
+    // init mock service context here
 
 	tests := []struct {
 		name       string
@@ -29,7 +30,7 @@ func Test{{.HandlerName}}(t *testing.T) {
 			name:    "invalid request body",
 			reqBody: "invalid",
 			wantStatus: http.StatusBadRequest,
-			wantResp:   `{"code":400,"msg":"invalid request"}`, // Adjust based on actual error response
+			wantResp:   "unsupported type", // Adjust based on actual error response
 			setupMocks: func() {
 				// No setup needed for this test case
 			},
@@ -39,8 +40,8 @@ func Test{{.HandlerName}}(t *testing.T) {
 			{{if .HasRequest}}reqBody: types.{{.RequestType}}{
 				//TODO: add fields here
 			},
-			{{end}}wantStatus: http.StatusUnauthorized,
-			wantResp:   `{"code":401,"msg":"unauthorized"}`, // Adjust based on actual error response
+			{{end}}wantStatus: http.StatusBadRequest,
+			wantResp:  "error", // Adjust based on actual error response
 			setupMocks: func() {
 				// Mock login logic to return an error
 			},
@@ -73,7 +74,7 @@ func Test{{.HandlerName}}(t *testing.T) {
 			handler.ServeHTTP(rr, req)
 			t.Log(rr.Body.String())
 			assert.Equal(t, tt.wantStatus, rr.Code)
-			assert.JSONEq(t, tt.wantResp, rr.Body.String())
+			assert.Contains(t, rr.Body.String(), tt.wantResp)
 		})
 	}
 }
diff --git a/tools/goctl/api/gogen/logic_test.tpl b/tools/goctl/api/gogen/logic_test.tpl
@@ -23,29 +23,29 @@ func Test{{.logic}}_{{.function}}(t *testing.T) {
         checkResp  func{{.responseType}}
     }{
         {
-            name: "successful",
+            name: "response error",
             ctx:  context.Background(),
             setupMocks: func() {
-                // Mock data for this test case
+                // mock data for this test case
             },
             {{if .hasRequest}}req:  &{{.requestType}}{
                 // TODO: init your request here
             },{{end}}
-            wantErr: false,
+            wantErr: true,
             checkResp: func{{.responseType}} {
                 // TODO: Add your check logic here
             },
         },
         {
-            name: "response error",
+            name: "successful",
             ctx:  context.Background(),
             setupMocks: func() {
-                // mock data for this test case
+                // Mock data for this test case
             },
             {{if .hasRequest}}req:  &{{.requestType}}{
                 // TODO: init your request here
             },{{end}}
-            wantErr: true,
+            wantErr: false,
             checkResp: func{{.responseType}} {
                 // TODO: Add your check logic here
             },
@@ -56,15 +56,14 @@ func Test{{.logic}}_{{.function}}(t *testing.T) {
         t.Run(tt.name, func(t *testing.T) {
             tt.setupMocks()
             l := New{{.logic}}(tt.ctx, mockSvcCtx)
-            resp, err := l.{{.function}}({{if .hasRequest}}tt.req{{end}})
+            {{if .hasResponse}}resp, {{end}}err := l.{{.function}}({{if .hasRequest}}tt.req{{end}})
             if tt.wantErr {
                 assert.Error(t, err)
-                assert.Nil(t, resp)
             } else {
                 require.NoError(t, err)
-                assert.NotNil(t, resp)
-                tt.checkResp(resp, err)
+                {{if .hasResponse}}assert.NotNil(t, resp){{end}}
             }
+            tt.checkResp({{if .hasResponse}}resp, {{end}}err)
         })
     }
 }