feat: improve the test case creating process on ui (#515)

Co-authored-by: rick <[email protected]>
LinuxSuRen · Jul 16, 2024 · b7f0503 · b7f0503
1 parent 1d5f54f
commit b7f0503
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 20 deletions.
diff --git a/console/atest-ui/src/views/TestSuite.vue b/console/atest-ui/src/views/TestSuite.vue
@@ -104,7 +104,8 @@ const testCaseForm = reactive({
   suiteName: '',
   name: '',
   api: '',
-  method: 'GET'
+  method: 'GET',
+  request: {}
 })
 const rules = reactive<FormRules<Suite>>({
   name: [{ required: true, message: 'Please input TestCase name', trigger: 'blur' }]
@@ -118,20 +119,17 @@ Magic.Keys(openNewTestCaseDialog, ['Alt+N', 'Alt+dead'])
 
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
-  await formEl.validate((valid: boolean, fields) => {
+  await formEl.validate((valid: boolean) => {
     if (valid) {
       suiteCreatingLoading.value = true
 
-      API.CreateTestCase(
-        {
+      API.CreateTestCase({
           suiteName: props.name,
           name: testCaseForm.name,
-          api: testCaseForm.api,
-          method: testCaseForm.method
-        },
-        () => {
+          request: testCaseForm.request
+        }, () => {
           suiteCreatingLoading.value = false
-          emit('updated', 'hello from child')
+          emit('updated', props.name, testCaseForm.name)
         }
       )
 
@@ -203,6 +201,7 @@ const handleAPISelect = (item: TestCase) => {
     if (testCaseForm.name === '') {
         testCaseForm.name = item.name
     }
+    testCaseForm.request = item.request
 }
 
 function paramChange() {

diff --git a/console/atest-ui/src/views/TestingPanel.vue b/console/atest-ui/src/views/TestingPanel.vue
@@ -125,7 +125,7 @@ function loadTestSuites(storeName: string) {
 
           d.data[k].data.forEach((item: any) => {
             suite.children?.push({
-              id: k + item,
+              id: generateTestCaseID(k, item),
               label: item,
               store: storeName,
               kind: suite.kind,
@@ -139,6 +139,10 @@ function loadTestSuites(storeName: string) {
   }
 }
 
+function generateTestCaseID(suiteName: string, caseName: string) {
+  return suiteName + caseName
+}
+
 interface Store {
   name: string,
   description: string,
@@ -147,7 +151,12 @@ interface Store {
 const loginDialogVisible = ref(false)
 const stores = ref([] as Store[])
 const storesLoading = ref(false)
-function loadStores() {
+function loadStores(lastSuitName?: string, lastCaseName?: string) {
+  if (lastSuitName && lastCaseName && lastSuitName !== '' && lastCaseName !== '') {
+    // get data from emit event
+    Cache.SetLastTestCaseLocation(lastSuitName, generateTestCaseID(lastSuitName, lastCaseName))
+  }
+
   storesLoading.value = true
   const requestOptions = {
     headers: {
@@ -203,7 +212,7 @@ function loadStores() {
         treeRef.value!.setCheckedKeys([targetChild.id], false)
 
         testSuite.value = targetSuite.label
-        Cache.SetCurrentStore(targetSuite.store )
+        Cache.SetCurrentStore(targetSuite.store)
         testSuiteKind.value = targetChild.kind
       } else {
         viewName.value = ""

diff --git a/console/atest-ui/src/views/net.ts b/console/atest-ui/src/views/net.ts
@@ -178,8 +178,7 @@ function ImportTestSuite(source: ImportSource, callback: (d: any) => void) {
 interface TestCase {
   suiteName: string
   name: string
-  api: string
-  method: string
+  request: any
 }
 
 function CreateTestCase(testcase: TestCase,
@@ -194,10 +193,7 @@ function CreateTestCase(testcase: TestCase,
       suiteName: testcase.suiteName,
       data: {
         name: testcase.name,
-        request: {
-          api: testcase.api,
-          method: testcase.method
-        }
+        request: testcase.request
       }
     })
   }

diff --git a/pkg/runner/http.go b/pkg/runner/http.go
@@ -253,9 +253,18 @@ func (r *simpleTestCaseRunner) GetSuggestedAPIs(suite *testing.TestSuite, api st
 						switch param.In {
 						case "query":
 							// TODO should have a better way to provide the initial value
-							(&(testcase.Request)).Query[param.Name] = "todo"
+							(&(testcase.Request)).Query[param.Name] = generateRandomValue(param)
 						}
 					}
+					testcase.Name = swagger.Paths.Paths[api].Get.ID
+				case http.MethodPost:
+					testcase.Name = swagger.Paths.Paths[api].Post.ID
+				case http.MethodPut:
+					testcase.Name = swagger.Paths.Paths[api].Put.ID
+				case http.MethodDelete:
+					testcase.Name = swagger.Paths.Paths[api].Delete.ID
+				case http.MethodPatch:
+					testcase.Name = swagger.Paths.Paths[api].Patch.ID
 				}
 				result = append(result, testcase)
 			}
@@ -264,6 +273,19 @@ func (r *simpleTestCaseRunner) GetSuggestedAPIs(suite *testing.TestSuite, api st
 	return
 }
 
+func generateRandomValue(param spec.Parameter) interface{} {
+	switch param.Format {
+	case "int32", "int64":
+		return 101
+	case "boolean":
+		return true
+	case "string":
+		return "random"
+	default:
+		return "random"
+	}
+}
+
 func (r *simpleTestCaseRunner) withResponseRecord(resp *http.Response) (responseBodyData []byte, err error) {
 	responseBodyData, err = io.ReadAll(resp.Body)
 	r.simpleResponse = SimpleResponse{

diff --git a/pkg/runner/http_test.go b/pkg/runner/http_test.go
@@ -26,6 +26,7 @@ import (
 
 	_ "embed"
 
+	"github.com/go-openapi/spec"
 	"github.com/h2non/gock"
 	atest "github.com/linuxsuren/api-testing/pkg/testing"
 	"github.com/linuxsuren/api-testing/pkg/util"
@@ -558,7 +559,6 @@ func TestGetSuggestedAPIs(t *testing.T) {
 	assert.NotEmpty(t, result)
 	method := result[0].Request.Method
 	assert.Equal(t, strings.ToUpper(method), method)
-	assert.Equal(t, "todo", result[0].Request.Query["text"])
 }
 
 func TestIsStructContent(t *testing.T) {
@@ -589,6 +589,44 @@ func TestIsStructContent(t *testing.T) {
 	}
 }
 
+func TestGenerateRandomValue(t *testing.T) {
+	tests := []struct {
+		param    spec.Parameter
+		expected interface{}
+	}{
+		{
+			param: spec.Parameter{
+				SimpleSchema: spec.SimpleSchema{
+					Format: "int32",
+				},
+			},
+			expected: 101,
+		}, {
+			param: spec.Parameter{
+				SimpleSchema: spec.SimpleSchema{
+					Format: "boolean",
+				},
+			},
+			expected: true,
+		}, {
+			param: spec.Parameter{
+				SimpleSchema: spec.SimpleSchema{
+					Format: "string",
+				},
+			},
+			expected: "random",
+		},
+	}
+
+	for _, tt := range tests {
+		result := generateRandomValue(tt.param)
+
+		if result != tt.expected {
+			t.Errorf("generateRandomValue(%v) = %v, expected %v", tt.param, result, tt.expected)
+		}
+	}
+}
+
 const defaultSchemaForTest = `{"properties": {
 	"name": {"type": "string"},
 	"age": {"type": "integer"}

diff --git a/pkg/runner/testdata/swagger.json b/pkg/runner/testdata/swagger.json
@@ -56,6 +56,10 @@
             "put": {
                 "summary": "summary",
                 "operationId": "updateUser"
+            },
+            "patch": {
+                "summary": "summary",
+                "operationId": "patchUser"
             }
         }
     },