Skip to content

Commit fe4bf5c

Browse files
committed
✅ Fix test conditions
1 parent 91daf2a commit fe4bf5c

File tree

2 files changed

+41
-37
lines changed

2 files changed

+41
-37
lines changed

image_test.go

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -533,17 +533,19 @@ func TestImage_ChangeColorspace(t *testing.T) {
533533
}
534534

535535
func TestImageTransformation_Save(t *testing.T) {
536-
t.Run("save bitmap", func(t *testing.T) {
537-
img, err := NewImageFromFile(testfile("test.bmp"))
538-
if err != nil {
539-
t.Fatalf("cannot load image: %v", err)
540-
}
541-
if out, err := img.Save(SaveOptions{MagickFormat: "bmp"}); err != nil {
542-
t.Errorf("cannot save image: %v", err)
543-
} else {
544-
_ = Write("testdata/transformation_save_bmp_out.bmp", out)
545-
}
546-
})
536+
if vipsVersionMin(8, 13) {
537+
t.Run("save bitmap", func(t *testing.T) {
538+
img, err := NewImageFromFile(testfile("test.bmp"))
539+
if err != nil {
540+
t.Fatalf("cannot load image: %v", err)
541+
}
542+
if out, err := img.Save(SaveOptions{MagickFormat: "bmp"}); err != nil {
543+
t.Errorf("cannot save image: %v", err)
544+
} else {
545+
_ = Write("testdata/transformation_save_bmp_out.bmp", out)
546+
}
547+
})
548+
}
547549
}
548550

549551
func TestFormatSupport(t *testing.T) {
@@ -590,31 +592,33 @@ func TestFormatSupport(t *testing.T) {
590592
})
591593
})
592594

593-
t.Run("pdf", func(t *testing.T) {
594-
t.Run("can load", func(t *testing.T) {
595-
img, err := NewImageFromFile(testfile("test.pdf"))
596-
if err != nil {
597-
t.Fatalf("cannot load the pdf: %v", err)
598-
}
595+
if vipsVersionMin(8, 12) {
596+
t.Run("pdf", func(t *testing.T) {
597+
t.Run("can load", func(t *testing.T) {
598+
img, err := NewImageFromFile(testfile("test.pdf"))
599+
if err != nil {
600+
t.Fatalf("cannot load the pdf: %v", err)
601+
}
599602

600-
size := img.Size()
601-
if size.Height != 1050 || size.Width != 1680 {
602-
t.Errorf("unexpected size: %#v", size)
603-
}
604-
})
603+
size := img.Size()
604+
if size.Height != 1050 || size.Width != 1680 {
605+
t.Errorf("unexpected size: %#v", size)
606+
}
607+
})
605608

606-
t.Run("cannot save", func(t *testing.T) {
607-
img, err := NewImageFromFile(testfile("test.pdf"))
608-
if err != nil {
609-
t.Fatalf("cannot load the pdf: %v", err)
610-
}
609+
t.Run("cannot save", func(t *testing.T) {
610+
img, err := NewImageFromFile(testfile("test.pdf"))
611+
if err != nil {
612+
t.Fatalf("cannot load the pdf: %v", err)
613+
}
611614

612-
_, err = img.Save(SaveOptions{})
613-
if err == nil {
614-
t.Error("saving should not work")
615-
}
615+
_, err = img.Save(SaveOptions{})
616+
if err == nil {
617+
t.Error("saving should not work")
618+
}
619+
})
616620
})
617-
})
621+
}
618622

619623
// TODO add a table test for all expected formats
620624
}

type_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestDeterminateImageType(t *testing.T) {
2525
{"test2.heic", HEIF, true},
2626
{"test3.heic", HEIF, true},
2727
{"test.avif", AVIF, true},
28-
{"test.bmp", MAGICK, true},
28+
{"test.bmp", MAGICK, vipsVersionMin(8, 13)},
2929
}
3030

3131
for _, file := range files {
@@ -57,13 +57,13 @@ func TestDeterminateImageTypeName(t *testing.T) {
5757
{"test.png", "png", true},
5858
{"test.webp", "webp", true},
5959
{"test.gif", "gif", true},
60-
{"test.pdf", "pdf", true},
60+
{"test.pdf", "pdf", vipsVersionMin(8, 12)},
6161
{"test.svg", "svg", true},
6262
{"test.jp2", "jp2k", vipsVersionMin(8, 11)},
6363
{"test.jxl", "jxl", vipsVersionMin(8, 11)},
6464
{"test.heic", "heif", true},
6565
{"test.avif", "avif", true},
66-
{"test.bmp", "magick", true},
66+
{"test.bmp", "magick", vipsVersionMin(8, 13)},
6767
}
6868

6969
for _, file := range files {
@@ -94,7 +94,7 @@ func TestIsTypeSupported(t *testing.T) {
9494
{PNG, true},
9595
{WEBP, true},
9696
{GIF, true},
97-
{PDF, true},
97+
{PDF, vipsVersionMin(8, 12)},
9898
{HEIF, true},
9999
{AVIF, true},
100100
{JP2K, vipsVersionMin(8, 11)},
@@ -120,7 +120,7 @@ func TestIsTypeNameSupported(t *testing.T) {
120120
{"png", true, true},
121121
{"webp", true, true},
122122
{"gif", true, true},
123-
{"pdf", true, true},
123+
{"pdf", true, vipsVersionMin(8, 12)},
124124
{"heif", true, true},
125125
{"avif", true, true},
126126
{"jp2k", true, vipsVersionMin(8, 11)},

0 commit comments

Comments
 (0)