test(lint): Enable testifylint

.golangci.yaml

@@ -80,7 +80,7 @@ linters:
     - stylecheck
     - tenv
     - testableexamples
-    # - testifylint
+    - testifylint
     - typecheck
     - unconvert
     - unparam

cmd/gones/get_icons_test.go

@@ -19,6 +19,6 @@ func Test_getWindowIcons(t *testing.T) {
 	log.SetOutput(&buf)
 
 	icons := getWindowIcons()
-	assert.Equal(t, 3, len(icons))
+	assert.Len(t, icons, 3)
 	assert.Empty(t, buf.String())
 }

internal/console/blargg_apu_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 //go:embed nes-test-roms/apu_reset/4015_cleared.nes
@@ -15,14 +16,8 @@ func Test_blarggAPURst4015Clr(t *testing.T) {
 	t.Parallel()
 
 	test, err := NewBlarggTest(strings.NewReader(blarggAPURst4015Clr))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = test.Run()
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
+	require.NoError(t, test.Run())
 
 	assert.EqualValues(t, StatusSuccess, GetBlarggStatus(test))
 	assert.EqualValues(t, "4015_cleared\n\nPassed", GetBlarggMessage(test))
@@ -35,14 +30,8 @@ func Test_blarggIRQClr(t *testing.T) {
 	t.Parallel()
 
 	test, err := NewBlarggTest(strings.NewReader(blarggIRQClr))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = test.Run()
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
+	require.NoError(t, test.Run())
 
 	assert.EqualValues(t, StatusSuccess, GetBlarggStatus(test))
 	assert.EqualValues(t, "irq_flag_cleared\n\nPassed", GetBlarggMessage(test))

internal/console/blargg_instr_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 //go:embed nes-test-roms/instr_test-v5/all_instrs.nes
@@ -15,14 +16,8 @@ func Test_blarggCPUTest(t *testing.T) {
 	t.Parallel()
 
 	test, err := NewBlarggTest(strings.NewReader(blarggInstrTest))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = test.Run()
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
+	require.NoError(t, test.Run())
 
 	assert.EqualValues(t, StatusSuccess, GetBlarggStatus(test))
 	assert.EqualValues(t, "All 16 tests passed", GetBlarggMessage(test))
@@ -41,14 +36,9 @@ func Test_blarggCPUTiming(t *testing.T) {
 	callback := NewBlargPPUMessageCallback()
 
 	test, err := NewConsoleTest(strings.NewReader(blarggCPUTimingTest), callback)
-	if !assert.NoError(t, err) {
-		return
-	}
-
+	require.NoError(t, err)
 	err = test.Run()
-	if !assert.Error(t, err) {
-		return
-	}
+	require.Error(t, err)
 
 	assert.EqualValues(t, blarggCPUTimingSuccess, err.Error())
 }
@@ -62,14 +52,9 @@ func Test_blarggBranchTimingBasics(t *testing.T) {
 	callback := NewBlargPPUMessageCallback()
 
 	test, err := NewConsoleTest(strings.NewReader(blarggBranchTimingBasicsTest), callback)
-	if !assert.NoError(t, err) {
-		return
-	}
-
+	require.NoError(t, err)
 	err = test.Run()
-	if !assert.Error(t, err) {
-		return
-	}
+	require.Error(t, err)
 
 	assert.EqualValues(t, "BRANCH TIMING BASICS\nPASSED", err.Error())
 }
@@ -83,14 +68,9 @@ func Test_blarggBranchTimingBackward(t *testing.T) {
 	callback := NewBlargPPUMessageCallback()
 
 	test, err := NewConsoleTest(strings.NewReader(blarggBranchTimingBackwardTest), callback)
-	if !assert.NoError(t, err) {
-		return
-	}
-
+	require.NoError(t, err)
 	err = test.Run()
-	if !assert.Error(t, err) {
-		return
-	}
+	require.Error(t, err)
 
 	assert.EqualValues(t, "BACKWARD BRANCH TIMING\nPASSED", err.Error())
 }
@@ -104,14 +84,9 @@ func Test_blarggBranchTimingForward(t *testing.T) {
 	callback := NewBlargPPUMessageCallback()
 
 	test, err := NewConsoleTest(strings.NewReader(blarggBranchTimingForwardTest), callback)
-	if !assert.NoError(t, err) {
-		return
-	}
-
+	require.NoError(t, err)
 	err = test.Run()
-	if !assert.Error(t, err) {
-		return
-	}
+	require.Error(t, err)
 
 	assert.EqualValues(t, "FORWARD BRANCH TIMING\nPASSED", err.Error())
 }

internal/console/blargg_oam_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 //go:embed nes-test-roms/oam_read/oam_read.nes
@@ -36,14 +37,8 @@ func Test_oamRead(t *testing.T) {
 	t.Parallel()
 
 	test, err := NewBlarggTest(strings.NewReader(oamRead))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = test.Run()
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
+	require.NoError(t, test.Run())
 
 	assert.EqualValues(t, StatusSuccess, GetBlarggStatus(test))
 	assert.EqualValues(t, oamReadSuccess, GetBlarggMessage(test))
@@ -77,14 +72,8 @@ func Test_oamStress(t *testing.T) {
 	t.Parallel()
 
 	test, err := NewBlarggTest(strings.NewReader(oamStress))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = test.Run()
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
+	require.NoError(t, test.Run())
 
 	assert.EqualValues(t, StatusSuccess, GetBlarggStatus(test))
 	assert.EqualValues(t, oamStressSuccess, GetBlarggMessage(test))

internal/console/blargg_ppu_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 //go:embed nes-test-roms/ppu_open_bus/ppu_open_bus.nes
@@ -15,14 +16,8 @@ func Test_blarggPPUOpenBus(t *testing.T) {
 	t.Parallel()
 
 	test, err := NewBlarggTest(strings.NewReader(blarggPPUOpenBus))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = test.Run()
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
+	require.NoError(t, test.Run())
 
 	assert.EqualValues(t, 0, GetBlarggStatus(test))
 	assert.EqualValues(t, "ppu_open_bus\n\nPassed", GetBlarggMessage(test))
@@ -44,14 +39,8 @@ func Test_blarggPPUVblNMI(t *testing.T) {
 	t.Parallel()
 
 	test, err := NewBlarggTest(strings.NewReader(blarggPPUVblNMI))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = test.Run()
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
+	require.NoError(t, test.Run())
 
 	assert.EqualValues(t, blarggPPUVblNMISuccess, GetBlarggMessage(test))
 }

internal/console/nestest_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 //go:embed nes-test-roms/other/nestest.nes
@@ -19,9 +20,7 @@ func Test_nestest(t *testing.T) {
 	t.Parallel()
 
 	c, err := stubConsole(strings.NewReader(nestest))
-	if !assert.NoError(t, err) {
-		return
-	}
+	require.NoError(t, err)
 
 	c.CPU.ProgramCounter = 0xC000
 
@@ -32,20 +31,15 @@ func Test_nestest(t *testing.T) {
 		actual := c.Trace()
 		expected := scanner.Text()
 
-		if !assert.EqualValues(t, expected, actual) {
-			return
-		}
+		require.EqualValues(t, expected, actual)
 
-		if c.Step(true); !assert.NoError(t, c.CPU.StepErr) {
-			return
-		}
+		c.Step(true)
+		require.NoError(t, c.CPU.StepErr)
 		if c.CPU.Status.Break {
 			break
 		}
 	}
-	if !assert.NoError(t, scanner.Err()) {
-		return
-	}
+	require.NoError(t, scanner.Err())
 
 	assert.EqualValues(t, strings.Count(nestestLog, "\n"), checkedLines)
 	assert.EqualValues(t, 0, c.Bus.ReadMem(2), "See https://github.com/christopherpow/nes-test-roms/blob/master/other/nestest.txt#L87 for failure code meaning")

internal/cpu/cpu_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/gabe565/gones/internal/config"
 	"github.com/gabe565/gones/internal/ppu"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func stubCPU(program []byte) *CPU {
@@ -28,9 +29,8 @@ func Test_0xa9_lda_immediate_load_data(t *testing.T) {
 
 	cpu := stubCPU([]byte{0xA9, 0x05, 0x00})
 	for {
-		if cpu.Step(); !assert.NoError(t, cpu.StepErr) {
-			return
-		}
+		cpu.Step()
+		require.NoError(t, cpu.StepErr)
 		if cpu.Status.Break {
 			break
 		}
@@ -46,9 +46,8 @@ func Test_0xa9_lda_zero_flag(t *testing.T) {
 
 	cpu := stubCPU([]byte{0xA9, 0x00, 0x00})
 	for {
-		if cpu.Step(); !assert.NoError(t, cpu.StepErr) {
-			return
-		}
+		cpu.Step()
+		require.NoError(t, cpu.StepErr)
 		if cpu.Status.Break {
 			break
 		}
@@ -62,9 +61,8 @@ func Test_0xaa_tax_move_a_to_x(t *testing.T) {
 
 	cpu := stubCPU([]byte{0xA9, 0x0A, 0xAA, 0x00})
 	for {
-		if cpu.Step(); !assert.NoError(t, cpu.StepErr) {
-			return
-		}
+		cpu.Step()
+		require.NoError(t, cpu.StepErr)
 		if cpu.Status.Break {
 			break
 		}
@@ -78,9 +76,8 @@ func Test_5_operations(t *testing.T) {
 
 	cpu := stubCPU([]byte{0xA9, 0xC0, 0xAA, 0xE8, 0x00})
 	for {
-		if cpu.Step(); !assert.NoError(t, cpu.StepErr) {
-			return
-		}
+		cpu.Step()
+		require.NoError(t, cpu.StepErr)
 		if cpu.Status.Break {
 			break
 		}
@@ -94,9 +91,8 @@ func Test_inx_overflow(t *testing.T) {
 
 	cpu := stubCPU([]byte{0xA9, 0xFF, 0xAA, 0xE8, 0xE8, 0x00})
 	for {
-		if cpu.Step(); !assert.NoError(t, cpu.StepErr) {
-			return
-		}
+		cpu.Step()
+		require.NoError(t, cpu.StepErr)
 		if cpu.Status.Break {
 			break
 		}
@@ -111,9 +107,8 @@ func Test_lda_from_memory(t *testing.T) {
 	cpu := stubCPU([]byte{0xA5, 0x10, 0x00})
 	cpu.WriteMem(0x10, 0x55)
 	for {
-		if cpu.Step(); !assert.NoError(t, cpu.StepErr) {
-			return
-		}
+		cpu.Step()
+		require.NoError(t, cpu.StepErr)
 		if cpu.Status.Break {
 			break
 		}

internal/cpu/trace_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCPU_TraceFormat(t *testing.T) {
@@ -16,9 +17,8 @@ func TestCPU_TraceFormat(t *testing.T) {
 	c.RegisterY = 3
 	for {
 		traces = append(traces, c.Trace())
-		if c.Step(); !assert.NoError(t, c.StepErr) {
-			return
-		}
+		c.Step()
+		require.NoError(t, c.StepErr)
 		if c.Status.Break {
 			break
 		}
@@ -51,9 +51,8 @@ func TestCPU_Trace_MemAccess(t *testing.T) {
 	c.WriteMem(0x400, 0xAA)
 	for {
 		traces = append(traces, c.Trace())
-		if c.Step(); !assert.NoError(t, c.StepErr) {
-			return
-		}
+		c.Step()
+		require.NoError(t, c.StepErr)
 		if c.Status.Break {
 			break
 		}