Skip to content

Commit 683a57a

Browse files
tanaka0325tanaka0325
committed
rename
1 parent d543de4 commit 683a57a

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

‎kadai2/tanaka0325/imgconv/cmd/imgconv/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ func main() {
7575
param := imgconv.ConvertParam{
7676
Path: path,
7777
FileHandler: imgconv.NewFile(),
78-
BeforeFormat: imgconv.NewImageFormat(from),
79-
AfterFormat: imgconv.NewImageFormat(to),
78+
BeforeFormat: imgconv.NewImage(from),
79+
AfterFormat: imgconv.NewImage(to),
8080
}
8181

8282
if !dryRun {

‎kadai2/tanaka0325/imgconv/format.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@ type Encoder interface {
1919
Encode(io.Writer, image.Image) error
2020
}
2121

22-
type ImageFormater interface {
22+
type ImageConverter interface {
2323
Decoder
2424
Encoder
2525
GetExt() string
2626
}
2727

28-
type ImageFormat struct {
28+
type Image struct {
2929
Ext string
3030
}
3131

3232
// ImagePng is type for png format.
33-
type PNG ImageFormat
33+
type PNG Image
3434

3535
func (PNG) Decode(r io.Reader) (image.Image, error) { return png.Decode(r) }
3636
func (PNG) Encode(w io.Writer, i image.Image) error { return png.Encode(w, i) }
3737
func (p *PNG) GetExt() string { return p.Ext }
3838

3939
// JPEG is type for jpeg format.
40-
type JPEG ImageFormat
40+
type JPEG Image
4141

4242
func (JPEG) Decode(r io.Reader) (image.Image, error) { return jpeg.Decode(r) }
4343
func (JPEG) Encode(w io.Writer, i image.Image) error { return jpeg.Encode(w, i, nil) }
4444
func (j *JPEG) GetExt() string { return j.Ext }
4545

4646
// GIF is type for gif format.
47-
type GIF ImageFormat
47+
type GIF Image
4848

4949
func (GIF) Decode(r io.Reader) (image.Image, error) { return gif.Decode(r) }
5050
func (GIF) Encode(w io.Writer, i image.Image) error {
@@ -53,20 +53,20 @@ func (GIF) Encode(w io.Writer, i image.Image) error {
5353
func (g *GIF) GetExt() string { return g.Ext }
5454

5555
// BMP is type for bmp format.
56-
type BMP ImageFormat
56+
type BMP Image
5757

5858
func (BMP) Decode(r io.Reader) (image.Image, error) { return bmp.Decode(r) }
5959
func (BMP) Encode(w io.Writer, i image.Image) error { return bmp.Encode(w, i) }
6060
func (b *BMP) GetExt() string { return b.Ext }
6161

6262
// TIFF is type for tiff format.
63-
type TIFF ImageFormat
63+
type TIFF Image
6464

6565
func (TIFF) Decode(r io.Reader) (image.Image, error) { return tiff.Decode(r) }
6666
func (TIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
6767
func (t *TIFF) GetExt() string { return t.Ext }
6868

69-
func NewImageFormat(ext string) ImageFormater {
69+
func NewImage(ext string) ImageConverter {
7070
switch ext {
7171
case "png":
7272
return &PNG{Ext: ext}

‎kadai2/tanaka0325/imgconv/format_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv"
77
)
88

9-
func TestImgconvNewImageFormat(t *testing.T) {
9+
func TestImgconvNewImage(t *testing.T) {
1010
tests := []struct {
1111
args string
1212
expected string
@@ -22,7 +22,7 @@ func TestImgconvNewImageFormat(t *testing.T) {
2222

2323
for _, tt := range tests {
2424
t.Run(tt.args, func(t *testing.T) {
25-
f := imgconv.NewImageFormat(tt.args)
25+
f := imgconv.NewImage(tt.args)
2626
got := f.GetExt()
2727
if got != tt.expected {
2828
t.Errorf("expected = %+v, but got = %+v", tt.expected, got)
@@ -31,7 +31,7 @@ func TestImgconvNewImageFormat(t *testing.T) {
3131
}
3232

3333
t.Run("expected args", func(t *testing.T) {
34-
got := imgconv.NewImageFormat("pdf")
34+
got := imgconv.NewImage("pdf")
3535
if got != nil {
3636
t.Errorf("expected = nil, but got = %+v", got)
3737
}

‎kadai2/tanaka0325/imgconv/imgconv.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import "io"
77
type ConvertParam struct {
88
Path string
99
FileHandler FileHandler
10-
BeforeFormat ImageFormater
11-
AfterFormat ImageFormater
10+
BeforeFormat ImageConverter
11+
AfterFormat ImageConverter
1212
}
1313

1414
// Do is func to convert image format.

‎kadai2/tanaka0325/imgconv/imgconv_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ func TestImgconvDo(t *testing.T) {
3939
func(s string) (io.WriteCloser, error) { return nil, fmt.Errorf("err") },
4040
)
4141

42-
mbi := newMockImageFormat(
43-
func(r io.Reader) (image.Image, error) { return mockImage{}, nil },
42+
mbi := newMockImage(
43+
func(r io.Reader) (image.Image, error) { return mockStdImage{}, nil },
4444
nil,
4545
func() string { return "jpeg" },
4646
)
4747

48-
mai := newMockImageFormat(
48+
mai := newMockImage(
4949
nil,
5050
func(w io.Writer, i image.Image) error { return nil },
5151
func() string { return "png" },
@@ -68,13 +68,13 @@ func TestImgconvDo(t *testing.T) {
6868
func(s string) (io.WriteCloser, error) { return mockCloser{}, nil },
6969
)
7070

71-
mbi := newMockImageFormat(
72-
func(r io.Reader) (image.Image, error) { return mockImage{}, nil },
71+
mbi := newMockImage(
72+
func(r io.Reader) (image.Image, error) { return mockStdImage{}, nil },
7373
nil,
7474
func() string { return "jpeg" },
7575
)
7676

77-
mai := newMockImageFormat(
77+
mai := newMockImage(
7878
nil,
7979
func(w io.Writer, i image.Image) error { return fmt.Errorf("err") },
8080
func() string { return "png" },
@@ -97,12 +97,12 @@ func TestImgconvDo(t *testing.T) {
9797
func(s string) (io.WriteCloser, error) { return mockCloser{}, nil },
9898
)
9999

100-
mbi := newMockImageFormat(
101-
func(r io.Reader) (image.Image, error) { return mockImage{}, nil },
100+
mbi := newMockImage(
101+
func(r io.Reader) (image.Image, error) { return mockStdImage{}, nil },
102102
nil,
103103
func() string { return "jpeg" },
104104
)
105-
mai := newMockImageFormat(
105+
mai := newMockImage(
106106
nil,
107107
func(w io.Writer, i image.Image) error { return nil },
108108
func() string { return "png" },
@@ -145,7 +145,7 @@ func TestImgconv_convert(t *testing.T) {
145145
{
146146
name: "error: Decode failed",
147147
args: func() args {
148-
mi := newMockImageFormat(
148+
mi := newMockImage(
149149
func(r io.Reader) (image.Image, error) { return nil, fmt.Errorf("err") },
150150
nil,
151151
nil,
@@ -162,13 +162,13 @@ func TestImgconv_convert(t *testing.T) {
162162
{
163163
name: "error: Encode failed",
164164
args: func() args {
165-
me := newMockImageFormat(
165+
me := newMockImage(
166166
func(r io.Reader) (image.Image, error) { return mockImage{}, nil },
167167
nil,
168168
nil,
169169
)
170170

171-
md := newMockImageFormat(
171+
md := newMockImage(
172172
nil,
173173
func(w io.Writer, i image.Image) error { return fmt.Errorf("err") },
174174
nil,
@@ -185,13 +185,13 @@ func TestImgconv_convert(t *testing.T) {
185185
{
186186
name: "ok",
187187
args: func() args {
188-
me := newMockImageFormat(
188+
me := newMockImage(
189189
func(r io.Reader) (image.Image, error) { return mockImage{}, nil },
190190
nil,
191191
nil,
192192
)
193193

194-
md := newMockImageFormat(
194+
md := newMockImage(
195195
nil,
196196
func(w io.Writer, i image.Image) error { return nil },
197197
nil,

‎kadai2/tanaka0325/imgconv/mocks_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,28 @@ type decodeFunc func(io.Reader) (image.Image, error)
3434
type encodeFunc func(io.Writer, image.Image) error
3535
type getExtFunc func() string
3636

37-
type mockImageFormat struct {
37+
type mockImage struct {
3838
mockDecode decodeFunc
3939
mockEncode encodeFunc
4040
mockGetExt getExtFunc
4141
}
4242

43-
func (m mockImageFormat) Decode(r io.Reader) (image.Image, error) { return m.mockDecode(r) }
44-
func (m mockImageFormat) Encode(w io.Writer, i image.Image) error {
43+
func (m mockImage) Decode(r io.Reader) (image.Image, error) { return m.mockDecode(r) }
44+
func (m mockImage) Encode(w io.Writer, i image.Image) error {
4545
return m.mockEncode(w, i)
4646
}
47-
func (m mockImageFormat) GetExt() string { return m.mockGetExt() }
47+
func (m mockImage) GetExt() string { return m.mockGetExt() }
4848

49-
func newMockImageFormat(df decodeFunc, ef encodeFunc, gf getExtFunc) mockImageFormat {
50-
return mockImageFormat{
49+
func newMockImage(df decodeFunc, ef encodeFunc, gf getExtFunc) mockImage {
50+
return mockImage{
5151
mockDecode: df,
5252
mockEncode: ef,
5353
mockGetExt: gf,
5454
}
5555
}
5656

57-
type mockImage struct{}
57+
type mockStdImage struct{}
5858

59-
func (mockImage) ColorModel() (c color.Model) { return }
60-
func (mockImage) Bounds() (r image.Rectangle) { return }
61-
func (mockImage) At(int, int) (c color.Color) { return }
59+
func (mockStdImage) ColorModel() (c color.Model) { return }
60+
func (mockStdImage) Bounds() (r image.Rectangle) { return }
61+
func (mockStdImage) At(int, int) (c color.Color) { return }

0 commit comments

Comments
 (0)