fix(tests): add heif exception in libvips < 8.8

This commit is contained in:
Tomas 2020-06-08 13:57:54 +02:00
parent 69f1ab7767
commit 5bd2c1522e
3 changed files with 15 additions and 5 deletions

View file

@ -9,8 +9,8 @@ services:
env: env:
# - LIBVIPS=7.42.3 # - LIBVIPS=7.42.3
# - LIBVIPS=8.4.6 # - LIBVIPS=8.4.6
# - LIBVIPS=8.5.8 - LIBVIPS=8.5.8
# - LIBVIPS=8.6.2 - LIBVIPS=8.6.2
- LIBVIPS=8.7.4 - LIBVIPS=8.7.4
# - LIBVIPS=8.8.4 # - LIBVIPS=8.8.4
- LIBVIPS=8.9.2 - LIBVIPS=8.9.2

View file

@ -6,6 +6,9 @@ import (
"unicode/utf8" "unicode/utf8"
) )
// ImageType represents an image type value.
type ImageType int
const ( const (
// UNKNOWN represents an unknow image type value. // UNKNOWN represents an unknow image type value.
UNKNOWN ImageType = iota UNKNOWN ImageType = iota
@ -29,9 +32,6 @@ const (
HEIF HEIF
) )
// ImageType represents an image type value.
type ImageType int
var ( var (
htmlCommentRegex = regexp.MustCompile("(?i)<!--([\\s\\S]*?)-->") htmlCommentRegex = regexp.MustCompile("(?i)<!--([\\s\\S]*?)-->")
svgRegex = regexp.MustCompile(`(?i)^\s*(?:<\?xml[^>]*>\s*)?(?:<!doctype svg[^>]*>\s*)?<svg[^>]*>[^*]*<\/svg>\s*$`) svgRegex = regexp.MustCompile(`(?i)^\s*(?:<\?xml[^>]*>\s*)?(?:<!doctype svg[^>]*>\s*)?<svg[^>]*>[^*]*<\/svg>\s*$`)

View file

@ -53,6 +53,10 @@ func TestDeterminateImageTypeName(t *testing.T) {
} }
for _, file := range files { for _, file := range files {
if file.expected == "heif" && VipsMajorVersion <= 8 && VipsMinorVersion < 8 {
continue
}
img, _ := os.Open(path.Join("testdata", file.name)) img, _ := os.Open(path.Join("testdata", file.name))
buf, _ := ioutil.ReadAll(img) buf, _ := ioutil.ReadAll(img)
defer img.Close() defer img.Close()
@ -72,6 +76,9 @@ func TestIsTypeSupported(t *testing.T) {
} }
for _, n := range types { for _, n := range types {
if n.name == HEIF && VipsMajorVersion <= 8 && VipsMinorVersion < 8 {
continue
}
if IsTypeSupported(n.name) == false { if IsTypeSupported(n.name) == false {
t.Fatalf("Image type %s is not valid", ImageTypes[n.name]) t.Fatalf("Image type %s is not valid", ImageTypes[n.name])
} }
@ -92,6 +99,9 @@ func TestIsTypeNameSupported(t *testing.T) {
} }
for _, n := range types { for _, n := range types {
if n.name == "heif" && VipsMajorVersion <= 8 && VipsMinorVersion < 8 {
continue
}
if IsTypeNameSupported(n.name) != n.expected { if IsTypeNameSupported(n.name) != n.expected {
t.Fatalf("Image type %s is not valid", n.name) t.Fatalf("Image type %s is not valid", n.name)
} }