Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Go client tests #15505

Merged
merged 3 commits into from
May 14, 2023
Merged

Fix Go client tests #15505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf3806f
fix go tests
wing328 May 14, 2023
14a46a5
more fixes
wing328 May 14, 2023
3da9bee
fix mock
wing328 May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions samples/client/petstore/go/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestOAuth2(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
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 {
t.Fatalf("Error while adding pet: %v", err)
Expand All @@ -50,7 +50,7 @@ func TestOAuth2(t *testing.T) {
t.Log(r)
}

r, err = client.PetApi.DeletePet(auth, 12992).Execute()
r, err = client.PetAPI.DeletePet(auth, 12992).Execute()

if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err)
Expand All @@ -72,7 +72,7 @@ func TestAPIKeyNoPrefix(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
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 {
t.Fatalf("Error while adding pet: %v", err)
Expand All @@ -81,7 +81,7 @@ func TestAPIKeyNoPrefix(t *testing.T) {
t.Log(r)
}

_, r, err = client.PetApi.GetPetById(auth, 12992).Execute()
_, r, err = client.PetAPI.GetPetById(auth, 12992).Execute()
if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err)
}
Expand All @@ -91,7 +91,7 @@ func TestAPIKeyNoPrefix(t *testing.T) {
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 {
t.Fatalf("Error while deleting pet by id: %v", err)
}
Expand All @@ -107,7 +107,7 @@ func TestAPIKeyWithPrefix(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
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 {
t.Fatalf("Error while adding pet: %v", err)
Expand All @@ -116,7 +116,7 @@ func TestAPIKeyWithPrefix(t *testing.T) {
t.Log(r)
}

_, r, err = client.PetApi.GetPetById(auth, 12992).Execute()
_, r, err = client.PetAPI.GetPetById(auth, 12992).Execute()
if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err)
}
Expand All @@ -126,7 +126,7 @@ func TestAPIKeyWithPrefix(t *testing.T) {
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 {
t.Fatalf("Error while deleting pet by id: %v", err)
}
Expand All @@ -140,7 +140,7 @@ func TestDefaultHeader(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
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 {
t.Fatalf("Error while adding pet: %v", err)
Expand All @@ -149,7 +149,7 @@ func TestDefaultHeader(t *testing.T) {
t.Log(r)
}

r, err = client.PetApi.DeletePet(context.Background(), 12992).Execute()
r, err = client.PetAPI.DeletePet(context.Background(), 12992).Execute()

if err != nil {
t.Fatalf("Error while deleting pet by id: %v", err)
Expand All @@ -164,7 +164,7 @@ func TestDefaultHeader(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 {
t.Fatalf("Error while finding pets by status: %v", err)
Expand All @@ -176,7 +176,7 @@ func TestHostOverride(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 {
t.Fatalf("Error while finding pets by status: %v", err)
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/fake_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestPutBodyWithFileSchema(t *testing.T) {
File: &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 {
t.Fatalf("Error while adding pet: %v", err)
Expand Down
32 changes: 16 additions & 16 deletions samples/client/petstore/go/pet_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestAddPet(t *testing.T) {
PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
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 {
t.Fatalf("Error while adding pet: %v", err)
Expand All @@ -43,16 +43,16 @@ func TestAddPet(t *testing.T) {
}

func TestAddPetMock(t *testing.T) {
actualApi := client.PetApi
actualApi := client.PetAPI

mockApi := mock.NewMockPetApi()
client.PetApi = mockApi
client.PetAPI = mockApi
TestAddPet(t)
client.PetApi = actualApi
client.PetAPI = actualApi
}

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 {
t.Fatalf("Error while testing TestFindPetsByStatusWithMissingParam: %v", err)
Expand All @@ -67,7 +67,7 @@ func TestGetPetById(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 {
assertedError, ok := err.(*sw.GenericOpenAPIError)
a := assert.New(t)
Expand All @@ -84,7 +84,7 @@ func TestGetPetByIdWithInvalidID(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 {
t.Fatalf("Error while updating pet by id: %v", err)
t.Log(r)
Expand All @@ -99,7 +99,7 @@ func TestUpdatePetWithForm(t *testing.T) {

func TestFindPetsByTag(t *testing.T) {
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 {
t.Fatalf("Error while getting pet by tag: %v", err)
t.Log(r)
Expand Down Expand Up @@ -128,7 +128,7 @@ func TestFindPetsByTag(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 {
t.Fatalf("Error while getting pet by id: %v", err)
t.Log(r)
Expand All @@ -154,7 +154,7 @@ func TestUploadFile(t *testing.T) {
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 {
t.Fatalf("Error while uploading file: %v", err)
Expand All @@ -172,7 +172,7 @@ func TestUploadFileRequired(t *testing.T) {
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 {
t.Fatalf("Error while uploading file: %v", err)
Expand All @@ -184,7 +184,7 @@ func TestUploadFileRequired(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 {
t.Fatalf("Error while deleting pet by id: %v", err)
Expand Down Expand Up @@ -212,7 +212,7 @@ func TestConcurrency(t *testing.T) {
// Add the pets.
for _, pet := range newPets {
go func(newPet sw.Pet) {
r, err := client.PetApi.AddPet(nil, newPet)
r, err := client.PetAPI.AddPet(nil, newPet)
if r.StatusCode != 200 {
t.Log(r)
}
Expand All @@ -234,7 +234,7 @@ func TestConcurrency(t *testing.T) {
// Update all to active with the name gopherDan
for _, pet := range newPets {
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 {
t.Log(r)
}
Expand Down Expand Up @@ -274,7 +274,7 @@ func waitOnFunctions(t *testing.T, errc chan error, n int) {
}

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 {
t.Fatalf("Error while deleting pet by id: %v", err)
Expand All @@ -286,7 +286,7 @@ func deletePet(t *testing.T, id int64) {

func isPetCorrect(t *testing.T, id int64, name string, status string) {
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 {
t.Fatalf("Error while getting pet by id: %v", err)
} else {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/store_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestPlaceOrder(t *testing.T) {
Status: sw.PtrString("placed"),
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 {
// Skip parsing time error due to error in Petstore Test Server
Expand Down
18 changes: 9 additions & 9 deletions samples/client/petstore/go/user_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestCreateUser(t *testing.T) {
Phone: sw.PtrString("5101112222"),
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 {
t.Fatalf("Error while adding user: %v", err)
Expand Down Expand Up @@ -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 {
t.Fatalf("Error while adding users: %v", err)
}
Expand All @@ -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
//tear down
_, err1 := client.UserApi.DeleteUser(context.Background(), "gopher1").Execute()
_, err1 := client.UserAPI.DeleteUser(context.Background(), "gopher1").Execute()
if err1 != nil {
t.Errorf("Error while deleting user")
t.Log(err1)
}

_, err2 := client.UserApi.DeleteUser(context.Background(), "gopher2").Execute()
_, err2 := client.UserAPI.DeleteUser(context.Background(), "gopher2").Execute()
if err2 != nil {
t.Errorf("Error while deleting user")
t.Log(err2)
Expand All @@ -81,7 +81,7 @@ func TestCreateUsersWithArrayInput(t *testing.T) {
func TestGetUserByName(t *testing.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 {
t.Fatalf("Error while getting user by id: %v", err)
} else {
Expand All @@ -96,7 +96,7 @@ func TestGetUserByName(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 {
return // This is a pass condition. API will return with a 404 error.
} else if err != nil {
Expand All @@ -123,7 +123,7 @@ func TestUpdateUser(t *testing.T) {
Phone: sw.PtrString("5101112222"),
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 {
t.Fatalf("Error while deleting user by id: %v", err)
}
Expand All @@ -132,7 +132,7 @@ func TestUpdateUser(t *testing.T) {
}

//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 {
t.Fatalf("Error while getting user by id: %v", err)
} else {
Expand All @@ -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
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 {
t.Fatalf("Error while deleting user: %v", err)
Expand Down