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

test: config route with management fileds (E2E) #927

Closed
wants to merge 12 commits into from
Closed

test: config route with management fileds (E2E) #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b9b3013
test: config route with management fileds
idbeta Nov 30, 2020
734ff1c
update `MangerApiExpect` to `ManagerApiExpect`
idbeta Dec 1, 2020
827a559
update Compare time
idbeta Dec 1, 2020
ab34f4a
update compair create_time and upate_time
idbeta Dec 1, 2020
e2026b8
delete useless code
idbeta Dec 1, 2020
250bd8a
change `MangerApiExpect` to `ManagerApiExpect`
idbeta Dec 1, 2020
47fe987
add time.Sleep
idbeta Dec 1, 2020
6772a5a
fix: enhance case stability
idbeta Dec 1, 2020
37316f2
fix: enhance the stability of test cases
idbeta Dec 1, 2020
d8d3a73
chore: add access the route after delete it
idbeta Dec 1, 2020
0fe6a7f
fix: 1. change the file name, 2. add a test to make sure there is no …
idbeta Dec 1, 2020
25f5f62
chore: modify the funtion name
idbeta Dec 1, 2020
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
228 changes: 228 additions & 0 deletions api/test/e2e/route_with_management_fileds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package e2e

import (
"io/ioutil"
"net/http"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/tidwall/gjson"
)

