Skip to content

Commit 6936f9a

Browse files
tanaka0325tanaka0325
committed
Add test
1 parent ce745c4 commit 6936f9a

File tree

6 files changed

+90
-40
lines changed

6 files changed

+90
-40
lines changed

‎kadai2/tanaka0325/imgconv/cover.html

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<div id="nav">
5555
<select id="files">
5656

57-
<option value="file0">github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go (0.0%)</option>
57+
<option value="file0">github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go (33.3%)</option>
5858

59-
<option value="file1">github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go (0.0%)</option>
59+
<option value="file1">github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go (54.5%)</option>
6060

6161
<option value="file2">github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/imgconv.go (95.2%)</option>
6262

@@ -84,15 +84,12 @@
8484
Create(string) (io.WriteCloser, error)
8585
}
8686

87-
type File struct {
88-
Reader io.Reader
89-
Writer io.Writer
90-
}
87+
type File struct{}
9188

9289
func (File) Open(n string) (io.ReadCloser, error) <span class="cov0" title="0">{ return os.Open(n) }</span>
9390
func (File) Create(n string) (io.WriteCloser, error) <span class="cov0" title="0">{ return os.Create(n) }</span>
9491

95-
func NewFile() File <span class="cov0" title="0">{
92+
func NewFile() File <span class="cov8" title="1">{
9693
return File{}
9794
}</span>
9895
</pre>
@@ -133,14 +130,14 @@
133130

134131
func (PNG) Decode(r io.Reader) (image.Image, error) <span class="cov0" title="0">{ return png.Decode(r) }</span>
135132
func (PNG) Encode(w io.Writer, i image.Image) error <span class="cov0" title="0">{ return png.Encode(w, i) }</span>
136-
func (p *PNG) GetExt() string <span class="cov0" title="0">{ return p.Ext }</span>
133+
func (p *PNG) GetExt() string <span class="cov8" title="1">{ return p.Ext }</span>
137134

138135
// JPEG is type for jpeg format.
139136
type JPEG ImageFormat
140137

141138
func (JPEG) Decode(r io.Reader) (image.Image, error) <span class="cov0" title="0">{ return jpeg.Decode(r) }</span>
142139
func (JPEG) Encode(w io.Writer, i image.Image) error <span class="cov0" title="0">{ return jpeg.Encode(w, i, nil) }</span>
143-
func (j *JPEG) GetExt() string <span class="cov0" title="0">{ return j.Ext }</span>
140+
func (j *JPEG) GetExt() string <span class="cov8" title="1">{ return j.Ext }</span>
144141

145142
// GIF is type for gif format.
146143
type GIF ImageFormat
@@ -149,37 +146,37 @@
149146
func (GIF) Encode(w io.Writer, i image.Image) error <span class="cov0" title="0">{
150147
return gif.Encode(w, i, &amp;gif.Options{NumColors: 256})
151148
}</span>
152-
func (g *GIF) GetExt() string <span class="cov0" title="0">{ return g.Ext }</span>
149+
func (g *GIF) GetExt() string <span class="cov8" title="1">{ return g.Ext }</span>
153150

154151
// BMP is type for bmp format.
155152
type BMP ImageFormat
156153

157154
func (BMP) Decode(r io.Reader) (image.Image, error) <span class="cov0" title="0">{ return bmp.Decode(r) }</span>
158155
func (BMP) Encode(w io.Writer, i image.Image) error <span class="cov0" title="0">{ return bmp.Encode(w, i) }</span>
159-
func (b *BMP) GetExt() string <span class="cov0" title="0">{ return b.Ext }</span>
156+
func (b *BMP) GetExt() string <span class="cov8" title="1">{ return b.Ext }</span>
160157

161158
// TIFF is type for tiff format.
162159
type TIFF ImageFormat
163160

164161
func (TIFF) Decode(r io.Reader) (image.Image, error) <span class="cov0" title="0">{ return tiff.Decode(r) }</span>
165162
func (TIFF) Encode(w io.Writer, i image.Image) error <span class="cov0" title="0">{ return tiff.Encode(w, i, nil) }</span>
166-
func (t *TIFF) GetExt() string <span class="cov0" title="0">{ return t.Ext }</span>
163+
func (t *TIFF) GetExt() string <span class="cov8" title="1">{ return t.Ext }</span>
167164

168-
func NewImageFormat(ext string) ImageFormater <span class="cov0" title="0">{
165+
func NewImageFormat(ext string) ImageFormater <span class="cov8" title="1">{
169166
switch ext </span>{
170-
case "png":<span class="cov0" title="0">
167+
case "png":<span class="cov8" title="1">
171168
return &amp;PNG{Ext: "png"}</span>
172-
case "jpg", "jpeg":<span class="cov0" title="0">
169+
case "jpg", "jpeg":<span class="cov8" title="1">
173170
return &amp;JPEG{Ext: "jpeg"}</span>
174-
case "gif":<span class="cov0" title="0">
171+
case "gif":<span class="cov8" title="1">
175172
return &amp;GIF{Ext: "gif"}</span>
176-
case "bmp":<span class="cov0" title="0">
173+
case "bmp":<span class="cov8" title="1">
177174
return &amp;BMP{Ext: "bmp"}</span>
178-
case "tiff", "tif":<span class="cov0" title="0">
175+
case "tiff", "tif":<span class="cov8" title="1">
179176
return &amp;TIFF{Ext: "tiff"}</span>
180177
}
181178

182-
<span class="cov0" title="0">return nil</span>
179+
<span class="cov8" title="1">return nil</span>
183180
}
184181
</pre>
185182

‎kadai2/tanaka0325/imgconv/cover.out

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
mode: set
2-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go:18.54,18.75 1 0
3-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go:19.54,19.77 1 0
4-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go:21.21,23.2 1 0
2+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go:15.54,15.75 1 0
3+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go:16.54,16.77 1 0
4+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/file.go:18.21,20.2 1 1
55
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:35.53,35.77 1 0
66
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:36.53,36.80 1 0
7-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:37.53,37.69 1 0
7+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:37.53,37.69 1 1
88
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:42.54,42.79 1 0
99
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:43.54,43.87 1 0
10-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:44.54,44.70 1 0
10+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:44.54,44.70 1 1
1111
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:49.53,49.77 1 0
1212
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:50.53,52.2 1 0
13-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:53.31,53.47 1 0
13+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:53.31,53.47 1 1
1414
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:58.53,58.77 1 0
1515
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:59.53,59.80 1 0
16-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:60.53,60.69 1 0
16+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:60.53,60.69 1 1
1717
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:65.54,65.79 1 0
1818
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:66.54,66.87 1 0
19-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:67.54,67.70 1 0
20-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:69.47,70.13 1 0
21-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:83.2,83.12 1 0
22-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:71.13,72.26 1 0
23-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:73.21,74.28 1 0
24-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:75.13,76.26 1 0
25-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:77.13,78.26 1 0
26-
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:79.21,80.28 1 0
19+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:67.54,67.70 1 1
20+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:69.47,70.13 1 1
21+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:83.2,83.12 1 1
22+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:71.13,72.26 1 1
23+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:73.21,74.28 1 1
24+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:75.13,76.26 1 1
25+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:77.13,78.26 1 1
26+
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/format.go:79.21,80.28 1 1
2727
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/imgconv.go:15.42,17.16 2 1
2828
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/imgconv.go:20.2,24.16 4 1
2929
github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv/imgconv.go:27.2,27.15 1 1

‎kadai2/tanaka0325/imgconv/file.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ type FileHandler interface {
1010
Create(string) (io.WriteCloser, error)
1111
}
1212

13-
type File struct {
14-
Reader io.Reader
15-
Writer io.Writer
16-
}
13+
type File struct{}
1714

1815
func (File) Open(n string) (io.ReadCloser, error) { return os.Open(n) }
1916
func (File) Create(n string) (io.WriteCloser, error) { return os.Create(n) }

‎kadai2/tanaka0325/imgconv/file_test.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package imgconv_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv"
7+
)
8+
9+
func TestImgconvNewFile(t *testing.T) {
10+
var f interface{}
11+
f = imgconv.NewFile()
12+
13+
got, ok := f.(imgconv.File)
14+
if !ok {
15+
t.Errorf("expect type: File, but got %T", got)
16+
}
17+
}

‎kadai2/tanaka0325/imgconv/format_test.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package imgconv_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv"
7+
)
8+
9+
func TestImgconvNewImageFormat(t *testing.T) {
10+
tests := []struct {
11+
args string
12+
expect string
13+
}{
14+
{args: "png", expect: "png"},
15+
{args: "jpg", expect: "jpeg"},
16+
{args: "jpeg", expect: "jpeg"},
17+
{args: "gif", expect: "gif"},
18+
{args: "bmp", expect: "bmp"},
19+
{args: "tiff", expect: "tiff"},
20+
{args: "tif", expect: "tiff"},
21+
}
22+
23+
for _, tt := range tests {
24+
t.Run(tt.args, func(t *testing.T) {
25+
f := imgconv.NewImageFormat(tt.args)
26+
got := f.GetExt()
27+
if got != tt.expect {
28+
t.Errorf("expect = %+v, but got = %+v", tt.expect, got)
29+
}
30+
})
31+
}
32+
33+
t.Run("unexpected args", func(t *testing.T) {
34+
got := imgconv.NewImageFormat("pdf")
35+
if got != nil {
36+
t.Errorf("expect = nil, but got = %+v", got)
37+
}
38+
})
39+
}

‎kadai2/tanaka0325/imgconv/imgconv_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv"
1111
)
1212

13-
func TestImgConvDo(t *testing.T) {
13+
func TestImgconvDo(t *testing.T) {
1414
tests := []struct {
1515
name string
1616
args imgconv.ConvertParam
@@ -129,7 +129,7 @@ func TestImgConvDo(t *testing.T) {
129129
}
130130
}
131131

132-
func TestImgConv_convert(t *testing.T) {
132+
func TestImgconv_convert(t *testing.T) {
133133
type args struct {
134134
Reader io.Reader
135135
Decoder imgconv.Decoder

0 commit comments

Comments
 (0)