From 6530b66a62cd8eef546f7159618f92829e5de362 Mon Sep 17 00:00:00 2001
From: Andreas Deininger <andreas@deininger.net>
Date: Mon, 6 Jan 2025 21:27:48 +0100
Subject: [PATCH] Test suite, code linting: rules
 'bool-compare,compares,nil-compare,negative-positive'

---
 canvas/text_test.go                           |  2 +-
 .../internal/commands/mock_runner_test.go     |  4 ++--
 cmd/fyne/internal/util/mobile_test.go         |  8 ++++----
 data/binding/binditems_test.go                |  2 +-
 data/binding/convert_test.go                  | 14 ++++++-------
 data/binding/mapbinding_test.go               |  2 +-
 data/binding/sprintf_test.go                  |  2 +-
 internal/async/goroutine_test.go              |  4 ++--
 internal/cache/base_test.go                   | 20 +++++++++----------
 internal/cache/text_test.go                   |  2 +-
 internal/driver/glfw/device_test.go           |  6 +++---
 internal/driver/mobile/device_test.go         |  6 +++---
 internal/repository/http_test.go              | 12 +++++------
 internal/repository/memory_test.go            |  4 ++--
 widget/entry_test.go                          |  9 ++++-----
 15 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/canvas/text_test.go b/canvas/text_test.go