func TestRoute_with_name_desc(t *testing.T) {
tests := []HttpTestCase{
{
caseDesc: "config route with name and desc (r1)",
Object: MangerApiExpect(t),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Body: `{
"uri": "/hello",
"name": "jack",
"desc": "config route with name and desc",
"upstream": {
"type": "roundrobin",
"nodes": [{
"host": "172.16.238.20",
"port": 1980,
"weight": 1
}]
}
}`,
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
},
{
caseDesc: "access the route's uri (r1)",
Object: APISIXExpect(t),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
ExpectBody: "hello world",
Sleep: sleepTime,
},
{
caseDesc: "verify the route's content (r1)",
Object: MangerApiExpect(t),
Path: "/apisix/admin/routes/r1",
Method: http.MethodGet,
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
ExpectBody: "\"name\":\"jack\",\"desc\":\"config route with name and desc\"",
Sleep: sleepTime,
},
}
for _, tc := range tests {
testCaseCheck(tc)
}

//get the route
time.Sleep(time.Duration(100) * time.Millisecond)
basepath := "http://127.0.0.1:8080/apisix/admin/routes"
request, _ := http.NewRequest("GET", basepath+"/r1", nil)
request.Header.Add("Authorization", token)
resp, err := http.DefaultClient.Do(request)
if err != nil {
return
}
defer resp.Body.Close()
respBody, _ := ioutil.ReadAll(resp.Body)
createtime := gjson.Get(string(respBody), "data.create_time")
updatetime := gjson.Get(string(respBody), "data.update_time")
assert.Equal(t, true, createtime.Int() >= time.Now().Unix()-1 && createtime.Int() <= time.Now().Unix()+1)
assert.Equal(t, true, updatetime.Int() >= time.Now().Unix()-1 && updatetime.Int() <= time.Now().Unix()+1)

tests = []HttpTestCase{
{
caseDesc: "update the route (r1)",
Object: MangerApiExpect(t),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Body: `{
"uri": "/hello",
"name": "new jack",
"desc": "new desc",
"upstream": {
"type": "roundrobin",
"nodes": [{
"host": "172.16.238.20",
"port": 1980,
"weight": 1
}]
}
}`,
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
Sleep: time.Duration(2) * time.Second,
},

{
caseDesc: "access the route's uri (r1)",
Object: APISIXExpect(t),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
ExpectBody: "hello world",
Sleep: sleepTime,
},
}

for _, tc := range tests {
testCaseCheck(tc)
}

//get the route (updated)
time.Sleep(time.Duration(100) * time.Millisecond)
request, _ = http.NewRequest("GET", basepath+"/r1", nil)
request.Header.Add("Authorization", token)
resp, _ = http.DefaultClient.Do(request)
respBody, _ = ioutil.ReadAll(resp.Body)
createtime2 := gjson.Get(string(respBody), "data.create_time")
updatetime2 := gjson.Get(string(respBody), "data.update_time")
//verify the route and compare result
assert.Equal(t, "new jack", gjson.Get(string(respBody), "data.name").String())
assert.Equal(t, "new desc", gjson.Get(string(respBody), "data.desc").String())
assert.Equal(t, createtime.String(), createtime2.String())
assert.NotEqual(t, updatetime.String(), updatetime2.String())

tests = []HttpTestCase{
{
caseDesc: "delete the route (r1)",
Object: MangerApiExpect(t),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
},
}

for _, tc := range tests {
testCaseCheck(tc)
}

tests = []HttpTestCase{
{
caseDesc: "config route with labels (r1)",
Object: MangerApiExpect(t),
Path: "/apisix/admin/routes/r1",
Method: http.MethodPut,
Body: `{
"uri": "/hello",
"labels": {
"build":"16",
"env":"production",
"version":"v2"
},
"upstream": {
"type": "roundrobin",
"nodes": [{
"host": "172.16.238.20",
"port": 1980,
"weight": 1
}]
}
}`,
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
},
{
caseDesc: "access the route's uri (r1)",
Object: APISIXExpect(t),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
ExpectBody: "hello world",
Sleep: sleepTime,
},
{
caseDesc: "verify the route's detail (r1)",
Object: MangerApiExpect(t),
Path: "/apisix/admin/routes/r1",
Method: http.MethodGet,
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
ExpectBody: "\"labels\":{\"build\":\"16\",\"env\":\"production\",\"version\":\"v2\"",
Sleep: sleepTime,
},
{
caseDesc: "delete the route (r1)",
Object: MangerApiExpect(t),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
},
{
caseDesc: "access the route after delete it",
Object: APISIXExpect(t),
Method: http.MethodGet,
Path: "/hello",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusNotFound,
Sleep: sleepTime,
},
}
for _, tc := range tests {
testCaseCheck(tc)
}
}
25 changes: 16 additions & 9 deletions api/test/e2e/route_with_methods_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,16 @@ import (

func TestRoute_with_methods(t *testing.T) {
tests := []HttpTestCase{
{
caseDesc: "delete route to make sure there is no route (r1)",
Object: ManagerApiExpect(t),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": token},
},
{
caseDesc: "add route with invalid method",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Body: `{
Expand Down Expand Up @@ -54,7 +61,7 @@ func TestRoute_with_methods(t *testing.T) {
},
{
caseDesc: "add route with valid method",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Body: `{
Expand Down Expand Up @@ -84,15 +91,15 @@ func TestRoute_with_methods(t *testing.T) {
},
{
caseDesc: "delete route",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
},
{
caseDesc: "add route with valid methods",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Body: `{
Expand Down Expand Up @@ -165,15 +172,15 @@ func TestRoute_with_methods(t *testing.T) {
},
{
caseDesc: "delete route",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": token},
ExpectStatus: http.StatusOK,
},
{
caseDesc: "add route with lower case methods",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Body: `{
Expand Down Expand Up @@ -202,7 +209,7 @@ func TestRoute_with_methods(t *testing.T) {
},
{
caseDesc: "add route with methods GET",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Body: `{
Expand Down Expand Up @@ -242,7 +249,7 @@ func TestRoute_with_methods(t *testing.T) {
},
{
caseDesc: "update route methods to POST",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodPut,
Path: "/apisix/admin/routes/r1",
Body: `{
Expand Down Expand Up @@ -282,7 +289,7 @@ func TestRoute_with_methods(t *testing.T) {
},
{
caseDesc: "delete route",
Object: MangerApiExpect(t),
Object: ManagerApiExpect(t),
Method: http.MethodDelete,
Path: "/apisix/admin/routes/r1",
Headers: map[string]string{"Authorization": token},
Expand Down