From a6e45bf97dfc25852dbabe0d24d9b6260dd9ebb0 Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Fri, 29 Apr 2016 15:59:21 -0700 Subject: [PATCH 1/5] added user api test --- samples/client/petstore/go/user_api_test.go | 161 ++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 samples/client/petstore/go/user_api_test.go diff --git a/samples/client/petstore/go/user_api_test.go b/samples/client/petstore/go/user_api_test.go new file mode 100644 index 00000000000..38245f23e3d --- /dev/null +++ b/samples/client/petstore/go/user_api_test.go @@ -0,0 +1,161 @@ +package main + +import ( + sw "./go-petstore" + "github.com/stretchr/testify/assert" + "testing" +) + +func TestCreateUser(t *testing.T) { + s := sw.NewUserApi() + newUser := sw.User{ + Id: 1000, + FirstName: "gopher", + LastName : "lang", + Username : "gopher", + Password : "lang", + Email : "lang@test.com", + Phone : "5101112222", + UserStatus: 1} + + apiResponse, err := s.CreateUser(newUser) + + if err != nil { + t.Errorf("Error while adding user") + t.Log(err) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } +} + +// func TestCreateUsersWithArrayInput(t *testing.T) { +// s := sw.NewUserApi() +// newUsers := []sw.User{ +// sw.User { +// Id: int64(1001), +// FirstName: "gopher1", +// LastName : "lang1", +// Username : "gopher1", +// Password : "lang1", +// Email : "lang1@test.com", +// Phone : "5101112222", +// UserStatus: int32(1), +// }, +// sw.User { +// Id: int64(1002), +// FirstName: "gopher2", +// LastName : "lang2", +// Username : "gopher2", +// Password : "lang2", +// Email : "lang2@test.com", +// Phone : "5101112222", +// UserStatus: int32(1), +// }, +// } + +// apiResponse, err := s.CreateUsersWithArrayInput(newUsers) + +// if err != nil { +// t.Errorf("Error while adding users") +// t.Log(err) +// } +// if apiResponse.Response.StatusCode != 200 { +// t.Log(apiResponse.Response) +// } + +// //tear down +// _, err1 := s.DeleteUser("gopher1") +// if(err1 != nil){ +// t.Errorf("Error while deleting user") +// t.Log(err1) +// } + +// _, err2 := s.DeleteUser("gopher2") +// if(err2 != nil){ +// t.Errorf("Error while deleting user") +// t.Log(err2) +// } +// } + +func TestGetUserByName(t *testing.T) { + assert := assert.New(t) + + s := sw.NewUserApi() + resp, apiResponse, err := s.GetUserByName("gopher") + if err != nil { + t.Errorf("Error while getting pet by id") + t.Log(err) + } else { + assert.Equal(resp.Id, int64(1000), "User id should be equal") + assert.Equal(resp.Username, "gopher", "User name should be gopher") + assert.Equal(resp.LastName, "lang", "Last name should be lang") + //t.Log(resp) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } +} + +func TestGetUserByNameWithInvalidID(t *testing.T) { + s := sw.NewUserApi() + resp, apiResponse, err := s.GetUserByName("999999999") + if err != nil { + t.Errorf("Error while getting pet by invalid id") + t.Log(err) + t.Log(apiResponse) + } else { + t.Log(resp) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } +} + +func TestUpdateUser(t *testing.T) { + assert := assert.New(t) + s := sw.NewUserApi() + newUser := sw.User{ + Id: 1000, + FirstName: "gopher20", + LastName : "lang20", + Username : "gopher", + Password : "lang", + Email : "lang@test.com", + Phone : "5101112222", + UserStatus: 1} + + apiResponse, err := s.UpdateUser("gopher", newUser) + + if err != nil { + t.Errorf("Error while deleting pet by id") + t.Log(err) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } + + //verify changings are correct + resp, apiResponse, err := s.GetUserByName("gopher") + if err != nil { + t.Errorf("Error while getting pet by id") + t.Log(err) + } else { + assert.Equal(resp.Id, int64(1000), "User id should be equal") + assert.Equal(resp.FirstName, "gopher20", "User name should be gopher") + assert.Equal(resp.Password, "lang", "User name should be the same") + } +} + +func TestDeleteUser(t *testing.T) { + s := sw.NewUserApi() + apiResponse, err := s.DeleteUser("gopher") + + if err != nil { + t.Errorf("Error while deleting user") + t.Log(err) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } +} \ No newline at end of file From ad28879fce642243c9e557bacf69d2ea5d8c0e7f Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Fri, 29 Apr 2016 16:02:41 -0700 Subject: [PATCH 2/5] changed tabs to spaces --- samples/client/petstore/go/user_api_test.go | 258 ++++++++++---------- 1 file changed, 129 insertions(+), 129 deletions(-) diff --git a/samples/client/petstore/go/user_api_test.go b/samples/client/petstore/go/user_api_test.go index 38245f23e3d..ecc59c6f06e 100644 --- a/samples/client/petstore/go/user_api_test.go +++ b/samples/client/petstore/go/user_api_test.go @@ -1,161 +1,161 @@ package main import ( - sw "./go-petstore" - "github.com/stretchr/testify/assert" - "testing" + sw "./go-petstore" + "github.com/stretchr/testify/assert" + "testing" ) func TestCreateUser(t *testing.T) { - s := sw.NewUserApi() - newUser := sw.User{ - Id: 1000, - FirstName: "gopher", - LastName : "lang", - Username : "gopher", - Password : "lang", - Email : "lang@test.com", - Phone : "5101112222", - UserStatus: 1} + s := sw.NewUserApi() + newUser := sw.User{ + Id: 1000, + FirstName: "gopher", + LastName : "lang", + Username : "gopher", + Password : "lang", + Email : "lang@test.com", + Phone : "5101112222", + UserStatus: 1} - apiResponse, err := s.CreateUser(newUser) + apiResponse, err := s.CreateUser(newUser) - if err != nil { - t.Errorf("Error while adding user") - t.Log(err) - } - if apiResponse.Response.StatusCode != 200 { - t.Log(apiResponse.Response) - } + if err != nil { + t.Errorf("Error while adding user") + t.Log(err) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } } // func TestCreateUsersWithArrayInput(t *testing.T) { -// s := sw.NewUserApi() -// newUsers := []sw.User{ -// sw.User { -// Id: int64(1001), -// FirstName: "gopher1", -// LastName : "lang1", -// Username : "gopher1", -// Password : "lang1", -// Email : "lang1@test.com", -// Phone : "5101112222", -// UserStatus: int32(1), -// }, -// sw.User { -// Id: int64(1002), -// FirstName: "gopher2", -// LastName : "lang2", -// Username : "gopher2", -// Password : "lang2", -// Email : "lang2@test.com", -// Phone : "5101112222", -// UserStatus: int32(1), -// }, -// } - -// apiResponse, err := s.CreateUsersWithArrayInput(newUsers) +// s := sw.NewUserApi() +// newUsers := []sw.User{ +// sw.User { +// Id: int64(1001), +// FirstName: "gopher1", +// LastName : "lang1", +// Username : "gopher1", +// Password : "lang1", +// Email : "lang1@test.com", +// Phone : "5101112222", +// UserStatus: int32(1), +// }, +// sw.User { +// Id: int64(1002), +// FirstName: "gopher2", +// LastName : "lang2", +// Username : "gopher2", +// Password : "lang2", +// Email : "lang2@test.com", +// Phone : "5101112222", +// UserStatus: int32(1), +// }, +// } + +// apiResponse, err := s.CreateUsersWithArrayInput(newUsers) -// if err != nil { -// t.Errorf("Error while adding users") -// t.Log(err) -// } -// if apiResponse.Response.StatusCode != 200 { -// t.Log(apiResponse.Response) -// } +// if err != nil { +// t.Errorf("Error while adding users") +// t.Log(err) +// } +// if apiResponse.Response.StatusCode != 200 { +// t.Log(apiResponse.Response) +// } -// //tear down -// _, err1 := s.DeleteUser("gopher1") -// if(err1 != nil){ -// t.Errorf("Error while deleting user") -// t.Log(err1) -// } +// //tear down +// _, err1 := s.DeleteUser("gopher1") +// if(err1 != nil){ +// t.Errorf("Error while deleting user") +// t.Log(err1) +// } -// _, err2 := s.DeleteUser("gopher2") -// if(err2 != nil){ -// t.Errorf("Error while deleting user") -// t.Log(err2) -// } +// _, err2 := s.DeleteUser("gopher2") +// if(err2 != nil){ +// t.Errorf("Error while deleting user") +// t.Log(err2) +// } // } func TestGetUserByName(t *testing.T) { - assert := assert.New(t) + assert := assert.New(t) - s := sw.NewUserApi() - resp, apiResponse, err := s.GetUserByName("gopher") - if err != nil { - t.Errorf("Error while getting pet by id") - t.Log(err) - } else { - assert.Equal(resp.Id, int64(1000), "User id should be equal") - assert.Equal(resp.Username, "gopher", "User name should be gopher") - assert.Equal(resp.LastName, "lang", "Last name should be lang") - //t.Log(resp) - } - if apiResponse.Response.StatusCode != 200 { - t.Log(apiResponse.Response) - } + s := sw.NewUserApi() + resp, apiResponse, err := s.GetUserByName("gopher") + if err != nil { + t.Errorf("Error while getting pet by id") + t.Log(err) + } else { + assert.Equal(resp.Id, int64(1000), "User id should be equal") + assert.Equal(resp.Username, "gopher", "User name should be gopher") + assert.Equal(resp.LastName, "lang", "Last name should be lang") + //t.Log(resp) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } } func TestGetUserByNameWithInvalidID(t *testing.T) { - s := sw.NewUserApi() - resp, apiResponse, err := s.GetUserByName("999999999") - if err != nil { - t.Errorf("Error while getting pet by invalid id") - t.Log(err) - t.Log(apiResponse) - } else { - t.Log(resp) - } - if apiResponse.Response.StatusCode != 200 { - t.Log(apiResponse.Response) - } + s := sw.NewUserApi() + resp, apiResponse, err := s.GetUserByName("999999999") + if err != nil { + t.Errorf("Error while getting pet by invalid id") + t.Log(err) + t.Log(apiResponse) + } else { + t.Log(resp) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } } func TestUpdateUser(t *testing.T) { - assert := assert.New(t) - s := sw.NewUserApi() - newUser := sw.User{ - Id: 1000, - FirstName: "gopher20", - LastName : "lang20", - Username : "gopher", - Password : "lang", - Email : "lang@test.com", - Phone : "5101112222", - UserStatus: 1} + assert := assert.New(t) + s := sw.NewUserApi() + newUser := sw.User{ + Id: 1000, + FirstName: "gopher20", + LastName : "lang20", + Username : "gopher", + Password : "lang", + Email : "lang@test.com", + Phone : "5101112222", + UserStatus: 1} - apiResponse, err := s.UpdateUser("gopher", newUser) + apiResponse, err := s.UpdateUser("gopher", newUser) - if err != nil { - t.Errorf("Error while deleting pet by id") - t.Log(err) - } - if apiResponse.Response.StatusCode != 200 { - t.Log(apiResponse.Response) - } + if err != nil { + t.Errorf("Error while deleting pet by id") + t.Log(err) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } - //verify changings are correct - resp, apiResponse, err := s.GetUserByName("gopher") - if err != nil { - t.Errorf("Error while getting pet by id") - t.Log(err) - } else { - assert.Equal(resp.Id, int64(1000), "User id should be equal") - assert.Equal(resp.FirstName, "gopher20", "User name should be gopher") - assert.Equal(resp.Password, "lang", "User name should be the same") - } + //verify changings are correct + resp, apiResponse, err := s.GetUserByName("gopher") + if err != nil { + t.Errorf("Error while getting pet by id") + t.Log(err) + } else { + assert.Equal(resp.Id, int64(1000), "User id should be equal") + assert.Equal(resp.FirstName, "gopher20", "User name should be gopher") + assert.Equal(resp.Password, "lang", "User name should be the same") + } } func TestDeleteUser(t *testing.T) { - s := sw.NewUserApi() - apiResponse, err := s.DeleteUser("gopher") + s := sw.NewUserApi() + apiResponse, err := s.DeleteUser("gopher") - if err != nil { - t.Errorf("Error while deleting user") - t.Log(err) - } - if apiResponse.Response.StatusCode != 200 { - t.Log(apiResponse.Response) - } + if err != nil { + t.Errorf("Error while deleting user") + t.Log(err) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } } \ No newline at end of file From ed219f8a9a31be9bf3fd65ddcc43f2e6ebcf5cbd Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Fri, 29 Apr 2016 16:10:10 -0700 Subject: [PATCH 3/5] fix typo --- samples/client/petstore/go/user_api_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/go/user_api_test.go b/samples/client/petstore/go/user_api_test.go index ecc59c6f06e..cf7a4f59615 100644 --- a/samples/client/petstore/go/user_api_test.go +++ b/samples/client/petstore/go/user_api_test.go @@ -84,7 +84,7 @@ func TestGetUserByName(t *testing.T) { s := sw.NewUserApi() resp, apiResponse, err := s.GetUserByName("gopher") if err != nil { - t.Errorf("Error while getting pet by id") + t.Errorf("Error while getting user by id") t.Log(err) } else { assert.Equal(resp.Id, int64(1000), "User id should be equal") @@ -101,7 +101,7 @@ func TestGetUserByNameWithInvalidID(t *testing.T) { s := sw.NewUserApi() resp, apiResponse, err := s.GetUserByName("999999999") if err != nil { - t.Errorf("Error while getting pet by invalid id") + t.Errorf("Error while getting user by invalid id") t.Log(err) t.Log(apiResponse) } else { @@ -128,7 +128,7 @@ func TestUpdateUser(t *testing.T) { apiResponse, err := s.UpdateUser("gopher", newUser) if err != nil { - t.Errorf("Error while deleting pet by id") + t.Errorf("Error while deleting user by id") t.Log(err) } if apiResponse.Response.StatusCode != 200 { @@ -138,7 +138,7 @@ func TestUpdateUser(t *testing.T) { //verify changings are correct resp, apiResponse, err := s.GetUserByName("gopher") if err != nil { - t.Errorf("Error while getting pet by id") + t.Errorf("Error while getting user by id") t.Log(err) } else { assert.Equal(resp.Id, int64(1000), "User id should be equal") From 09248bcd25ec27728eaec95439357fe03d693c1c Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Fri, 29 Apr 2016 16:17:18 -0700 Subject: [PATCH 4/5] added comments for skip test --- samples/client/petstore/go/user_api_test.go | 89 +++++++++++---------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/samples/client/petstore/go/user_api_test.go b/samples/client/petstore/go/user_api_test.go index cf7a4f59615..747bde0be7e 100644 --- a/samples/client/petstore/go/user_api_test.go +++ b/samples/client/petstore/go/user_api_test.go @@ -29,54 +29,55 @@ func TestCreateUser(t *testing.T) { } } -// func TestCreateUsersWithArrayInput(t *testing.T) { -// s := sw.NewUserApi() -// newUsers := []sw.User{ -// sw.User { -// Id: int64(1001), -// FirstName: "gopher1", -// LastName : "lang1", -// Username : "gopher1", -// Password : "lang1", -// Email : "lang1@test.com", -// Phone : "5101112222", -// UserStatus: int32(1), -// }, -// sw.User { -// Id: int64(1002), -// FirstName: "gopher2", -// LastName : "lang2", -// Username : "gopher2", -// Password : "lang2", -// Email : "lang2@test.com", -// Phone : "5101112222", -// UserStatus: int32(1), -// }, -// } +//adding x to skip the test, currently it is failing +func xTestCreateUsersWithArrayInput(t *testing.T) { + s := sw.NewUserApi() + newUsers := []sw.User{ + sw.User { + Id: int64(1001), + FirstName: "gopher1", + LastName : "lang1", + Username : "gopher1", + Password : "lang1", + Email : "lang1@test.com", + Phone : "5101112222", + UserStatus: int32(1), + }, + sw.User { + Id: int64(1002), + FirstName: "gopher2", + LastName : "lang2", + Username : "gopher2", + Password : "lang2", + Email : "lang2@test.com", + Phone : "5101112222", + UserStatus: int32(1), + }, + } -// apiResponse, err := s.CreateUsersWithArrayInput(newUsers) + apiResponse, err := s.CreateUsersWithArrayInput(newUsers) -// if err != nil { -// t.Errorf("Error while adding users") -// t.Log(err) -// } -// if apiResponse.Response.StatusCode != 200 { -// t.Log(apiResponse.Response) -// } + if err != nil { + t.Errorf("Error while adding users") + t.Log(err) + } + if apiResponse.Response.StatusCode != 200 { + t.Log(apiResponse.Response) + } -// //tear down -// _, err1 := s.DeleteUser("gopher1") -// if(err1 != nil){ -// t.Errorf("Error while deleting user") -// t.Log(err1) -// } + //tear down + _, err1 := s.DeleteUser("gopher1") + if(err1 != nil){ + t.Errorf("Error while deleting user") + t.Log(err1) + } -// _, err2 := s.DeleteUser("gopher2") -// if(err2 != nil){ -// t.Errorf("Error while deleting user") -// t.Log(err2) -// } -// } + _, err2 := s.DeleteUser("gopher2") + if(err2 != nil){ + t.Errorf("Error while deleting user") + t.Log(err2) + } +} func TestGetUserByName(t *testing.T) { assert := assert.New(t) From 56d1b896b79f27d614ca94737d56a5a357bf19e6 Mon Sep 17 00:00:00 2001 From: Guo Huang Date: Sat, 30 Apr 2016 23:35:04 -0700 Subject: [PATCH 5/5] enable testing array after resty fixed their issue --- samples/client/petstore/go/user_api_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/go/user_api_test.go b/samples/client/petstore/go/user_api_test.go index 747bde0be7e..8ea2c29042a 100644 --- a/samples/client/petstore/go/user_api_test.go +++ b/samples/client/petstore/go/user_api_test.go @@ -30,7 +30,7 @@ func TestCreateUser(t *testing.T) { } //adding x to skip the test, currently it is failing -func xTestCreateUsersWithArrayInput(t *testing.T) { +func TestCreateUsersWithArrayInput(t *testing.T) { s := sw.NewUserApi() newUsers := []sw.User{ sw.User {