Update tests (#416)

* Update tests
johnfercher · May 15, 2024 · 727147b · 727147b
1 parent 027c37f
commit 727147b
Show file tree

Hide file tree

Showing 26 changed files with 147 additions and 641 deletions.
diff --git a/Makefile b/Makefile
@@ -21,10 +21,15 @@ fmt:
 .PHONY: lint
 lint:
 	golangci-lint run --config=.golangci.yml ./...
+	make mock-lint
+
+.PHONY: mock-lint
+mock-lint:
+	bash shell/mock-check.sh
 
 .PHONY: install
 install:
-	bash install.sh
+	bash shell/install.sh
 
 .PHONY: docs
 docs:

diff --git a/internal/cache/mutexcache_test.go b/internal/cache/mutexcache_test.go
@@ -28,7 +28,7 @@ func TestMutexCache_AddImage(t *testing.T) {
 	value := "value1"
 	img := &entity.Image{}
 
-	innerMock := &mocks.Cache{}
+	innerMock := mocks.NewCache(t)
 	innerMock.EXPECT().AddImage(value, img)
 
 	sut := cache.NewMutexDecorator(innerMock)
@@ -47,7 +47,7 @@ func TestMutexCache_GetImage(t *testing.T) {
 	imgToReturn := &entity.Image{}
 	errToReturn := errors.New("any error")
 
-	innerMock := &mocks.Cache{}
+	innerMock := mocks.NewCache(t)
 	innerMock.EXPECT().GetImage(value, ext).Return(imgToReturn, errToReturn)
 
 	sut := cache.NewMutexDecorator(innerMock)
@@ -67,7 +67,7 @@ func TestMutexCache_LoadImage(t *testing.T) {
 	ext := extension.Jpg
 	errToReturn := errors.New("any error")
 
-	innerMock := &mocks.Cache{}
+	innerMock := mocks.NewCache(t)
 	innerMock.EXPECT().LoadImage(value, ext).Return(errToReturn)
 
 	sut := cache.NewMutexDecorator(innerMock)

diff --git a/internal/providers/gofpdf/cellwriter/bordercolorstyler_test.go b/internal/providers/gofpdf/cellwriter/bordercolorstyler_test.go
@@ -38,7 +38,7 @@ func TestBorderColorStyler_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		var nilCellProp *props.Cell
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, nilCellProp)
 
 		sut := cellwriter.NewBorderColorStyler(nil)
@@ -57,7 +57,7 @@ func TestBorderColorStyler_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		prop := &props.Cell{}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
 		sut := cellwriter.NewBorderColorStyler(nil)
@@ -78,10 +78,10 @@ func TestBorderColorStyler_Apply(t *testing.T) {
 			BorderColor: &props.Color{Red: 140, Green: 100, Blue: 80},
 		}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().SetDrawColor(prop.BorderColor.Red, prop.BorderColor.Green, prop.BorderColor.Blue)
 		fpdf.EXPECT().SetDrawColor(0, 0, 0)
 

diff --git a/internal/providers/gofpdf/cellwriter/borderlinestyler_test.go b/internal/providers/gofpdf/cellwriter/borderlinestyler_test.go
@@ -38,7 +38,7 @@ func TestBorderLineStyler_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		var nilCellProp *props.Cell
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, nilCellProp)
 
 		sut := cellwriter.NewBorderLineStyler(nil)
@@ -59,7 +59,7 @@ func TestBorderLineStyler_Apply(t *testing.T) {
 			LineStyle: linestyle.Solid,
 		}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
 		sut := cellwriter.NewBorderLineStyler(nil)
@@ -78,7 +78,7 @@ func TestBorderLineStyler_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		prop := &props.Cell{}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
 		sut := cellwriter.NewBorderLineStyler(nil)
@@ -99,10 +99,10 @@ func TestBorderLineStyler_Apply(t *testing.T) {
 			LineStyle: linestyle.Dashed,
 		}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().SetDashPattern([]float64{1, 1}, 0.0)
 		fpdf.EXPECT().SetDashPattern([]float64{1, 0}, 0.0)
 

diff --git a/internal/providers/gofpdf/cellwriter/borderthicknessstyler_test.go b/internal/providers/gofpdf/cellwriter/borderthicknessstyler_test.go
@@ -38,7 +38,7 @@ func TestBorderThicknessStyler_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		var nilCellProp *props.Cell
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, nilCellProp)
 
 		sut := cellwriter.NewBorderThicknessStyler(nil)
@@ -57,7 +57,7 @@ func TestBorderThicknessStyler_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		prop := &props.Cell{}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
 		sut := cellwriter.NewBorderThicknessStyler(nil)
@@ -78,10 +78,10 @@ func TestBorderThicknessStyler_Apply(t *testing.T) {
 			BorderThickness: 1.0,
 		}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().SetLineWidth(prop.BorderThickness)
 		fpdf.EXPECT().SetLineWidth(linestyle.DefaultLineThickness)
 

diff --git a/internal/providers/gofpdf/cellwriter/cellwriter_test.go b/internal/providers/gofpdf/cellwriter/cellwriter_test.go
@@ -28,7 +28,7 @@ func TestCellWriter_Apply(t *testing.T) {
 		config := &entity.Config{}
 		width := 100.0
 		height := 200.0
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().CellFormat(width, height, "", "", 0, "C", false, 0, "")
 
 		sut := cellwriter.NewCellWriter(fpdf)
@@ -46,7 +46,7 @@ func TestCellWriter_Apply(t *testing.T) {
 		}
 		width := 100.0
 		height := 200.0
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().CellFormat(width, height, "", "1", 0, "C", false, 0, "")
 
 		sut := cellwriter.NewCellWriter(fpdf)
@@ -63,7 +63,7 @@ func TestCellWriter_Apply(t *testing.T) {
 		prop := fixture.CellProp()
 		width := 100.0
 		height := 200.0
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().CellFormat(width, height, "", "L", 0, "C", true, 0, "")
 
 		sut := cellwriter.NewCellWriter(fpdf)
@@ -82,7 +82,7 @@ func TestCellWriter_Apply(t *testing.T) {
 		prop := fixture.CellProp()
 		width := 100.0
 		height := 200.0
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().CellFormat(width, height, "", "1", 0, "C", true, 0, "")
 
 		sut := cellwriter.NewCellWriter(fpdf)

diff --git a/internal/providers/gofpdf/cellwriter/fillcolorstyler_test.go b/internal/providers/gofpdf/cellwriter/fillcolorstyler_test.go
@@ -37,7 +37,7 @@ func TestFillColorStyle_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		var nilCellProp *props.Cell
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, nilCellProp)
 
 		sut := cellwriter.NewFillColorStyler(nil)
@@ -56,7 +56,7 @@ func TestFillColorStyle_Apply(t *testing.T) {
 		cfg := &entity.Config{}
 		prop := &props.Cell{}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
 		sut := cellwriter.NewFillColorStyler(nil)
@@ -77,10 +77,10 @@ func TestFillColorStyle_Apply(t *testing.T) {
 			BackgroundColor: &props.Color{Red: 100, Green: 150, Blue: 170},
 		}
 
-		inner := &mocks.CellWriter{}
+		inner := mocks.NewCellWriter(t)
 		inner.EXPECT().Apply(width, height, cfg, prop)
 
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().SetFillColor(prop.BackgroundColor.Red, prop.BackgroundColor.Green, prop.BackgroundColor.Blue)
 		fpdf.EXPECT().SetFillColor(255, 255, 255)
 

diff --git a/internal/providers/gofpdf/font_test.go b/internal/providers/gofpdf/font_test.go
@@ -19,7 +19,7 @@ func TestNewFont(t *testing.T) {
 	family := fontfamily.Arial
 	style := fontstyle.Bold
 
-	fpdf := &mocks.Fpdf{}
+	fpdf := mocks.NewFpdf(t)
 	fpdf.EXPECT().SetFont(family, string(style), size)
 
 	// Act
@@ -40,7 +40,7 @@ func TestFont_GetHeight(t *testing.T) {
 	family := fontfamily.Arial
 	style := fontstyle.Bold
 
-	fpdf := &mocks.Fpdf{}
+	fpdf := mocks.NewFpdf(t)
 	fpdf.EXPECT().SetFont(family, string(style), size)
 	font := gofpdf.NewFont(fpdf, size, family, style)
 
@@ -57,7 +57,7 @@ func TestFont_SetFamily(t *testing.T) {
 	family := fontfamily.Arial
 	style := fontstyle.Bold
 
-	fpdf := &mocks.Fpdf{}
+	fpdf := mocks.NewFpdf(t)
 	fpdf.EXPECT().SetFont(family, string(style), size)
 	fpdf.EXPECT().SetFont(fontfamily.Helvetica, string(style), size)
 	font := gofpdf.NewFont(fpdf, size, family, style)
@@ -75,7 +75,7 @@ func TestFont_SetStyle(t *testing.T) {
 	family := fontfamily.Arial
 	style := fontstyle.Bold
 
-	fpdf := &mocks.Fpdf{}
+	fpdf := mocks.NewFpdf(t)
 	fpdf.EXPECT().SetFont(family, string(style), size)
 	fpdf.EXPECT().SetFontStyle(string(fontstyle.BoldItalic))
 	font := gofpdf.NewFont(fpdf, size, family, style)
@@ -93,7 +93,7 @@ func TestFont_SetSize(t *testing.T) {
 	family := fontfamily.Arial
 	style := fontstyle.Bold
 
-	fpdf := &mocks.Fpdf{}
+	fpdf := mocks.NewFpdf(t)
 	fpdf.EXPECT().SetFont(family, string(style), size)
 	fpdf.EXPECT().SetFontSize(14.0)
 	font := gofpdf.NewFont(fpdf, size, family, style)
@@ -112,7 +112,7 @@ func TestFont_SetColor(t *testing.T) {
 		family := fontfamily.Arial
 		style := fontstyle.Bold
 
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().SetFont(family, string(style), size)
 		font := gofpdf.NewFont(fpdf, size, family, style)
 		color := &props.Color{Red: 0, Green: 0, Blue: 0}
@@ -129,7 +129,7 @@ func TestFont_SetColor(t *testing.T) {
 		family := fontfamily.Arial
 		style := fontstyle.Bold
 
-		fpdf := &mocks.Fpdf{}
+		fpdf := mocks.NewFpdf(t)
 		fpdf.EXPECT().SetFont(family, string(style), size)
 		fpdf.EXPECT().SetTextColor(200, 200, 200)
 		font := gofpdf.NewFont(fpdf, size, family, style)

diff --git a/internal/providers/gofpdf/image_test.go b/internal/providers/gofpdf/image_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 func TestNewImage(t *testing.T) {
-	image := gofpdf2.NewImage(&mocks.Fpdf{}, &mocks.Math{})
+	image := gofpdf2.NewImage(mocks.NewFpdf(t), mocks.NewMath(t))
 
 	assert.NotNil(t, image)
 	assert.Equal(t, fmt.Sprintf("%T", image), "*gofpdf.image")
@@ -35,10 +35,10 @@ func TestImage_Add(t *testing.T) {
 			ImageType: string(img.Extension),
 		}
 
-		pdf := &mocks.Fpdf{}
+		pdf := mocks.NewFpdf(t)
 		pdf.EXPECT().RegisterImageOptionsReader(mock.Anything, options, bytes.NewReader(img.Bytes)).Return(nil)
 
-		image := gofpdf2.NewImage(pdf, &mocks.Math{})
+		image := gofpdf2.NewImage(pdf, mocks.NewMath(t))
 
 		// Act
 		err := image.Add(&img, &cell, &margins, &rect, img.Extension, true)
@@ -57,7 +57,7 @@ func TestImage_Add(t *testing.T) {
 			ImageType: string(img.Extension),
 		}
 
-		pdf := &mocks.Fpdf{}
+		pdf := mocks.NewFpdf(t)
 		pdf.EXPECT().RegisterImageOptionsReader(mock.Anything, options, bytes.NewReader(img.Bytes)).Return(&gofpdf.ImageInfoType{})
 		pdf.EXPECT().Image(mock.Anything, 30.0, 35.0, 98.0, mock.Anything, true, "", 0, "")
 
@@ -83,7 +83,7 @@ func TestImage_Add(t *testing.T) {
 			ImageType: string(img.Extension),
 		}
 
-		pdf := &mocks.Fpdf{}
+		pdf := mocks.NewFpdf(t)
 		pdf.EXPECT().RegisterImageOptionsReader(mock.Anything, options, bytes.NewReader(img.Bytes)).Return(&gofpdf.ImageInfoType{})
 		pdf.EXPECT().Image(mock.Anything, 21.0, mock.Anything, 98.0, mock.Anything, true, "", 0, "")