Skip to content

Commit 077533f

Browse files
committed
fix: history record generate code
1 parent 6eb2483 commit 077533f

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
@@ -324,6 +324,7 @@ interface GenerateRequest {
324324
suiteName: string
325325
name: string
326326
generator: string
327+
id: string
327328
}
328329

329330
function GenerateCode(request: GenerateRequest,
@@ -335,16 +336,34 @@ function GenerateCode(request: GenerateRequest,
335336
'X-Auth': getToken()
336337
},
337338
body: JSON.stringify({
338-
TestSuite: request.suiteName,
339-
TestCase: request.name,
340-
Generator: request.generator
339+
TestSuite: request.suiteName,
340+
TestCase: request.name,
341+
Generator: request.generator
341342
})
342343
}
343344
fetch(`/api/v1/codeGenerators/generate`, requestOptions)
344345
.then(DefaultResponseProcess)
345346
.then(callback).catch(errHandle)
346347
}
347348

349+
function HistoryGenerateCode(request: GenerateRequest,
350+
callback: (d: any) => void, errHandle?: (e: any) => void | null) {
351+
const requestOptions = {
352+
method: 'POST',
353+
headers: {
354+
'X-Store-Name': Cache.GetCurrentStore().name,
355+
'X-Auth': getToken()
356+
},
357+
body: JSON.stringify({
358+
ID: request.ID,
359+
Generator: request.generator
360+
})
361+
}
362+
fetch(`/api/v1/codeGenerators/history/generate`, requestOptions)
363+
.then(DefaultResponseProcess)
364+
.then(callback).catch(errHandle)
365+
}
366+
348367
function ListCodeGenerator(callback: (d: any) => void, errHandle?: (e: any) => void | null) {
349368
fetch('/api/v1/codeGenerators', {
350369
headers: {
@@ -681,7 +700,7 @@ export const API = {
681700
CreateTestSuite, UpdateTestSuite, ImportTestSuite, GetTestSuite, DeleteTestSuite, ConvertTestSuite,GetTestSuiteYaml,
682701
CreateTestCase, UpdateTestCase, GetTestCase, ListTestCase, DeleteTestCase, RunTestCase,
683702
GetHistoryTestCaseWithResult, DeleteHistoryTestCase,GetHistoryTestCase, GetTestCaseAllHistory, DeleteAllHistoryTestCase, DownloadResponseFile,
684-
GenerateCode, ListCodeGenerator,
703+
GenerateCode, ListCodeGenerator, HistoryGenerateCode,
685704
PopularHeaders,
686705
CreateOrUpdateStore, GetStores, DeleteStore, VerifyStore,
687706
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)