localhost_frssoft/compy
1
0
Fork 0
mirror of https://git.phreedom.club/localhost_frssoft/compy.git synced 2024-11-27 02:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add unit tests for PNG and WebP

Browse source 
Also correct Content-Type when transcoding WebP.
This commit is contained in:
Andrew Gaul 2017-01-19 11:19:30 -08:00
parent 389077e0fa
commit 49bceae2df
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
compy_test.go
View file

@ -5,6 +5,7 @@ import (
gzipp "compress/gzip" gzipp "compress/gzip"
jpegp "image/jpeg" jpegp "image/jpeg"
pngp "image/png"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@ -35,6 +36,7 @@ func (s *CompyTest) SetUpSuite(c *C) {
s.proxy = proxy.New() s.proxy = proxy.New()
s.proxy.AddTranscoder("image/jpeg", tc.NewJpeg(50)) s.proxy.AddTranscoder("image/jpeg", tc.NewJpeg(50))
s.proxy.AddTranscoder("image/png", &tc.Png{})
s.proxy.AddTranscoder("text/html", &tc.Zip{&tc.Identity{}, *brotli, *gzip, true}) s.proxy.AddTranscoder("text/html", &tc.Zip{&tc.Identity{}, *brotli, *gzip, true})
go func() { go func() {
err := s.proxy.Start(*host) err := s.proxy.Start(*host)
@ -123,7 +125,7 @@ func (s *CompyTest) TestJpeg(c *C) {
c.Assert(err, IsNil) c.Assert(err, IsNil)
} }
func (s *CompyTest) TestWebP(c *C) { func (s *CompyTest) TestJpegToWebP(c *C) {
req, err := http.NewRequest("GET", s.server.URL+"/image/jpeg", nil) req, err := http.NewRequest("GET", s.server.URL+"/image/jpeg", nil)
c.Assert(err, IsNil) c.Assert(err, IsNil)
req.Header.Add("Accept", "image/webp,image/jpeg") req.Header.Add("Accept", "image/webp,image/jpeg")
@ -137,3 +139,31 @@ func (s *CompyTest) TestWebP(c *C) {
_, err = webp.Decode(resp.Body) _, err = webp.Decode(resp.Body)
c.Assert(err, IsNil) c.Assert(err, IsNil)
} }
func (s *CompyTest) TestPng(c *C) {
req, err := http.NewRequest("GET", s.server.URL+"/image/png", nil)
c.Assert(err, IsNil)
resp, err := s.client.Do(req)
c.Assert(err, IsNil)
defer resp.Body.Close()
c.Assert(resp.StatusCode, Equals, 200)
c.Assert(resp.Header.Get("Content-Type"), Equals, "image/png")
_, err = pngp.Decode(resp.Body)
c.Assert(err, IsNil)
}
func (s *CompyTest) TestPngToWebP(c *C) {
req, err := http.NewRequest("GET", s.server.URL+"/image/png", nil)
c.Assert(err, IsNil)
req.Header.Add("Accept", "image/webp")
resp, err := s.client.Do(req)
c.Assert(err, IsNil)
defer resp.Body.Close()
c.Assert(resp.StatusCode, Equals, 200)
c.Assert(resp.Header.Get("Content-Type"), Equals, "image/webp")
_, err = webp.Decode(resp.Body)
c.Assert(err, IsNil)
}

1
transcoder/png.go
View file

@ -16,6 +16,7 @@ func (t *Png) Transcode(w *proxy.ResponseWriter, r *proxy.ResponseReader, header
} }
if SupportsWebP(headers) { if SupportsWebP(headers) {
w.Header().Set("Content-Type", "image/webp")
options := webp.Options{ options := webp.Options{
Lossless: true, Lossless: true,
} }