Skip to content

Commit c89659c

Browse files
committed
fix: history record generate code
1 parent 9635ef8 commit c89659c

File tree

9 files changed

+448
-211
lines changed

9 files changed

+448
-211
lines changed

console/atest-ui/src/views/TestCase.vue

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,40 @@ function sendRequestWithParameter() {
160160
function generateCode() {
161161
const name = props.name
162162
const suite = props.suite
163+
const ID = props.historyCaseID
164+
if (isHistoryTestCase.value == true){
165+
API.HistoryGenerateCode({
166+
ID: ID,
167+
generator: currentCodeGenerator.value
168+
}, (e) => {
169+
ElMessage({
170+
message: 'Code generated!',
171+
type: 'success'
172+
})
173+
if (currentCodeGenerator.value === "gRPCPayload") {
174+
currentCodeContent.value = JSON.stringify(JSON.parse(e.message), null, 4)
175+
} else {
176+
currentCodeContent.value = e.message
177+
}
178+
}, UIAPI.ErrorTip)
179+
} else{
180+
API.GenerateCode({
181+
suiteName: suite,
182+
name: name,
183+
generator: currentCodeGenerator.value
184+
}, (e) => {
185+
ElMessage({
186+
message: 'Code generated!',
187+
type: 'success'
188+
})
189+
if (currentCodeGenerator.value === "gRPCPayload") {
190+
currentCodeContent.value = JSON.stringify(JSON.parse(e.message), null, 4)
191+
} else {
192+
currentCodeContent.value = e.message
193+
}
194+
}, UIAPI.ErrorTip)
195+
}
163196
164-
API.GenerateCode({
165-
suiteName: suite,
166-
name: name,
167-
generator: currentCodeGenerator.value
168-
}, (e) => {
169-
ElMessage({
170-
message: 'Code generated!',
171-
type: 'success'
172-
})
173-
if (currentCodeGenerator.value === "gRPCPayload") {
174-
currentCodeContent.value = JSON.stringify(JSON.parse(e.message), null, 4)
175-
} else {
176-
currentCodeContent.value = e.message
177-
}
178-
}, UIAPI.ErrorTip)
179197
}
180198
181199
function copyCode() {

console/atest-ui/src/views/net.ts

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ interface GenerateRequest {
326326
suiteName: string
327327
name: string
328328
generator: string
329+
id: string
329330
}
330331

331332
function GenerateCode(request: GenerateRequest,
@@ -337,16 +338,34 @@ function GenerateCode(request: GenerateRequest,
337338
'X-Auth': getToken()
338339
},
339340
body: JSON.stringify({
340-
TestSuite: request.suiteName,
341-
TestCase: request.name,
342-
Generator: request.generator
341+
TestSuite: request.suiteName,
342+
TestCase: request.name,
343+
Generator: request.generator
343344
})
344345
}
345346
fetch(`/api/v1/codeGenerators/generate`, requestOptions)
346347
.then(DefaultResponseProcess)
347348
.then(callback).catch(errHandle)
348349
}
349350

351+
function HistoryGenerateCode(request: GenerateRequest,
352+
callback: (d: any) => void, errHandle?: (e: any) => void | null) {
353+
const requestOptions = {
354+
method: 'POST',
355+
headers: {
356+
'X-Store-Name': Cache.GetCurrentStore().name,
357+
'X-Auth': getToken()
358+
},
359+
body: JSON.stringify({
360+
ID: request.ID,
361+
Generator: request.generator
362+
})
363+
}
364+
fetch(`/api/v1/codeGenerators/history/generate`, requestOptions)
365+
.then(DefaultResponseProcess)
366+
.then(callback).catch(errHandle)
367+
}
368+
350369
function ListCodeGenerator(callback: (d: any) => void, errHandle?: (e: any) => void | null) {
351370
fetch('/api/v1/codeGenerators', {
352371
headers: {
@@ -666,7 +685,7 @@ export const API = {
666685
CreateTestSuite, UpdateTestSuite, ImportTestSuite, GetTestSuite, DeleteTestSuite, ConvertTestSuite,GetTestSuiteYaml,
667686
CreateTestCase, UpdateTestCase, GetTestCase, ListTestCase, DeleteTestCase, RunTestCase,
668687
GetHistoryTestCaseWithResult, DeleteHistoryTestCase,GetHistoryTestCase, GetTestCaseAllHistory, DeleteAllHistoryTestCase, DownloadResponseFile,
669-
GenerateCode, ListCodeGenerator,
688+
GenerateCode, ListCodeGenerator, HistoryGenerateCode,
670689
PopularHeaders,
671690
CreateOrUpdateStore, GetStores, DeleteStore, VerifyStore,
672691
FunctionsQuery,

pkg/server/remote_server.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,31 @@ func (s *server) GenerateCode(ctx context.Context, in *CodeGenerateRequest) (rep
898898
return
899899
}
900900

901+
func (s *server) HistoryGenerateCode(ctx context.Context, in *CodeGenerateRequest) (reply *CommonResult, err error) {
902+
reply = &CommonResult{}
903+
instance := generator.GetCodeGenerator(in.Generator)
904+
if instance == nil {
905+
reply.Success = false
906+
reply.Message = fmt.Sprintf("generator '%s' not found", in.Generator)
907+
} else {
908+
loader := s.getLoader(ctx)
909+
var result testing.HistoryTestCase
910+
result, err = loader.GetHistoryTestCase(in.ID)
911+
var testCase testing.TestCase
912+
var suite testing.TestSuite
913+
testCase = result.Data
914+
suite.Name = result.SuiteName
915+
suite.API = result.SuiteAPI
916+
suite.Spec = result.SuiteSpec
917+
suite.Param = result.SuiteParam
918+
919+
output, genErr := instance.Generate(&suite, &testCase)
920+
reply.Success = genErr == nil
921+
reply.Message = util.OrErrorMessage(genErr, output)
922+
}
923+
return
924+
}
925+
901926
// converter
902927
func (s *server) ListConverter(ctx context.Context, in *Empty) (reply *SimpleList, err error) {
903928
reply = &SimpleList{}

0 commit comments

Comments
 (0)