Skip to content

Commit 40e5ee4

Browse files
author
deiu
committed
Uncommented test for raw file; removed debugging
1 parent 4b78bca commit 40e5ee4

File tree

2 files changed

+33
-40
lines changed

2 files changed

+33
-40
lines changed

pathinfo.go

-7
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,10 @@ func (req *httpRequest) pathInfo(path string) (*pathInfo, error) {
103103
} else {
104104
res.FileType, res.Extension, res.MaybeRDF = MimeLookup(res.File)
105105
if len(res.FileType) == 0 {
106-
req.Server.debug.Println("Finding mime for", res.File)
107106
res.FileType, err = GuessMimeType(res.File)
108107
if err != nil {
109108
req.Server.debug.Println(err)
110109
}
111-
112-
// Old
113-
// res.FileType, err = magic.TypeByFile(res.File)
114-
// if err != nil {
115-
// req.Server.debug.Println(err)
116-
// }
117110
}
118111
}
119112
}

server_test.go

+33-33
Original file line numberDiff line numberDiff line change
@@ -1219,39 +1219,39 @@ func TestInvalidContent(t *testing.T) {
12191219
assert.Equal(t, 415, response.StatusCode)
12201220
}
12211221

1222-
// func TestRawContent(t *testing.T) {
1223-
// path := "./tests/img.jpg"
1224-
// file, err := os.Open(path)
1225-
// defer file.Close()
1226-
// assert.NoError(t, err)
1227-
// stat, err := os.Stat(path)
1228-
// data := make([]byte, stat.Size())
1229-
// _, err = file.Read(data)
1230-
// assert.NoError(t, err)
1231-
1232-
// request, err := http.NewRequest("PUT", testServer.URL+"/test.raw", strings.NewReader(string(data)))
1233-
// assert.NoError(t, err)
1234-
// request.Header.Add("Content-Type", "image/jpeg")
1235-
// response, err := httpClient.Do(request)
1236-
// assert.NoError(t, err)
1237-
// assert.Equal(t, 201, response.StatusCode)
1238-
1239-
// request, err = http.NewRequest("GET", testServer.URL+"/test.raw", nil)
1240-
// assert.NoError(t, err)
1241-
// response, err = httpClient.Do(request)
1242-
// assert.NoError(t, err)
1243-
// assert.Equal(t, 200, response.StatusCode)
1244-
// assert.Equal(t, "image/jpeg", response.Header.Get(HCType))
1245-
// body, err := ioutil.ReadAll(response.Body)
1246-
// response.Body.Close()
1247-
// assert.Equal(t, stat.Size(), int64(len(string(body))))
1248-
1249-
// request, err = http.NewRequest("DELETE", testServer.URL+"/test.raw", nil)
1250-
// assert.NoError(t, err)
1251-
// response, err = httpClient.Do(request)
1252-
// assert.NoError(t, err)
1253-
// assert.Equal(t, 200, response.StatusCode)
1254-
// }
1222+
func TestRawContent(t *testing.T) {
1223+
path := "./tests/img.jpg"
1224+
file, err := os.Open(path)
1225+
defer file.Close()
1226+
assert.NoError(t, err)
1227+
stat, err := os.Stat(path)
1228+
data := make([]byte, stat.Size())
1229+
_, err = file.Read(data)
1230+
assert.NoError(t, err)
1231+
1232+
request, err := http.NewRequest("PUT", testServer.URL+"/test.raw", strings.NewReader(string(data)))
1233+
assert.NoError(t, err)
1234+
request.Header.Add("Content-Type", "image/jpeg")
1235+
response, err := httpClient.Do(request)
1236+
assert.NoError(t, err)
1237+
assert.Equal(t, 201, response.StatusCode)
1238+
1239+
request, err = http.NewRequest("GET", testServer.URL+"/test.raw", nil)
1240+
assert.NoError(t, err)
1241+
response, err = httpClient.Do(request)
1242+
assert.NoError(t, err)
1243+
assert.Equal(t, 200, response.StatusCode)
1244+
assert.Equal(t, "image/jpeg", response.Header.Get(HCType))
1245+
body, err := ioutil.ReadAll(response.Body)
1246+
response.Body.Close()
1247+
assert.Equal(t, stat.Size(), int64(len(string(body))))
1248+
1249+
request, err = http.NewRequest("DELETE", testServer.URL+"/test.raw", nil)
1250+
assert.NoError(t, err)
1251+
response, err = httpClient.Do(request)
1252+
assert.NoError(t, err)
1253+
assert.Equal(t, 200, response.StatusCode)
1254+
}
12551255

12561256
func BenchmarkPUT(b *testing.B) {
12571257
e := 0

0 commit comments

Comments
 (0)