Skip to content

Commit

Permalink
not testing concurrency pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
logica0419 committed Dec 11, 2023
1 parent 4302fa8 commit 257fa13
Showing 1 changed file with 11 additions and 32 deletions.
43 changes: 11 additions & 32 deletions service/imaging/processor_default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package imaging

import (
"bytes"
"fmt"
"image"
"image/png"
"io"
Expand Down Expand Up @@ -33,15 +32,6 @@ func setup() (Processor, *os.File) {
return processor, mustOpen("test.png")
}

func setupCustomConc(conc int) Processor {
processor := NewProcessor(Config{
MaxPixels: 500 * 500,
Concurrency: conc,
ThumbnailMaxSize: image.Point{X: 50, Y: 50},
})
return processor
}

func assertImg(t *testing.T, actualImg image.Image, expectedFilePath string) {
actualImgBytesBuffer := &bytes.Buffer{}
err := png.Encode(actualImgBytesBuffer, actualImg)
Expand Down Expand Up @@ -82,8 +72,6 @@ func TestProcessorDefault_Fit(t *testing.T) {
func TestProcessorDefault_FitAnimationGIF(t *testing.T) {
t.Parallel()

testConc := []int{1, 2, 3, 4, 5}

test := []struct {
name string
file string
Expand Down Expand Up @@ -141,26 +129,17 @@ func TestProcessorDefault_FitAnimationGIF(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

for _, conc := range testConc {
tt := tt
conc := conc

t.Run(fmt.Sprintf("concurrency=%d", conc), func(t *testing.T) {
t.Parallel()

processor := setupCustomConc(conc)
if tt.file != "" { // ファイルはこのタイミングで開かないと正常なデータにならない
tt.reader = testutils.MustOpenGif(tt.file)
}

actual, err := processor.FitAnimationGIF(tt.reader, 256, 256)
if tt.err != nil {
assert.Equal(t, tt.err, err)
} else {
assert.Nil(t, err)
assert.Equal(t, tt.want, utils.MustIoReaderToBytes(actual))
}
})
processor, _ := setup()
if tt.file != "" { // ファイルはこのタイミングで開かないと正常なデータにならない
tt.reader = testutils.MustOpenGif(tt.file)
}

actual, err := processor.FitAnimationGIF(tt.reader, 256, 256)
if tt.err != nil {
assert.Equal(t, tt.err, err)
} else {
assert.Nil(t, err)
assert.Equal(t, tt.want, utils.MustIoReaderToBytes(actual))
}
})
}
Expand Down

0 comments on commit 257fa13

Please sign in to comment.