clawbot
00d8ba26c5
check / check (push) Canceled after 0s
The new package internal/imagerequest holds the request type, its two parts Source and Transform, the Format and Fit types, the dimension and fit checks, the /v1/image/ path parsing and the variant key; it imports no other package of pixa. imgcache.ParsedURL, imgcache.ImageRequest, signature.Request, imageprocessor.Request, the second Size, format and fit types and the conversions between them are gone. The image processor takes a Transform only. encurl keeps a private struct with the token's short CBOR field names. VariantKey moves with the function that makes it. Tests follow the moved and renamed code; the tests of the removed conversions go with them. Model: opus-5-5
120 lines
3.5 KiB
Go
120 lines
3.5 KiB
Go
package imageprocessor
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"testing"
|
|
|
|
"sneak.berlin/go/pixa/internal/imagerequest"
|
|
)
|
|
|
|
// TestImageProcessor_RefusesFitOutsideAboveMaximum verifies that FitOutside,
|
|
// which scales the input to cover the requested size and so past it on one
|
|
// side, is refused with ErrOutputTooLarge when that side would come out above
|
|
// MaxOutputDimension, and otherwise makes the scaled size. A 1024x256 or
|
|
// 256x1024 input scaled by 8 has 8192 for its long side.
|
|
func TestImageProcessor_RefusesFitOutsideAboveMaximum(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
inputWidth, inputHeight int
|
|
size imagerequest.Size
|
|
// wantWidth and wantHeight are the output's, 0 for a refusal
|
|
wantWidth, wantHeight int
|
|
}{
|
|
{"width above the maximum", 3000, 600,
|
|
imagerequest.Size{Width: 1, Height: 8192}, 0, 0},
|
|
{"height above the maximum", 600, 3000,
|
|
imagerequest.Size{Width: 8192, Height: 1}, 0, 0},
|
|
{"width at the maximum", 1024, 256,
|
|
imagerequest.Size{Width: 1, Height: 2048}, 8192, 2048},
|
|
{"height at the maximum", 256, 1024,
|
|
imagerequest.Size{Width: 2048, Height: 1}, 2048, 8192},
|
|
{"within the maximum", 3000, 600,
|
|
imagerequest.Size{Width: 1, Height: 1200}, 6000, 1200},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
input := createTestJPEG(t, tt.inputWidth, tt.inputHeight)
|
|
|
|
result, err := New(Params{}).Process(t.Context(),
|
|
bytes.NewReader(input),
|
|
&imagerequest.Transform{
|
|
Size: tt.size,
|
|
Format: imagerequest.FormatJPEG,
|
|
FitMode: imagerequest.FitOutside,
|
|
})
|
|
if result != nil {
|
|
t.Logf("Process() made %dx%d", result.Width, result.Height)
|
|
}
|
|
|
|
if tt.wantWidth == 0 {
|
|
if !errors.Is(err, ErrOutputTooLarge) {
|
|
t.Errorf("Process() error = %v, want %v", err, ErrOutputTooLarge)
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
if err != nil {
|
|
t.Fatalf("Process() error = %v", err)
|
|
}
|
|
|
|
if result.Width != tt.wantWidth || result.Height != tt.wantHeight {
|
|
t.Errorf("Process() made %dx%d, want %dx%d",
|
|
result.Width, result.Height, tt.wantWidth, tt.wantHeight)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestImageProcessor_FitOutsideSideIsAtLeastOne verifies that FitOutside
|
|
// keeps each side at 1 or more when it works both sides out again from the
|
|
// larger scale. A side of 49 scaled to 1 is 49 times 1/49, which in floating
|
|
// point is just under 1 and so rounded down to 0, a width libvips refuses.
|
|
func TestImageProcessor_FitOutsideSideIsAtLeastOne(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
inputWidth, inputHeight int
|
|
size imagerequest.Size
|
|
wantWidth, wantHeight int
|
|
}{
|
|
{"49x8192 at 0x100", 49, 8192, imagerequest.Size{Height: 100}, 1, 167},
|
|
{"49x49 at 1x1", 49, 49, imagerequest.Size{Width: 1, Height: 1}, 1, 1},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
input := createTestJPEG(t, tt.inputWidth, tt.inputHeight)
|
|
|
|
result, err := New(Params{}).Process(t.Context(),
|
|
bytes.NewReader(input),
|
|
&imagerequest.Transform{
|
|
Size: tt.size,
|
|
Format: imagerequest.FormatJPEG,
|
|
FitMode: imagerequest.FitOutside,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("Process() error = %v", err)
|
|
}
|
|
|
|
defer func() { _ = result.Content.Close() }()
|
|
|
|
t.Logf("Process() made %dx%d", result.Width, result.Height)
|
|
|
|
if result.Width != tt.wantWidth || result.Height != tt.wantHeight {
|
|
t.Errorf("Process() made %dx%d, want %dx%d",
|
|
result.Width, result.Height, tt.wantWidth, tt.wantHeight)
|
|
}
|
|
})
|
|
}
|
|
}
|