diff options
| author |   Kiran Kamineni <kiran.k.kamineni@intel.com> | 2019-04-04 09:54:59 -0700 |
|---|---|---|
| committer | Kiran Kamineni <kiran.k.kamineni@intel.com> | 2019-04-04 09:55:04 -0700 |
| commit | 99928f9cef81b627c2b22fcf6d7c0ca7ebe2cb0e (patch) | |
| tree | dc8d044f8bd37faf381093918944ad191e9f0602 /src/k8splugin/api/defhandler_test.go | |
| parent | 9906b9777553cd076812f9b8944d64b6e050d09e (diff) | |
Use common code for executeRequest
Use the common executeRequest function instead
of multiple copies of the same lines for test requests
Issue-ID: MULTICLOUD-557
Change-Id: Icde498b55592333af265fc348f3a286a59b9b61c
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
Diffstat (limited to 'src/k8splugin/api/defhandler_test.go')
| -rw-r--r-- | src/k8splugin/api/defhandler_test.go | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/k8splugin/api/defhandler_test.go b/src/k8splugin/api/defhandler_test.go index 0015d070..28bf1479 100644 --- a/src/k8splugin/api/defhandler_test.go +++ b/src/k8splugin/api/defhandler_test.go @@ -138,9 +138,7 @@ func TestRBDefCreateHandler(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("POST", "/v1/rb/definition", testCase.reader) - recorder := httptest.NewRecorder() - NewRouter("", testCase.rbDefClient, nil).ServeHTTP(recorder, request) - resp := recorder.Result() + resp := executeRequest(request, NewRouter(testCase.rbDefClient, nil, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { @@ -209,9 +207,7 @@ func TestRBDefListVersionsHandler(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("GET", "/v1/rb/definition/testresourcebundle", nil) - recorder := httptest.NewRecorder() - NewRouter("", testCase.rbDefClient, nil).ServeHTTP(recorder, request) - resp := recorder.Result() + resp := executeRequest(request, NewRouter(testCase.rbDefClient, nil, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { @@ -291,9 +287,7 @@ func TestRBDefGetHandler(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("GET", "/v1/rb/definition/"+testCase.name+"/"+testCase.version, nil) - recorder := httptest.NewRecorder() - NewRouter("", testCase.rbDefClient, nil).ServeHTTP(recorder, request) - resp := recorder.Result() + resp := executeRequest(request, NewRouter(testCase.rbDefClient, nil, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { @@ -344,9 +338,7 @@ func TestRBDefDeleteHandler(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("DELETE", "/v1/rb/definition/"+testCase.name+"/"+testCase.version, nil) - recorder := httptest.NewRecorder() - NewRouter("", testCase.rbDefClient, nil).ServeHTTP(recorder, request) - resp := recorder.Result() + resp := executeRequest(request, NewRouter(testCase.rbDefClient, nil, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { @@ -403,9 +395,7 @@ func TestRBDefUploadHandler(t *testing.T) { t.Run(testCase.label, func(t *testing.T) { request := httptest.NewRequest("POST", "/v1/rb/definition/"+testCase.name+"/"+testCase.version+"/content", testCase.body) - recorder := httptest.NewRecorder() - NewRouter("", testCase.rbDefClient, nil).ServeHTTP(recorder, request) - resp := recorder.Result() + resp := executeRequest(request, NewRouter(testCase.rbDefClient, nil, nil)) //Check returned code if resp.StatusCode != testCase.expectedCode { |