test: improve testing suite for expected failure

converter/converter_test.go

@@ -2,7 +2,9 @@ package converter
 
 import (
 	"bytes"
+	"github.com/belphemur/CBZOptimizer/converter/constant"
 	"github.com/belphemur/CBZOptimizer/manga"
+	"golang.org/x/exp/slices"
 	"image"
 	"image/jpeg"
 	"os"
@@ -15,26 +17,31 @@ func TestConvertChapter(t *testing.T) {
 		name           string
 		genTestChapter func(path string) (*manga.Chapter, error)
 		split          bool
+		expectFailure  []constant.ConversionFormat
 	}{
 		{
 			name:           "All split pages",
 			genTestChapter: genBigPages,
 			split:          true,
+			expectFailure:  []constant.ConversionFormat{},
 		},
 		{
 			name:           "Big Pages, no split",
 			genTestChapter: genBigPages,
 			split:          false,
+			expectFailure:  []constant.ConversionFormat{constant.WebP},
 		},
 		{
 			name:           "No split pages",
 			genTestChapter: genSmallPages,
 			split:          false,
+			expectFailure:  []constant.ConversionFormat{},
 		},
 		{
 			name:           "Mix of split and no split pages",
 			genTestChapter: genMixSmallBig,
 			split:          true,
+			expectFailure:  []constant.ConversionFormat{},
 		},
 	}
 	// Load test genTestChapter from testdata
@@ -63,9 +70,15 @@ func TestConvertChapter(t *testing.T) {
 						t.Log(msg)
 					}
 
-					convertedChapter, err := converter.ConvertChapter(chapter, quality, false, progress)
+					convertedChapter, err := converter.ConvertChapter(chapter, quality, tc.split, progress)
 					if err != nil {
+						if slices.Contains(tc.expectFailure, converter.Format()) {
+							t.Logf("Expected failure to convert genTestChapter: %v", err)
+							return
+						}
 						t.Fatalf("failed to convert genTestChapter: %v", err)
+					} else if slices.Contains(tc.expectFailure, converter.Format()) {
+						t.Fatalf("expected failure to convert genTestChapter didn't happen")
 					}
 
 					if len(convertedChapter.Pages) == 0 {

converter/webp/webp_converter.go

@@ -106,9 +106,7 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8
 		go func(page *manga.Page) {
 			defer wgPages.Done()
 
-			splitNeeded, img, format, err := converter.checkPageNeedsSplit(page)
+			splitNeeded, img, format, err := converter.checkPageNeedsSplit(page, split)
-			// Respect choice to split or not
-			splitNeeded = split && splitNeeded
 			if err != nil {
 				errChan <- fmt.Errorf("error checking if page %d of genTestChapter %s needs split: %v", page.Index, chapter.FilePath, err)
 				return
@@ -194,7 +192,7 @@ func (converter *Converter) cropImage(img image.Image) ([]image.Image, error) {
 	return parts, nil
 }
 
-func (converter *Converter) checkPageNeedsSplit(page *manga.Page) (bool, image.Image, string, error) {
+func (converter *Converter) checkPageNeedsSplit(page *manga.Page, splitRequested bool) (bool, image.Image, string, error) {
 	reader := io.Reader(bytes.NewBuffer(page.Contents.Bytes()))
 	img, format, err := image.Decode(reader)
 	if err != nil {
@@ -204,10 +202,10 @@ func (converter *Converter) checkPageNeedsSplit(page *manga.Page) (bool, image.I
 	bounds := img.Bounds()
 	height := bounds.Dy()
 
-	if height >= webpMaxHeight {
+	if height >= webpMaxHeight && !splitRequested {
 		return false, img, format, fmt.Errorf("page[%d] height %d exceeds maximum height %d of webp format", page.Index, height, webpMaxHeight)
 	}
-	return height >= converter.maxHeight, img, format, nil
+	return height >= converter.maxHeight && splitRequested, img, format, nil
 }
 
 func (converter *Converter) convertPage(container *manga.PageContainer, quality uint8) (*manga.PageContainer, error) {