index 4bee9182e9..51f32ea147 100644
--- a/canvas/text_test.go
+++ b/canvas/text_test.go
@@ -48,7 +48,7 @@ func TestText_MinSize_NoMultiLine(t *testing.T) {
 	text = canvas.NewText("Bre\nak", color.NRGBA{0, 0, 0, 0xff})
 	min2 := text.MinSize()
 	assert.Greater(t, min2.Width, min.Width)
-	assert.True(t, min2.Height == min.Height)
+	assert.Equal(t, min2.Height, min.Height)
 }
 
 func TestText_Layout(t *testing.T) {
diff --git a/cmd/fyne/internal/commands/mock_runner_test.go b/cmd/fyne/internal/commands/mock_runner_test.go
index c22f0e75fe..17d5bc470f 100644
--- a/cmd/fyne/internal/commands/mock_runner_test.go
+++ b/cmd/fyne/internal/commands/mock_runner_test.go
@@ -80,10 +80,10 @@ func (t *testCommandRuns) verifyExpectation() {
 
 	for _, value := range t.runs {
 		if value.dir != nil {
-			assert.Equal(t.t, true, value.dirSet)
+			assert.True(t.t, value.dirSet)
 		}
 		if len(value.env) > 0 {
-			assert.Equal(t.t, true, value.envSet)
+			assert.True(t.t, value.envSet)
 		}
 	}
 }
diff --git a/cmd/fyne/internal/util/mobile_test.go b/cmd/fyne/internal/util/mobile_test.go
index 777ded6890..ba5d1616b5 100644
--- a/cmd/fyne/internal/util/mobile_test.go
+++ b/cmd/fyne/internal/util/mobile_test.go
@@ -10,24 +10,24 @@ func Test_IsMobile(t *testing.T) {
 	osList := []string{"darwin", "linux", "windows", "android/arm", "android/arm64", "android/amd64", "android/386", "android", "ios"}
 	osIsMobile := []bool{false, false, false, true, true, true, true, true, true}
 
-	assert.Equal(t, false, IsMobile(""))
+	assert.False(t, IsMobile(""))
 
 	for i, os := range osList {
 		assert.Equal(t, IsMobile(os), osIsMobile[i])
 	}
 
-	assert.Equal(t, false, IsMobile("amiga"))
+	assert.False(t, IsMobile("amiga"))
 }
 
 func Test_IsAndroid(t *testing.T) {
 	osList := []string{"darwin", "linux", "windows", "android/arm", "android/arm64", "android/amd64", "android/386", "android", "ios"}
 	osIsMobile := []bool{false, false, false, true, true, true, true, true, false}
 
-	assert.Equal(t, false, IsAndroid(""))
+	assert.False(t, IsAndroid(""))
 
 	for i, os := range osList {
 		assert.Equal(t, IsAndroid(os), osIsMobile[i])
 	}
 
-	assert.Equal(t, false, IsAndroid("amiga"))
+	assert.False(t, IsAndroid("amiga"))
 }
diff --git a/data/binding/binditems_test.go b/data/binding/binditems_test.go
index c4c5de5691..1eb3c39fb5 100644
--- a/data/binding/binditems_test.go
+++ b/data/binding/binditems_test.go
@@ -223,7 +223,7 @@ func TestNewURI(t *testing.T) {
 	f := NewURI()
 	v, err := f.Get()
 	require.NoError(t, err)
-	assert.Equal(t, nil, v)
+	assert.Nil(t, v)
 
 	err = f.Set(storage.NewFileURI("/var"))
 	require.NoError(t, err)
diff --git a/data/binding/convert_test.go b/data/binding/convert_test.go
index 670601fc6e..290c6146b6 100644
--- a/data/binding/convert_test.go
+++ b/data/binding/convert_test.go
@@ -31,7 +31,7 @@ func TestBoolToString(t *testing.T) {
 	require.NoError(t, err)
 	v2, err := b.Get()
 	require.NoError(t, err)
-	assert.Equal(t, false, v2)
+	assert.False(t, v2)
 }
 
 func TestBoolToStringWithFormat(t *testing.T) {
@@ -56,7 +56,7 @@ func TestBoolToStringWithFormat(t *testing.T) {
 	require.NoError(t, err)
 	v2, err := b.Get()
 	require.NoError(t, err)
-	assert.Equal(t, false, v2)
+	assert.False(t, v2)
 }
 
 func TestFloatToString(t *testing.T) {
@@ -164,13 +164,13 @@ func TestStringToBool(t *testing.T) {
 	b := StringToBool(s)
 	v, err := b.Get()
 	require.NoError(t, err)
-	assert.Equal(t, false, v)
+	assert.False(t, v)
 
 	err = s.Set("true")
 	require.NoError(t, err)
 	v, err = b.Get()
 	require.NoError(t, err)
-	assert.Equal(t, true, v)
+	assert.True(t, v)
 
 	err = s.Set("trap") // bug in fmt.SScanf means "wrong" parses as "false"
 	require.NoError(t, err)
@@ -190,13 +190,13 @@ func TestStringToBoolWithFormat(t *testing.T) {
 	b := StringToBoolWithFormat(s, "%tly")
 	v, err := b.Get()
 	require.NoError(t, err)
-	assert.Equal(t, false, v)
+	assert.False(t, v)
 
 	err = s.Set("truely")
 	require.NoError(t, err)
 	v, err = b.Get()
 	require.NoError(t, err)
-	assert.Equal(t, true, v)
+	assert.True(t, v)
 
 	err = s.Set("true") // valid bool but not valid format
 	require.NoError(t, err)
@@ -317,7 +317,7 @@ func TestStringToURI(t *testing.T) {
 	u := StringToURI(s)
 	v, err := u.Get()
 	require.NoError(t, err)
-	assert.Equal(t, nil, v)
+	assert.Nil(t, v)
 
 	err = s.Set("file:///tmp/test.txt")
 	require.NoError(t, err)
diff --git a/data/binding/mapbinding_test.go b/data/binding/mapbinding_test.go
index c81d42ade0..20a24f99bc 100644
--- a/data/binding/mapbinding_test.go
+++ b/data/binding/mapbinding_test.go
@@ -246,7 +246,7 @@ func TestUntypedMap_Delete(t *testing.T) {
 	assert.Len(t, b.Keys(), 1)
 	v, err = b.GetValue("foo")
 	require.Error(t, err)
-	assert.Equal(t, nil, v)
+	assert.Nil(t, v)
 	v, err = b.GetValue("val")
 	require.NoError(t, err)
 	assert.Equal(t, 5, v)
diff --git a/data/binding/sprintf_test.go b/data/binding/sprintf_test.go
index 6c4399eb51..335f190477 100644
--- a/data/binding/sprintf_test.go
+++ b/data/binding/sprintf_test.go
@@ -78,7 +78,7 @@ func TestSprintfConversionReadWrite(t *testing.T) {
 	err = sp.Set("Bool false , Float 7.000000 , Int 42 , Rune 67 , String nospacestring , URI file:///var/")
 	require.NoError(t, err)
 
-	assert.Equal(t, false, b)
+	assert.False(t, b)
 	assert.Equal(t, float64(7), f)
 	assert.Equal(t, 42, i)
 	assert.Equal(t, 'C', r)
diff --git a/internal/async/goroutine_test.go b/internal/async/goroutine_test.go
index dedadb7679..196d5452c3 100644
--- a/internal/async/goroutine_test.go
+++ b/internal/async/goroutine_test.go
@@ -32,8 +32,8 @@ func TestGoroutineID(t *testing.T) {
 	testID2 := goroutineID()
 
 	assert.Equal(t, testID1, testID2)
-	assert.Greater(t, childID1, uint64(0))
+	assert.Positive(t, childID1)
 	assert.NotEqual(t, testID1, childID1)
-	assert.Greater(t, childID2, uint64(0))
+	assert.Positive(t, childID2)
 	assert.NotEqual(t, childID1, childID2)
 }
diff --git a/internal/cache/base_test.go b/internal/cache/base_test.go
index d98963440f..eed5269619 100644
--- a/internal/cache/base_test.go
+++ b/internal/cache/base_test.go
@@ -35,7 +35,7 @@ func TestCacheClean(t *testing.T) {
 	t.Run("no_expired_objects", func(t *testing.T) {
 		lastClean = tm.createTime(10, 20)
 		Clean(false)
-		assert.Len(t, svgs, 40)
+		assert.Equal(t, 40, svgs.Len())
 		assert.Equal(t, 40, renderers.Len())
 		assert.Len(t, canvases, 40)
 		assert.Zero(t, destroyedRenderersCnt)
@@ -43,7 +43,7 @@ func TestCacheClean(t *testing.T) {
 
 		tm.setTime(10, 30)
 		Clean(true)
-		assert.Equal(t, svgs.Len(), 40)
+		assert.Equal(t, 40, svgs.Len())
 		assert.Equal(t, 40, renderers.Len())
 		assert.Len(t, canvases, 40)
 		assert.Zero(t, destroyedRenderersCnt)
@@ -71,7 +71,7 @@ func TestCacheClean(t *testing.T) {
 		Clean(true)
 		assert.Equal(t, tm.now, lastClean)
 
-		assert.Len(t, svgs, 40)
+		assert.Equal(t, 40, svgs.Len())
 		assert.Equal(t, 40, renderers.Len())
 		assert.Len(t, canvases, 40)
 		assert.Zero(t, destroyedRenderersCnt)
@@ -81,14 +81,14 @@ func TestCacheClean(t *testing.T) {
 		lastClean = tm.createTime(10, 11)
 		tm.setTime(11, 12)
 		Clean(false)
-		assert.Len(t, svgs, 20)
+		assert.Equal(t, 20, svgs.Len())
 		assert.Equal(t, 40, renderers.Len())
 		assert.Len(t, canvases, 40)
 		assert.Zero(t, destroyedRenderersCnt)
 
 		tm.setTime(11, 42)
 		Clean(false)
-		assert.Len(t, svgs, 0)
+		assert.Equal(t, 0, svgs.Len())
 		assert.Equal(t, 40, renderers.Len())
 		assert.Len(t, canvases, 40)
 		assert.Zero(t, destroyedRenderersCnt)
@@ -98,15 +98,15 @@ func TestCacheClean(t *testing.T) {
 		lastClean = tm.createTime(10, 11)
 		tm.setTime(11, 11)
 		Clean(true)
-		assert.Len(t, svgs, 0)
+		assert.Equal(t, 0, svgs.Len())
 		assert.Equal(t, 20, renderers.Len())
 		assert.Len(t, canvases, 20)
 		assert.Equal(t, 20, destroyedRenderersCnt)
 
 		tm.setTime(11, 22)
 		Clean(true)
-		assert.Len(t, svgs, 0)
-		assert.Empty(t, renderers)
+		assert.Equal(t, 0, svgs.Len())
+		assert.Equal(t, 0, renderers.Len())
 		assert.Empty(t, canvases)
 		assert.Equal(t, 40, destroyedRenderersCnt)
 	})
@@ -131,7 +131,7 @@ func TestCacheClean(t *testing.T) {
 		Clean(false)
 		assert.False(t, skippedCleanWithCanvasRefresh)
 		assert.Equal(t, tm.now, lastClean)
-		assert.Empty(t, renderers)
+		assert.Equal(t, 0, renderers.Len())
 	})
 }
 
@@ -170,7 +170,7 @@ func TestCleanCanvas(t *testing.T) {
 	}
 
 	CleanCanvas(dcanvas2)
-	assert.Empty(t, renderers)
+	assert.Equal(t, 0, renderers.Len())
 	assert.Empty(t, canvases)
 	assert.Equal(t, 42, destroyedRenderersCnt)
 }
diff --git a/internal/cache/text_test.go b/internal/cache/text_test.go
index a2b1e2b998..721cac6376 100644
--- a/internal/cache/text_test.go
+++ b/internal/cache/text_test.go
@@ -16,7 +16,7 @@ func TestTextCacheGet(t *testing.T) {
 	assert.Equal(t, float32(0), base)
 
 	SetFontMetrics("hi", 10, fyne.TextStyle{}, nil, fyne.NewSize(10, 10), 8)
-	assert.Len(t, fontSizeCache, 1)
+	assert.Equal(t, 1, fontSizeCache.Len())
 
 	bound, base = GetFontMetrics("hi", 10, fyne.TextStyle{}, nil)
 	assert.Equal(t, fyne.NewSize(10, 10), bound)
diff --git a/internal/driver/glfw/device_test.go b/internal/driver/glfw/device_test.go
index 11e3cb2049..1744918554 100644
--- a/internal/driver/glfw/device_test.go
+++ b/internal/driver/glfw/device_test.go
@@ -12,8 +12,8 @@ import (
 func Test_Device(t *testing.T) {
 	dev := &glDevice{}
 
-	assert.Equal(t, false, dev.IsMobile())
+	assert.False(t, dev.IsMobile())
 	assert.Equal(t, fyne.OrientationHorizontalLeft, dev.Orientation())
-	assert.Equal(t, true, dev.HasKeyboard())
-	assert.Equal(t, false, dev.IsBrowser())
+	assert.True(t, dev.HasKeyboard())
+	assert.False(t, dev.IsBrowser())
 }
diff --git a/internal/driver/mobile/device_test.go b/internal/driver/mobile/device_test.go
index 6dc88b2a04..24e95e5049 100644
--- a/internal/driver/mobile/device_test.go
+++ b/internal/driver/mobile/device_test.go
@@ -9,7 +9,7 @@ import (
 func Test_Device(t *testing.T) {
 	dev := &device{}
 
-	assert.Equal(t, true, dev.IsMobile())
-	assert.Equal(t, false, dev.IsBrowser())
-	assert.Equal(t, false, dev.HasKeyboard())
+	assert.True(t, dev.IsMobile())
+	assert.False(t, dev.IsBrowser())
+	assert.False(t, dev.HasKeyboard())
 }
diff --git a/internal/repository/http_test.go b/internal/repository/http_test.go
index 814a62cdac..90c8009ccf 100644
--- a/internal/repository/http_test.go
+++ b/internal/repository/http_test.go
@@ -67,7 +67,7 @@ func TestHTTPRepositoryExists(t *testing.T) {
 
 	exists, err := storage.Exists(resExists)
 	require.NoError(t, err)
-	assert.Equal(t, true, exists)
+	assert.True(t, exists)
 
 	// test a valid host with an invalid path
 	resNotExists, err := storage.ParseURI(validHost + invalidPath)
@@ -75,7 +75,7 @@ func TestHTTPRepositoryExists(t *testing.T) {
 
 	exists, err = storage.Exists(resNotExists)
 	require.NoError(t, err)
-	assert.Equal(t, false, exists)
+	assert.False(t, exists)
 
 	// test an invalid host
 	resInvalid, err := storage.ParseURI(invalidHost + invalidPath)
@@ -83,7 +83,7 @@ func TestHTTPRepositoryExists(t *testing.T) {
 
 	exists, err = storage.Exists(resInvalid)
 	require.Error(t, err)
-	assert.Equal(t, false, exists)
+	assert.False(t, exists)
 }
 
 func TestHTTPRepositoryReader(t *testing.T) {
@@ -161,7 +161,7 @@ func TestHTTPRepositoryCanRead(t *testing.T) {
 
 	canRead, err := storage.CanRead(resExists)
 	require.NoError(t, err)
-	assert.Equal(t, true, canRead)
+	assert.True(t, canRead)
 
 	// test a invalid url for a valid host
 	resNotExists, err := storage.ParseURI(validHost + invalidPath)
@@ -169,7 +169,7 @@ func TestHTTPRepositoryCanRead(t *testing.T) {
 
 	canRead, err = storage.CanRead(resNotExists)
 	require.Error(t, err)
-	assert.Equal(t, false, canRead)
+	assert.False(t, canRead)
 
 	// test a invalid host
 	resInvalid, err := storage.ParseURI(invalidHost)
@@ -177,5 +177,5 @@ func TestHTTPRepositoryCanRead(t *testing.T) {
 
 	canRead, err = storage.CanRead(resInvalid)
 	require.Error(t, err)
-	assert.Equal(t, false, canRead)
+	assert.False(t, canRead)
 }
diff --git a/internal/repository/memory_test.go b/internal/repository/memory_test.go
index d471e8cf59..856264fa7d 100644
--- a/internal/repository/memory_test.go
+++ b/internal/repository/memory_test.go
@@ -28,7 +28,7 @@ func TestInMemoryRepositoryRegistration(t *testing.T) {
 	// test that re-registration also works
 	m2 := NewInMemoryRepository("mem")
 	repository.Register("mem", m2)
-	assert.False(t, m == m2) // this is explicitly intended to be pointer comparison
+	assert.NotSame(t, m, m2) // this is explicitly intended to be pointer comparison
 	repo, err = repository.ForURI(foo)
 	require.NoError(t, err)
 	assert.Equal(t, m2, repo)
@@ -43,7 +43,7 @@ func TestInMemoryRepositoryParsingWithEmptyList(t *testing.T) {
 
 	canList, err := storage.CanList(foo)
 	require.Error(t, err)
-	assert.Equal(t, false, canList)
+	assert.False(t, canList)
 
 	listing, err := storage.List(foo)
 	require.NoError(t, err)
diff --git a/widget/entry_test.go b/widget/entry_test.go
index a545e748f8..0d7ba2c933 100644
--- a/widget/entry_test.go
+++ b/widget/entry_test.go
@@ -17,7 +17,6 @@ import (
 	"fyne.io/fyne/v2/widget"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestEntry_Binding(t *testing.T) {
@@ -32,13 +31,13 @@ func TestEntry_Binding(t *testing.T) {
 	assert.Equal(t, "", entry.Text)
 
 	err := str.Set("Updated")
-	require.NoError(t, err)
+	assert.NoError(t, err)
 	waitForBinding()
 	assert.Equal(t, "Updated", entry.Text)
 
 	entry.SetText("Typed")
 	v, err := str.Get()
-	require.NoError(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, "Typed", v)
 
 	entry.Unbind()
@@ -1806,7 +1805,7 @@ func TestMultiLineEntry_MinSize(t *testing.T) {
 func TestNewEntryWithData(t *testing.T) {
 	str := binding.NewString()
 	err := str.Set("Init")
-	require.NoError(t, err)
+	assert.NoError(t, err)
 
 	entry := widget.NewEntryWithData(str)
 	waitForBinding()
@@ -1814,7 +1813,7 @@ func TestNewEntryWithData(t *testing.T) {
 
 	entry.SetText("Typed")
 	v, err := str.Get()
-	require.NoError(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, "Typed", v)
 }