Skip to content

Commit

Permalink
refactor(test/route): use dot import
Browse files Browse the repository at this point in the history
  • Loading branch information
@SkyeYoung
SkyeYoung committed Apr 7, 2022
1 parent 3532dc7 commit 8afadb6
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 67 deletions.
70 changes: 35 additions & 35 deletions api/test/e2enew/route/host_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ package route
import (
"net/http"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"

"github.com/apisix/manager-api/test/e2enew/base"
)

var _ = ginkgo.Describe("Route", func() {
table.DescribeTable("test route with host",
var _ = Describe("Route", func() {
DescribeTable("test route with host",
func(tc base.HttpTestCase) {
base.RunTestCase(tc)
},
table.Entry("invalid host", base.HttpTestCase{
Entry("invalid host", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Expand All @@ -48,7 +48,7 @@ var _ = ginkgo.Describe("Route", func() {
Headers: map[string]string{"Authorization": base.GetToken()},
ExpectStatus: http.StatusBadRequest,
}),
table.Entry("invalid hosts", base.HttpTestCase{
Entry("invalid hosts", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Expand All @@ -66,7 +66,7 @@ var _ = ginkgo.Describe("Route", func() {
Headers: map[string]string{"Authorization": base.GetToken()},
ExpectStatus: http.StatusBadRequest,
}),
table.Entry("create route with host and hosts together at the same time", base.HttpTestCase{
Entry("create route with host and hosts together at the same time", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Expand All @@ -85,15 +85,15 @@ var _ = ginkgo.Describe("Route", func() {
Headers: map[string]string{"Authorization": base.GetToken()},
ExpectStatus: http.StatusBadRequest,
}),
table.Entry("hit route not created", base.HttpTestCase{
Entry("hit route not created", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello_",
Headers: map[string]string{"Host": "foo.com"},
ExpectStatus: http.StatusNotFound,
ExpectBody: "{\"error_msg\":\"404 Route Not Found\"}\n",
}),
table.Entry("hit route not created", base.HttpTestCase{
Entry("hit route not created", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello_",
Expand All @@ -103,19 +103,19 @@ var _ = ginkgo.Describe("Route", func() {
}),
)

table.DescribeTable("test route with hosts",
DescribeTable("test route with hosts",
func(tc base.HttpTestCase) {
base.RunTestCase(tc)
},
table.Entry("make sure route not created", base.HttpTestCase{
Entry("make sure route not created", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello_",
Headers: map[string]string{"Host": "foo.com"},
ExpectStatus: http.StatusNotFound,
ExpectBody: "{\"error_msg\":\"404 Route Not Found\"}\n",
}),
table.Entry("create route", base.HttpTestCase{
Entry("create route", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Expand All @@ -133,7 +133,7 @@ var _ = ginkgo.Describe("Route", func() {
Headers: map[string]string{"Authorization": base.GetToken()},
ExpectStatus: http.StatusOK,
}),
table.Entry("create route with int uri", base.HttpTestCase{
Entry("create route with int uri", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Expand All @@ -144,7 +144,7 @@ var _ = ginkgo.Describe("Route", func() {
Headers: map[string]string{"Authorization": base.GetToken()},
ExpectStatus: http.StatusBadRequest,
}),
table.Entry("hit the route just created - wildcard domain name", base.HttpTestCase{
Entry("hit the route just created - wildcard domain name", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello_",
Expand All @@ -153,30 +153,30 @@ var _ = ginkgo.Describe("Route", func() {
ExpectBody: "hello world\n",
Sleep: base.SleepTime,
}),
table.Entry("hit the route just created", base.HttpTestCase{
Entry("hit the route just created", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello_",
Headers: map[string]string{"Host": "foo.com"},
ExpectStatus: http.StatusOK,
ExpectBody: "hello world\n",
}),
table.Entry("hit the route not exists", base.HttpTestCase{
Entry("hit the route not exists", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello_111",
Headers: map[string]string{"Host": "foo.com"},
ExpectStatus: http.StatusNotFound,
ExpectBody: "{\"error_msg\":\"404 Route Not Found\"}\n",
}),
table.Entry("delete the route just created", base.HttpTestCase{
Entry("delete the route just created", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": base.GetToken()},
ExpectStatus: http.StatusOK,
}),
table.Entry("hit the route just deleted", base.HttpTestCase{
Entry("hit the route just deleted", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello_",
Expand All @@ -187,19 +187,19 @@ var _ = ginkgo.Describe("Route", func() {
}),
)

table.DescribeTable("update routes with hosts",
DescribeTable("update routes with hosts",
func(tc base.HttpTestCase) {
base.RunTestCase(tc)
},
table.Entry("hit route that not exist", base.HttpTestCase{
Entry("hit route that not exist", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Host": "foo.com"},
ExpectStatus: http.StatusNotFound,
ExpectBody: "{\"error_msg\":\"404 Route Not Found\"}\n",
}),
table.Entry("create route with host foo.com", base.HttpTestCase{
Entry("create route with host foo.com", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Expand All @@ -221,15 +221,15 @@ var _ = ginkgo.Describe("Route", func() {
ExpectStatus: http.StatusOK,
ExpectBody: []string{"\"id\":\"r1\"", "\"hosts\":[\"foo.com\"]"},
}),
table.Entry("hit the route just create", base.HttpTestCase{
Entry("hit the route just create", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Host": "foo.com"},
ExpectStatus: http.StatusOK,
Sleep: base.SleepTime,
}),
table.Entry("update route with host bar.com", base.HttpTestCase{
Entry("update route with host bar.com", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Expand All @@ -248,30 +248,30 @@ var _ = ginkgo.Describe("Route", func() {
ExpectStatus: http.StatusOK,
ExpectBody: []string{"\"id\":\"r1\"", "\"hosts\":[\"bar.com\"]"},
}),
table.Entry("hit the route with host foo.com", base.HttpTestCase{
Entry("hit the route with host foo.com", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Host": "foo.com"},
ExpectStatus: http.StatusNotFound,
Sleep: base.SleepTime,
}),
table.Entry("hit the route just updated", base.HttpTestCase{
Entry("hit the route just updated", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Host": "bar.com"},
ExpectStatus: http.StatusOK,
ExpectBody: "hello world\n",
}),
table.Entry("delete route", base.HttpTestCase{
Entry("delete route", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": base.GetToken()},
ExpectStatus: http.StatusOK,
}),
table.Entry("hit the route just deleted", base.HttpTestCase{
Entry("hit the route just deleted", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
Expand All @@ -282,11 +282,11 @@ var _ = ginkgo.Describe("Route", func() {
}),
)

table.DescribeTable("test route with empty array",
DescribeTable("test route with empty array",
func(tc base.HttpTestCase) {
base.RunTestCase(tc)
},
table.Entry("create route with empty hosts and host", base.HttpTestCase{
Entry("create route with empty hosts and host", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Expand All @@ -306,15 +306,15 @@ var _ = ginkgo.Describe("Route", func() {
ExpectStatus: http.StatusBadRequest,
ExpectBody: `{"code":10000,"message":"schema validate failed: (root): Must validate one and only one schema (oneOf)\n(root): Must validate all the schemas (allOf)\nhosts: Array must have at least 1 items"}`,
}),
table.Entry("make sure the route not created", base.HttpTestCase{
Entry("make sure the route not created", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Host": "test.com"},
ExpectStatus: http.StatusNotFound,
ExpectBody: `{"error_msg":"404 Route Not Found"}`,
}),
table.Entry("create route with empty hosts", base.HttpTestCase{
Entry("create route with empty hosts", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Expand All @@ -333,14 +333,14 @@ var _ = ginkgo.Describe("Route", func() {
ExpectStatus: http.StatusBadRequest,
ExpectBody: `{"code":10000,"message":"schema validate failed: hosts: Array must have at least 1 items"}`,
}),
table.Entry("make sure the route not created", base.HttpTestCase{
Entry("make sure the route not created", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
ExpectStatus: http.StatusNotFound,
ExpectBody: `{"error_msg":"404 Route Not Found"}`,
}),
table.Entry("create route with empty uris and uri", base.HttpTestCase{
Entry("create route with empty uris and uri", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Expand All @@ -359,7 +359,7 @@ var _ = ginkgo.Describe("Route", func() {
ExpectStatus: http.StatusBadRequest,
ExpectBody: `{"code":10000,"message":"schema validate failed: (root): Must validate one and only one schema (oneOf)\n(root): Must validate all the schemas (allOf)\nuris: Array must have at least 1 items"}`,
}),
table.Entry("create route with empty remote_addrs and remote_addr", base.HttpTestCase{
Entry("create route with empty remote_addrs and remote_addr", base.HttpTestCase{
Object: base.ManagerApiExpect(),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Expand All @@ -379,7 +379,7 @@ var _ = ginkgo.Describe("Route", func() {
ExpectStatus: http.StatusBadRequest,
ExpectBody: `{"code":10000,"message":"schema validate failed: (root): Must validate one and only one schema (oneOf)\n(root): Must validate all the schemas (allOf)\nremote_addrs: Array must have at least 1 items"}`,
}),
table.Entry("make sure the route not created", base.HttpTestCase{
Entry("make sure the route not created", base.HttpTestCase{
Object: base.APISIXExpect(),
Method: http.MethodGet,
Path: "/hello",
Expand Down
Loading

0 comments on commit 8afadb6

Please sign in to comment.