From 8b74d9421af61f93476d733f5c606ad4da317293 Mon Sep 17 00:00:00 2001 From: Daisuke Maki Date: Fri, 20 Feb 2026 10:22:58 +0900 Subject: [PATCH] standardize on using testify/require --- internal/keyseq/ahocorasick_test.go | 31 +++++++++++------------------ internal/keyseq/ternary_test.go | 10 ++++++---- internal/keyseq/trie_test.go | 22 +++++++------------- selection_test.go | 17 +++++----------- 4 files changed, 30 insertions(+), 50 deletions(-) diff --git a/internal/keyseq/ahocorasick_test.go b/internal/keyseq/ahocorasick_test.go index 4ab56e4..850afc7 100644 --- a/internal/keyseq/ahocorasick_test.go +++ b/internal/keyseq/ahocorasick_test.go @@ -2,31 +2,24 @@ package keyseq import ( "testing" + + "github.com/stretchr/testify/require" ) func checkNode(t *testing.T, node Node, size int, data nodeData) { - if node == nil { - t.Error("Nil node:", data) - } - if node.Size() != size { - t.Errorf("Unexpected childrens: %d != %d", node.Size(), size) - } + require.NotNil(t, node, "Nil node:", data) + require.Equal(t, size, node.Size(), "Unexpected childrens") d := node.Value().(*nodeData) - if d == nil { - t.Error("Nil data:", data, node) + require.NotNil(t, d, "Nil data:", data, node) + if data.pattern != nil { + require.True(t, d.pattern.Equals(*data.pattern), "Pattern unmatched:", data, node, *d.pattern) } - if data.pattern != nil && !d.pattern.Equals(*data.pattern) { - t.Error("Pattern unmatched:", data, node, *d.pattern) - } - if data.value != nil && d.value != data.value { - t.Error("Value unmatched:", data, node, d.value) - } - if d.failure == nil { - t.Error("Nil failure:", data, node) - } else if d.failure != data.failure { - t.Errorf("Failure unmatched: data=%+v node=%+v d.failure=%+v", - data, node, d.failure) + if data.value != nil { + require.Equal(t, data.value, d.value, "Value unmatched:", data, node, d.value) } + require.NotNil(t, d.failure, "Nil failure:", data, node) + require.Equal(t, data.failure, d.failure, "Failure unmatched: data=%+v node=%+v d.failure=%+v", + data, node, d.failure) } func invalidData(failure Node) nodeData { diff --git a/internal/keyseq/ternary_test.go b/internal/keyseq/ternary_test.go index 6b82bee..b8dc1d1 100644 --- a/internal/keyseq/ternary_test.go +++ b/internal/keyseq/ternary_test.go @@ -1,6 +1,10 @@ package keyseq -import "testing" +import ( + "testing" + + "github.com/stretchr/testify/require" +) func TestBalance(t *testing.T) { trie := NewTernaryTrie() @@ -13,9 +17,7 @@ func TestBalance(t *testing.T) { for i, k := range list { trie.Put(KeyList{k}, i) } - if s := trie.Size(); s != 15 { - t.Fatalf("Size() returns not 15: %d", s) - } + require.Equal(t, 15, trie.Size()) trie.Balance() /* diff --git a/internal/keyseq/trie_test.go b/internal/keyseq/trie_test.go index d66dfae..bb39933 100644 --- a/internal/keyseq/trie_test.go +++ b/internal/keyseq/trie_test.go @@ -2,18 +2,14 @@ package keyseq import ( "testing" + + "github.com/stretchr/testify/require" ) func checkTrieNode(t *testing.T, n Node, k Key, value int) { - if n == nil { - t.Fatal("TrieNode is null") - } - if l := n.Label(); l != k { - t.Errorf("TrieNode.Label() expected:'%c' actual:'%c'", k, l) - } - if v := n.Value().(int); v != value { - t.Errorf("TrieNode.Value() expected:%d actual:%d", value, v) - } + require.NotNil(t, n, "TrieNode is null") + require.Equal(t, k, n.Label(), "TrieNode.Label()") + require.Equal(t, value, n.Value().(int), "TrieNode.Value()") } func TestTrie(t *testing.T) { @@ -27,14 +23,10 @@ func TestTrie(t *testing.T) { checkTrieNode(t, nodes[i], Key{0, 0, rune(i + 1)}, 111*(i+1)) } - if s := trie.Size(); s != 5 { - t.Errorf("trie.Size() returns not 5: %d", s) - } + require.Equal(t, 5, trie.Size()) } func TestNotFound(t *testing.T) { trie := NewTrie() - if trie.Get(Key{999, 999, 'a'}) != nil { - t.Errorf("found 'not_exist' in empty trie") - } + require.Nil(t, trie.Get(Key{999, 999, 'a'})) } diff --git a/selection_test.go b/selection_test.go index fefe30e..4cc8a3b 100644 --- a/selection_test.go +++ b/selection_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/peco/peco/line" + "github.com/stretchr/testify/require" ) func TestSelection(t *testing.T) { @@ -13,19 +14,11 @@ func TestSelection(t *testing.T) { alice := line.NewRaw(i, "Alice", false, false) i++ s.Add(alice) - if s.Len() != 1 { - t.Errorf("expected Len = 1, got %d", s.Len()) - } + require.Equal(t, 1, s.Len()) s.Add(line.NewRaw(i, "Bob", false, false)) - if s.Len() != 2 { - t.Errorf("expected Len = 2, got %d", s.Len()) - } + require.Equal(t, 2, s.Len()) s.Add(alice) - if s.Len() != 2 { - t.Errorf("expected Len = 2, got %d", s.Len()) - } + require.Equal(t, 2, s.Len()) s.Remove(alice) - if s.Len() != 1 { - t.Errorf("expected Len = 1, got %d", s.Len()) - } + require.Equal(t, 1, s.Len()) }