mirror/gswagger
1
0
Fork 0
mirror of https://github.com/davidebianchi/gswagger.git synced 2025-12-23 23:38:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove use of the deprecated io/ioutil lib

Browse Source
This commit is contained in:
Davide Bianchi
2022-11-17 09:29:43 +01:00
parent 047317ef17
commit e5f3c438b4
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -13,7 +13,6 @@ all: test
.PHONY: test .PHONY: test
test: test:
go test ./... -coverprofile coverage.out go test ./... -coverprofile coverage.out
$(MAKE) clean
.PHONY: version .PHONY: version
version: version:

3
integration_test.go
View File

@@ -3,7 +3,6 @@ package swagger_test
import ( import (
"context" "context"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"testing" "testing"
@@ -171,7 +170,7 @@ func TestIntegration(t *testing.T) {
func readBody(t *testing.T, requestBody io.ReadCloser) string { func readBody(t *testing.T, requestBody io.ReadCloser) string {
t.Helper() t.Helper()
body, err := ioutil.ReadAll(requestBody) body, err := io.ReadAll(requestBody)
require.NoError(t, err) require.NoError(t, err)
return string(body) return string(body)

16
main_test.go
View File

@@ -4,9 +4,9 @@ import (
"context" "context"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"strings" "strings"
"testing" "testing"
@@ -229,7 +229,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) {
require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json")) require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json"))
body := readBody(t, w.Result().Body) body := readBody(t, w.Result().Body)
actual, err := ioutil.ReadFile("testdata/users_employees.json") actual, err := os.ReadFile("testdata/users_employees.json")
require.NoError(t, err) require.NoError(t, err)
require.JSONEq(t, string(actual), body) require.JSONEq(t, string(actual), body)
}) })
@@ -257,7 +257,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) {
require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json")) require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json"))
body := readBody(t, w.Result().Body) body := readBody(t, w.Result().Body)
actual, err := ioutil.ReadFile("testdata/users_employees.json") actual, err := os.ReadFile("testdata/users_employees.json")
require.NoError(t, err) require.NoError(t, err)
require.JSONEq(t, string(actual), body) require.JSONEq(t, string(actual), body)
}) })
@@ -284,7 +284,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) {
require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "text/plain")) require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "text/plain"))
body := readBody(t, w.Result().Body) body := readBody(t, w.Result().Body)
expected, err := ioutil.ReadFile("testdata/users_employees.yaml") expected, err := os.ReadFile("testdata/users_employees.yaml")
require.NoError(t, err) require.NoError(t, err)
require.YAMLEq(t, string(expected), body, string(body)) require.YAMLEq(t, string(expected), body, string(body))
}) })
@@ -312,7 +312,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) {
require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "text/plain")) require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "text/plain"))
body := readBody(t, w.Result().Body) body := readBody(t, w.Result().Body)
expected, err := ioutil.ReadFile("testdata/users_employees.yaml") expected, err := os.ReadFile("testdata/users_employees.yaml")
require.NoError(t, err) require.NoError(t, err)
require.YAMLEq(t, string(expected), body, string(body)) require.YAMLEq(t, string(expected), body, string(body))
}) })
@@ -367,7 +367,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) {
require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json")) require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json"))
body := readBody(t, w.Result().Body) body := readBody(t, w.Result().Body)
actual, err := ioutil.ReadFile("testdata/subrouter.json") actual, err := os.ReadFile("testdata/subrouter.json")
require.NoError(t, err) require.NoError(t, err)
require.JSONEq(t, string(actual), body) require.JSONEq(t, string(actual), body)
}) })
@@ -403,7 +403,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) {
require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json")) require.True(t, strings.Contains(w.Result().Header.Get("content-type"), "application/json"))
body := readBody(t, w.Result().Body) body := readBody(t, w.Result().Body)
actual, err := ioutil.ReadFile("testdata/router_with_prefix.json") actual, err := os.ReadFile("testdata/router_with_prefix.json")
require.NoError(t, err) require.NoError(t, err)
require.JSONEq(t, string(actual), body) require.JSONEq(t, string(actual), body)
}) })
@@ -412,7 +412,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) {
func readBody(t *testing.T, requestBody io.ReadCloser) string { func readBody(t *testing.T, requestBody io.ReadCloser) string {
t.Helper() t.Helper()
body, err := ioutil.ReadAll(requestBody) body, err := io.ReadAll(requestBody)
require.NoError(t, err) require.NoError(t, err)
return string(body) return string(body)

4
route_test.go
View File

@@ -3,9 +3,9 @@ package swagger
import ( import (
"context" "context"
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"testing" "testing"
"github.com/davidebianchi/gswagger/apirouter" "github.com/davidebianchi/gswagger/apirouter"
@@ -477,7 +477,7 @@ func TestAddRoutes(t *testing.T) {
require.Equal(t, http.StatusOK, w.Result().StatusCode) require.Equal(t, http.StatusOK, w.Result().StatusCode)
body := readBody(t, w.Result().Body) body := readBody(t, w.Result().Body)
expected, err := ioutil.ReadFile(test.fixturesPath) expected, err := os.ReadFile(test.fixturesPath)
require.NoError(t, err) require.NoError(t, err)
require.JSONEq(t, string(expected), body, "actual json data: %s", body) require.JSONEq(t, string(expected), body, "actual json data: %s", body)
}) })