loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix Go client tests (#15505)

Browse Source 
* fix go tests

* more fixes

* fix mock
This commit is contained in:
William Cheng 2023-05-14 21:17:48 +08:00 committed by GitHub
parent fd20632ba1
commit f0519eb934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
samples/client/petstore/go/auth_test.go
View File

@ -41,7 +41,7 @@ func TestOAuth2(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"), PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}}) Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() r, err := client.PetAPI.AddPet(context.Background()).Body(newPet).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding pet: %v", err) t.Fatalf("Error while adding pet: %v", err)
@ -50,7 +50,7 @@ func TestOAuth2(t *testing.T) {
t.Log(r) t.Log(r)
} }
r, err = client.PetApi.DeletePet(auth, 12992).Execute() r, err = client.PetAPI.DeletePet(auth, 12992).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
@ -72,7 +72,7 @@ func TestAPIKeyNoPrefix(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"), PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}}) Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() r, err := client.PetAPI.AddPet(context.Background()).Body(newPet).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding pet: %v", err) t.Fatalf("Error while adding pet: %v", err)
@ -81,7 +81,7 @@ func TestAPIKeyNoPrefix(t *testing.T) {
t.Log(r) t.Log(r)
} }
_, r, err = client.PetApi.GetPetById(auth, 12992).Execute() _, r, err = client.PetAPI.GetPetById(auth, 12992).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
} }
@ -91,7 +91,7 @@ func TestAPIKeyNoPrefix(t *testing.T) {
t.Errorf("APIKey Authentication is missing") t.Errorf("APIKey Authentication is missing")
} }
r, err = client.PetApi.DeletePet(auth, 12992).Execute() r, err = client.PetAPI.DeletePet(auth, 12992).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
} }
@ -107,7 +107,7 @@ func TestAPIKeyWithPrefix(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"), PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}}) Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
r, err := client.PetApi.AddPet(nil).Body(newPet).Execute() r, err := client.PetAPI.AddPet(nil).Body(newPet).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding pet: %v", err) t.Fatalf("Error while adding pet: %v", err)
@ -116,7 +116,7 @@ func TestAPIKeyWithPrefix(t *testing.T) {
t.Log(r) t.Log(r)
} }
_, r, err = client.PetApi.GetPetById(auth, 12992).Execute() _, r, err = client.PetAPI.GetPetById(auth, 12992).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
} }
@ -126,7 +126,7 @@ func TestAPIKeyWithPrefix(t *testing.T) {
t.Errorf("APIKey Authentication is missing") t.Errorf("APIKey Authentication is missing")
} }
r, err = client.PetApi.DeletePet(auth, 12992).Execute() r, err = client.PetAPI.DeletePet(auth, 12992).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
} }
@ -140,7 +140,7 @@ func TestDefaultHeader(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"), PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}}) Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() r, err := client.PetAPI.AddPet(context.Background()).Body(newPet).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding pet: %v", err) t.Fatalf("Error while adding pet: %v", err)
@ -149,7 +149,7 @@ func TestDefaultHeader(t *testing.T) {
t.Log(r) t.Log(r)
} }
r, err = client.PetApi.DeletePet(context.Background(), 12992).Execute() r, err = client.PetAPI.DeletePet(context.Background(), 12992).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
@ -164,7 +164,7 @@ func TestDefaultHeader(t *testing.T) {
} }
func TestHostOverride(t *testing.T) { func TestHostOverride(t *testing.T) {
_, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() _, r, err := client.PetAPI.FindPetsByStatus(context.Background()).Status(nil).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while finding pets by status: %v", err) t.Fatalf("Error while finding pets by status: %v", err)
@ -176,7 +176,7 @@ func TestHostOverride(t *testing.T) {
} }
func TestSchemeOverride(t *testing.T) { func TestSchemeOverride(t *testing.T) {
_, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() _, r, err := client.PetAPI.FindPetsByStatus(context.Background()).Status(nil).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while finding pets by status: %v", err) t.Fatalf("Error while finding pets by status: %v", err)

2
samples/client/petstore/go/fake_api_test.go
View File

@ -17,7 +17,7 @@ func TestPutBodyWithFileSchema(t *testing.T) {
File: &sw.File{SourceURI: sw.PtrString("https://example.com/image.png")}, File: &sw.File{SourceURI: sw.PtrString("https://example.com/image.png")},
Files: []sw.File{{SourceURI: sw.PtrString("https://example.com/image.png")}}} Files: []sw.File{{SourceURI: sw.PtrString("https://example.com/image.png")}}}
r, err := client.FakeApi.TestBodyWithFileSchema(context.Background()).Body(schema).Execute() r, err := client.FakeAPI.TestBodyWithFileSchema(context.Background()).Body(schema).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding pet: %v", err) t.Fatalf("Error while adding pet: %v", err)

32
samples/client/petstore/go/pet_api_test.go
View File

@ -32,7 +32,7 @@ func TestAddPet(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"), PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}}) Tags: []sw.Tag{{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() r, err := client.PetAPI.AddPet(context.Background()).Body(newPet).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding pet: %v", err) t.Fatalf("Error while adding pet: %v", err)
@ -43,16 +43,16 @@ func TestAddPet(t *testing.T) {
} }
func TestAddPetMock(t *testing.T) { func TestAddPetMock(t *testing.T) {
actualApi := client.PetApi actualApi := client.PetAPI
mockApi := mock.NewMockPetApi() mockApi := mock.NewMockPetApi()
client.PetApi = mockApi client.PetAPI = mockApi
TestAddPet(t) TestAddPet(t)
client.PetApi = actualApi client.PetAPI = actualApi
} }
func TestFindPetsByStatusWithMissingParam(t *testing.T) { func TestFindPetsByStatusWithMissingParam(t *testing.T) {
_, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() _, r, err := client.PetAPI.FindPetsByStatus(context.Background()).Status(nil).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while testing TestFindPetsByStatusWithMissingParam: %v", err) t.Fatalf("Error while testing TestFindPetsByStatusWithMissingParam: %v", err)
@ -67,7 +67,7 @@ func TestGetPetById(t *testing.T) {
} }
func TestGetPetByIdWithInvalidID(t *testing.T) { func TestGetPetByIdWithInvalidID(t *testing.T) {
resp, r, err := client.PetApi.GetPetById(context.Background(), 999999999).Execute() resp, r, err := client.PetAPI.GetPetById(context.Background(), 999999999).Execute()
if r != nil && r.StatusCode == 404 { if r != nil && r.StatusCode == 404 {
assertedError, ok := err.(*sw.GenericOpenAPIError) assertedError, ok := err.(*sw.GenericOpenAPIError)
a := assert.New(t) a := assert.New(t)
@ -84,7 +84,7 @@ func TestGetPetByIdWithInvalidID(t *testing.T) {
} }
func TestUpdatePetWithForm(t *testing.T) { func TestUpdatePetWithForm(t *testing.T) {
r, err := client.PetApi.UpdatePetWithForm(context.Background(), 12830).Name("golang").Status("available").Execute() r, err := client.PetAPI.UpdatePetWithForm(context.Background(), 12830).Name("golang").Status("available").Execute()
if err != nil { if err != nil {
t.Fatalf("Error while updating pet by id: %v", err) t.Fatalf("Error while updating pet by id: %v", err)
t.Log(r) t.Log(r)
@ -99,7 +99,7 @@ func TestUpdatePetWithForm(t *testing.T) {
func TestFindPetsByTag(t *testing.T) { func TestFindPetsByTag(t *testing.T) {
var found = false var found = false
resp, r, err := client.PetApi.FindPetsByTags(context.Background()).Tags([]string{"tag2"}).Execute() resp, r, err := client.PetAPI.FindPetsByTags(context.Background()).Tags([]string{"tag2"}).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while getting pet by tag: %v", err) t.Fatalf("Error while getting pet by tag: %v", err)
t.Log(r) t.Log(r)
@ -128,7 +128,7 @@ func TestFindPetsByTag(t *testing.T) {
} }
func TestFindPetsByStatus(t *testing.T) { func TestFindPetsByStatus(t *testing.T) {
resp, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status([]string{"available"}).Execute() resp, r, err := client.PetAPI.FindPetsByStatus(context.Background()).Status([]string{"available"}).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while getting pet by id: %v", err) t.Fatalf("Error while getting pet by id: %v", err)
t.Log(r) t.Log(r)
@ -154,7 +154,7 @@ func TestUploadFile(t *testing.T) {
t.Fatalf("Error opening file: %v", err1) t.Fatalf("Error opening file: %v", err1)
} }
_, r, err := client.PetApi.UploadFile(context.Background(), 12830).AdditionalMetadata("golang").File(file).Execute() _, r, err := client.PetAPI.UploadFile(context.Background(), 12830).AdditionalMetadata("golang").File(file).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while uploading file: %v", err) t.Fatalf("Error while uploading file: %v", err)
@ -172,7 +172,7 @@ func TestUploadFileRequired(t *testing.T) {
t.Fatalf("Error opening file: %v", err1) t.Fatalf("Error opening file: %v", err1)
} }
_, r, err := client.PetApi.UploadFileWithRequiredFile(context.Background(), 12830).RequiredFile(file).AdditionalMetadata("golang").Execute() _, r, err := client.PetAPI.UploadFileWithRequiredFile(context.Background(), 12830).RequiredFile(file).AdditionalMetadata("golang").Execute()
if err != nil { if err != nil {
t.Fatalf("Error while uploading file: %v", err) t.Fatalf("Error while uploading file: %v", err)
@ -184,7 +184,7 @@ func TestUploadFileRequired(t *testing.T) {
} }
func TestDeletePet(t *testing.T) { func TestDeletePet(t *testing.T) {
r, err := client.PetApi.DeletePet(context.Background(), 12830).Execute() r, err := client.PetAPI.DeletePet(context.Background(), 12830).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
@ -212,7 +212,7 @@ func TestConcurrency(t *testing.T) {
// Add the pets. // Add the pets.
for _, pet := range newPets { for _, pet := range newPets {
go func(newPet sw.Pet) { go func(newPet sw.Pet) {
r, err := client.PetApi.AddPet(nil, newPet) r, err := client.PetAPI.AddPet(nil, newPet)
if r.StatusCode != 200 { if r.StatusCode != 200 {
t.Log(r) t.Log(r)
} }
@ -234,7 +234,7 @@ func TestConcurrency(t *testing.T) {
// Update all to active with the name gopherDan // Update all to active with the name gopherDan
for _, pet := range newPets { for _, pet := range newPets {
go func(id int64) { go func(id int64) {
r, err := client.PetApi.UpdatePet(nil, sw.Pet{Id: (int64)(id), Name: "gopherDan", PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "active"}) r, err := client.PetAPI.UpdatePet(nil, sw.Pet{Id: (int64)(id), Name: "gopherDan", PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "active"})
if r.StatusCode != 200 { if r.StatusCode != 200 {
t.Log(r) t.Log(r)
} }
@ -274,7 +274,7 @@ func waitOnFunctions(t *testing.T, errc chan error, n int) {
} }
func deletePet(t *testing.T, id int64) { func deletePet(t *testing.T, id int64) {
r, err := client.PetApi.DeletePet(context.Background(), id).Execute() r, err := client.PetAPI.DeletePet(context.Background(), id).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err) t.Fatalf("Error while deleting pet by id: %v", err)
@ -286,7 +286,7 @@ func deletePet(t *testing.T, id int64) {
func isPetCorrect(t *testing.T, id int64, name string, status string) { func isPetCorrect(t *testing.T, id int64, name string, status string) {
assert := assert.New(t) assert := assert.New(t)
resp, r, err := client.PetApi.GetPetById(context.Background(), id).Execute() resp, r, err := client.PetAPI.GetPetById(context.Background(), id).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while getting pet by id: %v", err) t.Fatalf("Error while getting pet by id: %v", err)
} else { } else {

2
samples/client/petstore/go/store_api_test.go
View File

@ -18,7 +18,7 @@ func TestPlaceOrder(t *testing.T) {
Status: sw.PtrString("placed"), Status: sw.PtrString("placed"),
Complete: sw.PtrBool(false)} Complete: sw.PtrBool(false)}
_, r, err := client.StoreApi.PlaceOrder(context.Background()).Body(newOrder).Execute() _, r, err := client.StoreAPI.PlaceOrder(context.Background()).Body(newOrder).Execute()
if err != nil { if err != nil {
// Skip parsing time error due to error in Petstore Test Server // Skip parsing time error due to error in Petstore Test Server

18
samples/client/petstore/go/user_api_test.go
View File

@ -20,7 +20,7 @@ func TestCreateUser(t *testing.T) {
Phone: sw.PtrString("5101112222"), Phone: sw.PtrString("5101112222"),
UserStatus: sw.PtrInt32(1)} UserStatus: sw.PtrInt32(1)}
apiResponse, err := client.UserApi.CreateUser(context.Background()).Body(newUser).Execute() apiResponse, err := client.UserAPI.CreateUser(context.Background()).Body(newUser).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding user: %v", err) t.Fatalf("Error while adding user: %v", err)
@ -55,7 +55,7 @@ func TestCreateUsersWithArrayInput(t *testing.T) {
}, },
} }
apiResponse, err := client.UserApi.CreateUsersWithArrayInput(context.Background()).Body(newUsers).Execute() apiResponse, err := client.UserAPI.CreateUsersWithArrayInput(context.Background()).Body(newUsers).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while adding users: %v", err) t.Fatalf("Error while adding users: %v", err)
} }
@ -64,13 +64,13 @@ func TestCreateUsersWithArrayInput(t *testing.T) {
} }
/* issue deleting users due to issue in the server side (500). commented out below for the time being /* issue deleting users due to issue in the server side (500). commented out below for the time being
//tear down //tear down
_, err1 := client.UserApi.DeleteUser(context.Background(), "gopher1").Execute() _, err1 := client.UserAPI.DeleteUser(context.Background(), "gopher1").Execute()
if err1 != nil { if err1 != nil {
t.Errorf("Error while deleting user") t.Errorf("Error while deleting user")
t.Log(err1) t.Log(err1)
} }
_, err2 := client.UserApi.DeleteUser(context.Background(), "gopher2").Execute() _, err2 := client.UserAPI.DeleteUser(context.Background(), "gopher2").Execute()
if err2 != nil { if err2 != nil {
t.Errorf("Error while deleting user") t.Errorf("Error while deleting user")
t.Log(err2) t.Log(err2)
@ -81,7 +81,7 @@ func TestCreateUsersWithArrayInput(t *testing.T) {
func TestGetUserByName(t *testing.T) { func TestGetUserByName(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute() resp, apiResponse, err := client.UserAPI.GetUserByName(context.Background(), "gopher").Execute()
if err != nil { if err != nil {
t.Fatalf("Error while getting user by id: %v", err) t.Fatalf("Error while getting user by id: %v", err)
} else { } else {
@ -96,7 +96,7 @@ func TestGetUserByName(t *testing.T) {
} }
func TestGetUserByNameWithInvalidID(t *testing.T) { func TestGetUserByNameWithInvalidID(t *testing.T) {
resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "999999999").Execute() resp, apiResponse, err := client.UserAPI.GetUserByName(context.Background(), "999999999").Execute()
if apiResponse != nil && apiResponse.StatusCode == 404 { if apiResponse != nil && apiResponse.StatusCode == 404 {
return // This is a pass condition. API will return with a 404 error. return // This is a pass condition. API will return with a 404 error.
} else if err != nil { } else if err != nil {
@ -123,7 +123,7 @@ func TestUpdateUser(t *testing.T) {
Phone: sw.PtrString("5101112222"), Phone: sw.PtrString("5101112222"),
UserStatus: sw.PtrInt32(1)} UserStatus: sw.PtrInt32(1)}
apiResponse, err := client.UserApi.UpdateUser(context.Background(), "gopher").Body(newUser).Execute() apiResponse, err := client.UserAPI.UpdateUser(context.Background(), "gopher").Body(newUser).Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting user by id: %v", err) t.Fatalf("Error while deleting user by id: %v", err)
} }
@ -132,7 +132,7 @@ func TestUpdateUser(t *testing.T) {
} }
//verify changes are correct //verify changes are correct
resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute() resp, apiResponse, err := client.UserAPI.GetUserByName(context.Background(), "gopher").Execute()
if err != nil { if err != nil {
t.Fatalf("Error while getting user by id: %v", err) t.Fatalf("Error while getting user by id: %v", err)
} else { } else {
@ -144,7 +144,7 @@ func TestUpdateUser(t *testing.T) {
/* issue deleting users due to issue in the server side (500). commented out below for the time being /* issue deleting users due to issue in the server side (500). commented out below for the time being
func TestDeleteUser(t *testing.T) { func TestDeleteUser(t *testing.T) {
apiResponse, err := client.UserApi.DeleteUser(context.Background(), "gopher").Execute() apiResponse, err := client.UserAPI.DeleteUser(context.Background(), "gopher").Execute()
if err != nil { if err != nil {
t.Fatalf("Error while deleting user: %v", err) t.Fatalf("Error while deleting user: %v", err)