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

Fixes test failures in Windows #143

Merged
merged 3 commits into from
Apr 17, 2018
Merged

Fixes test failures in Windows #143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7c580c
Fixes test failures in Windows
moorereason Apr 17, 2018
f36e96a
Removed fmt.println
jeevatkm Apr 17, 2018
3b8cf3c
remove fmt
jeevatkm Apr 17, 2018
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
7 changes: 4 additions & 3 deletions client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"io/ioutil"
"net/http"
"net/url"
"path/filepath"
"reflect"
"strconv"
"strings"
Expand Down Expand Up @@ -161,7 +162,7 @@ func TestClientSetCertificates(t *testing.T) {

func TestClientSetRootCertificate(t *testing.T) {
DefaultClient = dc()
SetRootCertificate(getTestDataPath() + "/sample-root.pem")
SetRootCertificate(filepath.Join(getTestDataPath(), "sample-root.pem"))

transport, err := DefaultClient.getTransport()

Expand All @@ -171,7 +172,7 @@ func TestClientSetRootCertificate(t *testing.T) {

func TestClientSetRootCertificateNotExists(t *testing.T) {
DefaultClient = dc()
SetRootCertificate(getTestDataPath() + "/not-exists-sample-root.pem")
SetRootCertificate(filepath.Join(getTestDataPath(), "not-exists-sample-root.pem"))

transport, err := DefaultClient.getTransport()

Expand Down Expand Up @@ -400,7 +401,7 @@ func TestClientRoundTripper(t *testing.T) {
c.SetProxy("http://localhost:9090")
c.RemoveProxy()
c.SetCertificates(tls.Certificate{})
c.SetRootCertificate(getTestDataPath() + "/sample-root.pem")
c.SetRootCertificate(filepath.Join(getTestDataPath(), "sample-root.pem"))
}

func TestClientNewRequest(t *testing.T) {
Expand Down
42 changes: 24 additions & 18 deletions request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ package resty
import (
"bytes"
"crypto/tls"
"fmt"
"io"
"io/ioutil"
"net"
"net/http"
"net/url"
"os"
"path/filepath"
"strconv"
"strings"
"testing"
Expand Down Expand Up @@ -540,7 +543,7 @@ func TestMultiPartUploadFile(t *testing.T) {
c.SetFormData(map[string]string{"zip_code": "00001", "city": "Los Angeles"})

resp, err := c.R().
SetFile("profile_img", basePath+"/test-img.png").
SetFile("profile_img", filepath.Join(basePath, "test-img.png")).
SetContentLength(true).
Post(ts.URL + "/upload")

Expand All @@ -559,7 +562,7 @@ func TestMultiPartUploadFileError(t *testing.T) {
c.SetFormData(map[string]string{"zip_code": "00001", "city": "Los Angeles"})

resp, err := c.R().
SetFile("profile_img", basePath+"/test-img-not-exists.png").
SetFile("profile_img", filepath.Join(basePath, "test-img-not-exists.png")).
Post(ts.URL + "/upload")

if err == nil {
Expand All @@ -579,7 +582,7 @@ func TestMultiPartUploadFiles(t *testing.T) {

resp, err := dclr().
SetFormData(map[string]string{"first_name": "Jeevanandam", "last_name": "M"}).
SetFiles(map[string]string{"profile_img": basePath + "/test-img.png", "notes": basePath + "/text-file.txt"}).
SetFiles(map[string]string{"profile_img": filepath.Join(basePath, "test-img.png"), "notes": filepath.Join(basePath, "text-file.txt")}).
Post(ts.URL + "/upload")

responseStr := resp.String()
Expand All @@ -596,8 +599,8 @@ func TestMultiPartIoReaderFiles(t *testing.T) {
defer cleanupFiles("test-data/upload")

basePath := getTestDataPath()
profileImgBytes, _ := ioutil.ReadFile(basePath + "/test-img.png")
notesBytes, _ := ioutil.ReadFile(basePath + "/text-file.txt")
profileImgBytes, _ := ioutil.ReadFile(filepath.Join(basePath, "test-img.png"))
notesBytes, _ := ioutil.ReadFile(filepath.Join(basePath, "text-file.txt"))

// Just info values
file := File{
Expand Down Expand Up @@ -629,13 +632,13 @@ func TestMultiPartUploadFileNotOnGetOrDelete(t *testing.T) {
basePath := getTestDataPath()

_, err := dclr().
SetFile("profile_img", basePath+"/test-img.png").
SetFile("profile_img", filepath.Join(basePath, "test-img.png")).
Get(ts.URL + "/upload")

assertEqual(t, "multipart content is not allowed in HTTP verb [GET]", err.Error())

_, err = dclr().
SetFile("profile_img", basePath+"/test-img.png").
SetFile("profile_img", filepath.Join(basePath, "test-img.png")).
Delete(ts.URL + "/upload")

assertEqual(t, "multipart content is not allowed in HTTP verb [DELETE]", err.Error())
Expand Down Expand Up @@ -872,8 +875,10 @@ func TestRawFileUploadByBody(t *testing.T) {
ts := createFormPostServer(t)
defer ts.Close()

file, _ := os.Open(getTestDataPath() + "/test-img.png")
fileBytes, _ := ioutil.ReadAll(file)
file, err := os.Open(filepath.Join(getTestDataPath(), "test-img.png"))
assertNil(t, err)
fileBytes, err := ioutil.ReadAll(file)
assertNil(t, err)

resp, err := dclr().
SetBody(fileBytes).
Expand Down Expand Up @@ -1102,7 +1107,7 @@ func TestOutputFileWithBaseDirAndRelativePath(t *testing.T) {

DefaultClient = dc()
SetRedirectPolicy(FlexibleRedirectPolicy(10))
SetOutputDirectory(getTestDataPath() + "/dir-sample")
SetOutputDirectory(filepath.Join(getTestDataPath(), "dir-sample"))
SetDebug(true)

resp, err := R().
Expand All @@ -1115,19 +1120,19 @@ func TestOutputFileWithBaseDirAndRelativePath(t *testing.T) {

func TestOutputFileWithBaseDirError(t *testing.T) {
c := dc().SetRedirectPolicy(FlexibleRedirectPolicy(10)).
SetOutputDirectory(getTestDataPath() + `/go-resty\0`)
SetOutputDirectory(filepath.Join(getTestDataPath(), `go-resty\0`))

_ = c
}

func TestOutputPathDirNotExists(t *testing.T) {
ts := createGetServer(t)
defer ts.Close()
defer cleanupFiles("test-data/not-exists-dir")
defer cleanupFiles(filepath.Join("test-data", "not-exists-dir"))

DefaultClient = dc()
SetRedirectPolicy(FlexibleRedirectPolicy(10))
SetOutputDirectory(getTestDataPath() + "/not-exists-dir")
SetOutputDirectory(filepath.Join(getTestDataPath(), "not-exists-dir"))

resp, err := R().
SetOutput("test-img-success.png").
Expand All @@ -1140,10 +1145,10 @@ func TestOutputPathDirNotExists(t *testing.T) {
func TestOutputFileAbsPath(t *testing.T) {
ts := createGetServer(t)
defer ts.Close()
defer cleanupFiles("test-data/go-resty")
defer cleanupFiles(filepath.Join("test-data", "go-resty"))

_, err := dcr().
SetOutput(getTestDataPath() + "/go-resty/test-img-success-2.png").
SetOutput(filepath.Join(getTestDataPath(), "go-resty", "test-img-success-2.png")).
Get(ts.URL + "/my-image.png")

assertError(t, err)
Expand Down Expand Up @@ -1192,7 +1197,8 @@ func TestSRVInvalidService(t *testing.T) {
Get("/")

assertNotNil(t, err)
assertEqual(t, true, strings.Contains(err.Error(), "no such host"))
assertType(t, net.DNSError{}, err)
fmt.Printf("%#v\n", err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@moorereason Could you please remove this line?

}

func TestDeprecatedCodeCoverage(t *testing.T) {
Expand Down Expand Up @@ -1346,7 +1352,7 @@ func TestRequestFileUploadAsReader(t *testing.T) {
ts := createFilePostServer(t)
defer ts.Close()

file, _ := os.Open(getTestDataPath() + "/test-img.png")
file, _ := os.Open(filepath.Join(getTestDataPath(), "test-img.png"))
defer file.Close()

resp, err := dclr().
Expand All @@ -1358,7 +1364,7 @@ func TestRequestFileUploadAsReader(t *testing.T) {
assertEqual(t, http.StatusOK, resp.StatusCode())
assertEqual(t, true, strings.Contains(resp.String(), "File Uploaded successfully"))

file, _ = os.Open(getTestDataPath() + "/test-img.png")
file, _ = os.Open(filepath.Join(getTestDataPath(), "test-img.png"))
defer file.Close()

resp, err = dclr().
Expand Down
14 changes: 10 additions & 4 deletions resty_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

func getTestDataPath() string {
pwd, _ := os.Getwd()
return pwd + "/test-data"
return filepath.Join(pwd, "test-data")
}

func createGetServer(t *testing.T) *httptest.Server {
Expand Down Expand Up @@ -88,7 +88,7 @@ func createGetServer(t *testing.T) *httptest.Server {
time.Sleep(time.Second * 6)
_, _ = w.Write([]byte("TestClientTimeout page"))
case "/my-image.png":
fileBytes, _ := ioutil.ReadFile(getTestDataPath() + "/test-img.png")
fileBytes, _ := ioutil.ReadFile(filepath.Join(getTestDataPath(), "test-img.png"))
w.Header().Set("Content-Type", "image/png")
w.Header().Set("Content-Length", strconv.Itoa(len(fileBytes)))
_, _ = w.Write(fileBytes)
Expand Down Expand Up @@ -294,7 +294,7 @@ func createFormPostServer(t *testing.T) *httptest.Server {
t.Logf("FirstName: %v", r.FormValue("first_name"))
t.Logf("LastName: %v", r.FormValue("last_name"))

targetPath := getTestDataPath() + "/upload"
targetPath := filepath.Join(getTestDataPath(), "upload")
_ = os.MkdirAll(targetPath, 0700)

for _, fhdrs := range r.MultipartForm.File {
Expand All @@ -307,7 +307,7 @@ func createFormPostServer(t *testing.T) *httptest.Server {
t.Logf("Write name: %v", fname)

infile, _ := hdr.Open()
f, err := os.OpenFile(targetPath+"/"+fname, os.O_WRONLY|os.O_CREATE, 0666)
f, err := os.OpenFile(filepath.Join(targetPath, fname), os.O_WRONLY|os.O_CREATE, 0666)
if err != nil {
t.Logf("Error: %v", err)
return
Expand Down Expand Up @@ -537,6 +537,12 @@ func assertNotNil(t *testing.T, v interface{}) {
}
}

func assertType(t *testing.T, typ, v interface{}) {
if reflect.DeepEqual(reflect.TypeOf(typ), reflect.TypeOf(v)) {
t.Errorf("Expected type %t, got %t", typ, v)
}
}

func assertError(t *testing.T, err error) {
if err != nil {
t.Errorf("Error occurred [%v]", err)
Expand Down