Test suite, code linting: fix further issues

canvas/circle_test.go

@@ -30,13 +30,14 @@ func TestCircle_Resize(t *testing.T) {
 	targetHeight := float32(50)
 	circle := canvas.NewCircle(color.White)
 	start := circle.Size()
-	assert.True(t, start.Height == 0)
-	assert.True(t, start.Width == 0)
+	assert.Equal(t, float32(0), start.Height)
+	assert.Equal(t, float32(0), start.Width)
 
 	circle.Resize(fyne.NewSize(targetWidth, targetHeight))
 	target := circle.Size()
-	assert.True(t, target.Height == targetHeight)
-	assert.True(t, target.Width == targetWidth)
+	assert.Equal(t, targetWidth, target.Width)
+	assert.Equal(t, targetHeight, target.Height)
+
 }
 
 func TestCircle_Move(t *testing.T) {

data/binding/binding_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type simpleItem struct {
@@ -12,14 +13,14 @@ type simpleItem struct {
 
 func TestBase_AddListener(t *testing.T) {
 	data := &simpleItem{}
-	assert.Equal(t, 0, len(data.listeners))
+	assert.Empty(t, data.listeners)
 
 	called := false
 	fn := NewDataListener(func() {
 		called = true
 	})
 	data.AddListener(fn)
-	assert.Equal(t, 1, len(data.listeners))
+	assert.Len(t, data.listeners, 1)
 	assert.True(t, called)
 }
 
@@ -31,9 +32,9 @@ func TestBase_RemoveListener(t *testing.T) {
 	data := &simpleItem{}
 	data.listeners = append(data.listeners, fn)
 
-	assert.Equal(t, 1, len(data.listeners))
+	assert.Len(t, data.listeners, 1)
 	data.RemoveListener(fn)
-	assert.Equal(t, 0, len(data.listeners))
+	assert.Empty(t, data.listeners)
 
 	data.trigger()
 	assert.False(t, called)
@@ -60,13 +61,13 @@ func TestBindAnyWithNil(t *testing.T) {
 	a.Set(0)
 
 	ival, err := a.Get()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	val, ok := ival.(int)
 	assert.Equal(t, 0, val)
 	assert.True(t, ok)
 
 	a.Set(nil)
 	ival, err = a.Get()
-	assert.NoError(t, err)
-	assert.Equal(t, nil, ival)
+	require.NoError(t, err)
+	assert.Nil(t, ival)
 }

data/binding/lists_test.go

@@ -13,14 +13,14 @@ type simpleList struct {
 
 func TestListBase_AddListener(t *testing.T) {
 	data := &simpleList{}
-	assert.Equal(t, 0, len(data.listeners))
+	assert.Empty(t, data.listeners)
 
 	called := false
 	fn := NewDataListener(func() {
 		called = true
 	})
 	data.AddListener(fn)
-	assert.Equal(t, 1, len(data.listeners))
+	assert.Len(t, data.listeners, 1)
 
 	data.trigger()
 	assert.True(t, called)
@@ -30,16 +30,16 @@ func TestListBase_GetItem(t *testing.T) {
 	data := &simpleList{}
 	f := 0.5
 	data.appendItem(BindFloat(&f))
-	assert.Equal(t, 1, len(data.items))
+	assert.Len(t, data.items, 1)
 
 	item, err := data.GetItem(0)
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	val, err := item.(Float).Get()
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, f, val)
 
 	_, err = data.GetItem(5)
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }
 
 func TestListBase_Length(t *testing.T) {
@@ -58,9 +58,9 @@ func TestListBase_RemoveListener(t *testing.T) {
 	data := &simpleList{}
 	data.listeners = append(data.listeners, fn)
 
-	assert.Equal(t, 1, len(data.listeners))
+	assert.Len(t, data.listeners, 1)
 	data.RemoveListener(fn)
-	assert.Equal(t, 0, len(data.listeners))
+	assert.Empty(t, data.listeners)
 
 	data.trigger()
 	assert.False(t, called)

data/binding/trees_test.go

@@ -9,14 +9,14 @@ import (
 
 func TestTreeBase_AddListener(t *testing.T) {
 	data := newSimpleTree()
-	assert.Equal(t, 0, len(data.listeners))
+	assert.Empty(t, data.listeners)
 
 	called := false
 	fn := NewDataListener(func() {
 		called = true
 	})
 	data.AddListener(fn)
-	assert.Equal(t, 1, len(data.listeners))
+	assert.Len(t, data.listeners, 1)
 
 	data.trigger()
 	assert.True(t, called)
@@ -26,24 +26,24 @@ func TestTreeBase_GetItem(t *testing.T) {
 	data := newSimpleTree()
 	f := 0.5
 	data.appendItem(BindFloat(&f), "f", "")
-	assert.Equal(t, 1, len(data.items))
+	assert.Len(t, data.items, 1)
 
 	item, err := data.GetItem("f")
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	val, err := item.(Float).Get()
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, f, val)
 
 	_, err = data.GetItem("g")
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }
 
 func TestListBase_IDs(t *testing.T) {
 	data := newSimpleTree()
-	assert.Equal(t, 0, len(data.ChildIDs("")))
+	assert.Empty(t, data.ChildIDs(""))
 
 	data.appendItem(NewFloat(), "1", "")
-	assert.Equal(t, 1, len(data.ChildIDs("")))
+	assert.Len(t, data.ChildIDs(""), 1)
 	assert.Equal(t, "1", data.ChildIDs("")[0])
 }
 
@@ -55,9 +55,9 @@ func TestTreeBase_RemoveListener(t *testing.T) {
 	data := newSimpleTree()
 	data.listeners = append(data.listeners, fn)
 
-	assert.Equal(t, 1, len(data.listeners))
+	assert.Len(t, data.listeners, 1)
 	data.RemoveListener(fn)
-	assert.Equal(t, 0, len(data.listeners))
+	assert.Empty(t, data.listeners)
 
 	data.trigger()
 	assert.False(t, called)

internal/async/map_test.go

@@ -35,11 +35,11 @@ func TestMap_LoadAndStore(t *testing.T) {
 	assert.Equal(t, 2, m2.Len())
 
 	strptr, ok = m2.Load(1)
-	assert.True(t, strptr == nil)
+	assert.Nil(t, strptr)
 	assert.True(t, ok)
 
 	strptr, ok = m2.Load(3)
-	assert.True(t, strptr == nil)
+	assert.Nil(t, strptr)
 	assert.False(t, ok)
 }
 
@@ -78,19 +78,19 @@ func TestMap_CombinedLoad(t *testing.T) {
 
 	m.Store(1, nil)
 	actual, ok = m.LoadOrStore(1, nil)
-	assert.True(t, actual == nil)
+	assert.Nil(t, actual)
 	assert.True(t, ok)
 
 	actual, ok = m.LoadOrStore(2, nil)
-	assert.True(t, actual == nil)
+	assert.Nil(t, actual)
 	assert.False(t, ok)
 
 	actual, ok = m.LoadAndDelete(1)
-	assert.True(t, actual == nil)
+	assert.Nil(t, actual)
 	assert.True(t, ok)
 
 	actual, ok = m.LoadAndDelete(1)
-	assert.True(t, actual == nil)
+	assert.Nil(t, actual)
 	assert.False(t, ok)
 
 	m.Store(1, &str)

internal/cache/base_test.go

@@ -82,15 +82,15 @@ func TestCacheClean(t *testing.T) {
 		tm.setTime(11, 12)
 		Clean(false)
 		assert.Equal(t, 20, svgs.Len())
-		assert.Equal(t, renderers.Len(), 40)
-		assert.Equal(t, canvases.Len(), 40)
+		assert.Equal(t, 40, renderers.Len())
+		assert.Equal(t, 40, canvases.Len())
 		assert.Zero(t, destroyedRenderersCnt)
 
 		tm.setTime(11, 42)
 		Clean(false)
 		assert.Equal(t, 0, svgs.Len())
-		assert.Equal(t, renderers.Len(), 40)
-		assert.Equal(t, canvases.Len(), 40)
+		assert.Equal(t, 40, renderers.Len())
+		assert.Equal(t, 40, canvases.Len())
 		assert.Zero(t, destroyedRenderersCnt)
 	})
 

internal/driver/common/canvas_test.go

@@ -366,9 +366,9 @@ func TestCanvas_OverlayStack(t *testing.T) {
 	o.Add(a)
 	o.Add(b)
 	o.Add(c)
-	assert.Equal(t, 3, len(o.List()))
+	assert.Len(t, o.List(), 3)
 	o.Remove(c)
-	assert.Equal(t, 2, len(o.List()))
+	assert.Len(t, o.List(), 2)
 	o.Remove(a)
 	assert.Empty(t, o.List())
 }

internal/driver/glfw/window_test.go

@@ -1531,7 +1531,7 @@ func TestWindow_CaptureTypedShortcut(t *testing.T) {
 	w.keyPressed(nil, glfw.KeyLeftControl, 0, glfw.Release, glfw.ModControl)
 	w.keyPressed(nil, glfw.KeyF, 0, glfw.Release, glfw.ModControl)
 
-	assert.Equal(t, 1, len(content.capturedShortcuts))
+	assert.Len(t, content.capturedShortcuts, 1)
 	assert.Equal(t, "CustomDesktop:Control+F", content.capturedShortcuts[0].ShortcutName())
 }
 
@@ -1583,7 +1583,7 @@ func TestWindow_TabWithModifierToTriggersShortcut(t *testing.T) {
 	w.keyPressed(nil, glfw.KeyTab, 0, glfw.Release, glfw.ModControl)
 	w.keyPressed(nil, glfw.KeyTab, 0, glfw.Press, glfw.ModControl|glfw.ModShift)
 	w.keyPressed(nil, glfw.KeyTab, 0, glfw.Release, glfw.ModControl|glfw.ModShift)
-	assert.Equal(t, 2, len(content.capturedShortcuts))
+	assert.Len(t, content.capturedShortcuts, 2)
 	assert.Equal(t, "CustomDesktop:Control+Tab", content.capturedShortcuts[0].ShortcutName())
 	assert.Equal(t, "CustomDesktop:Shift+Control+Tab", content.capturedShortcuts[1].ShortcutName())
 }
@@ -1787,7 +1787,7 @@ func TestWindow_Shortcut(t *testing.T) {
 	}
 
 	trigger()
-	assert.Equal(t, 0, len(content.capturedShortcuts))
+	assert.Empty(t, content.capturedShortcuts)
 	assert.Equal(t, "canvas", called)
 
 	if runtime.GOOS != "darwin" { // macOS does this builtin
@@ -1799,19 +1799,19 @@ func TestWindow_Shortcut(t *testing.T) {
 
 		w.SetMainMenu(fyne.NewMainMenu(file))
 		trigger()
-		assert.Equal(t, 0, len(content.capturedShortcuts))
+		assert.Empty(t, content.capturedShortcuts)
 		assert.Equal(t, "menu", called)
 	}
 
 	called = "obj"
 	w.Canvas().Focus(content)
 	trigger()
-	assert.Equal(t, 0, len(content.capturedShortcuts))
+	assert.Empty(t, content.capturedShortcuts)
 	assert.Equal(t, "menu", called)
 
 	called = "obj"
 	w.triggersShortcut("D", fyne.KeyD, fyne.KeyModifierSuper) // not in the menu
-	assert.Equal(t, 1, len(content.capturedShortcuts))
+	assert.Len(t, content.capturedShortcuts, 1)
 	assert.Equal(t, "obj", called)
 }
 

internal/driver/mobile/menu_test.go

@@ -88,7 +88,7 @@ func TestMobileCanvas_MenuChild(t *testing.T) {
 	assert.Equal(t, "Top", topObj.menu.Label)
 
 	test.Tap(topObj)
-	assert.Equal(t, 1, len(c.Overlays().List()))
+	assert.Len(t, c.Overlays().List(), 1)
 	rootOverlay := c.Overlays().Top()
 	parentItem := rootOverlay.(*internalWidget.OverlayContainer).Content.(*widget.PopUpMenu).Items[0]
 	parentDetails := test.WidgetRenderer(parentItem.(fyne.Widget))
@@ -101,7 +101,7 @@ func TestMobileCanvas_MenuChild(t *testing.T) {
 	childMenu := parentItem.(interface{ Child() *widget.Menu }).Child()
 	assert.NotNil(t, childMenu)
 	assert.True(t, childMenu.Visible())
-	assert.Equal(t, 1, len(childMenu.Items))
+	assert.Len(t, childMenu.Items, 1)
 
 	childDetails := test.WidgetRenderer(childMenu.Items[0].(fyne.Widget))
 	text = childDetails.Objects()[1].(*fynecanvas.Text)

internal/painter/font_test.go

@@ -38,7 +38,7 @@ func TestCachedFontFace(t *testing.T) {
 	// check the wide symbol rune
 	symbol := canvas.NewText("⌘", color.Black)
 	symbol.TextStyle.Symbol = true
-	assert.True(t, symbol.MinSize().Width > 10)
+	assert.Greater(t, symbol.MinSize().Width, float32(10))
 }
 
 func TestDrawString(t *testing.T) {

internal/repository/file_test.go

@@ -431,16 +431,16 @@ func TestFileRepositoryMoveDirectory(t *testing.T) {
 	newParent := storage.NewFileURI(newParentPath)
 
 	err = storage.Move(parent, newParent)
-	assert.Nil(t, err)
+	require.NoError(t, err)
 
 	newData, err := os.ReadFile(newFooPath)
-	assert.Nil(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, []byte{1, 2, 3, 4, 5}, newData)
 
 	// Make sure that the source doesn't exist anymore.
 	ex, err := storage.Exists(foo)
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	assert.False(t, ex)
 }
 

internal/repository/memory_test.go

@@ -350,7 +350,7 @@ func TestInMemoryRepositoryListing(t *testing.T) {
 
 	empty, _ := storage.ParseURI("mem:///empty/")
 	canList, err := storage.CanList(empty)
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	assert.True(t, canList)
 
 	foo, _ := storage.ParseURI("mem:///foo")

storage/uri_test.go

@@ -447,12 +447,12 @@ func TestRepositoryCopyListable(t *testing.T) {
 	newParent, _ := storage.ParseURI("uritest:///parent2")
 
 	err := storage.Copy(parent, newParent)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	exists, err := m.Exists(parent)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.True(t, exists)
 	exists, err = m.Exists(newParent)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.True(t, exists)
 	assert.Equal(t, []byte("content"), m.Data["/parent1/child"])
 	assert.Equal(t, []byte("content"), m.Data["/parent2/child"])
@@ -488,12 +488,12 @@ func TestRepositoryMoveListable(t *testing.T) {
 	newParent, _ := storage.ParseURI("uritest:///parent2")
 
 	err := storage.Move(parent, newParent)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	exists, err := m.Exists(parent)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.False(t, exists)
 	exists, err = m.Exists(newParent)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.True(t, exists)
 	assert.Equal(t, []byte("content"), m.Data["/parent2/child"])
 }