✨ Migrate from testify to nalgeon/be testing library
- Replace all testify/assert and testify/require with be library - Update go.mod to use be v0.3.0 instead of testify - Simplify test assertions using be.Equal, be.Err, and be.True - Refactor append_test, entry_test, meta_test, log_test, and formatter tests
This commit is contained in:
parent
79f58b3e6c
commit
1110288d84
16 changed files with 226 additions and 236 deletions
|
|
@ -3,13 +3,13 @@ package files
|
|||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"codeberg.org/danjones000/my-log/config"
|
||||
"codeberg.org/danjones000/my-log/models"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/nalgeon/be"
|
||||
)
|
||||
|
||||
func TestAppend(tt *testing.T) {
|
||||
|
|
@ -58,14 +58,13 @@ func appendTestSingle(t *testing.T) {
|
|||
Entries: []models.Entry{e},
|
||||
}
|
||||
err := Append(l)
|
||||
require.NoError(t, err)
|
||||
require.FileExists(t, dir+"/test.log")
|
||||
be.Err(t, err, nil)
|
||||
by, err := os.ReadFile(dir + "/test.log")
|
||||
be.Err(t, err, nil)
|
||||
st := string(by)
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, st, "Jimmy\n")
|
||||
assert.Contains(t, st, "\n@foo 42")
|
||||
assert.Contains(t, st, "\n@bar true")
|
||||
be.True(t, strings.Contains(st, "Jimmy\n"))
|
||||
be.True(t, strings.Contains(st, "\n@foo 42"))
|
||||
be.True(t, strings.Contains(st, "\n@bar true"))
|
||||
}
|
||||
|
||||
func appendTestTwoEntries(t *testing.T) {
|
||||
|
|
@ -81,12 +80,11 @@ func appendTestTwoEntries(t *testing.T) {
|
|||
Entries: e,
|
||||
}
|
||||
err := Append(l)
|
||||
assert.NoError(t, err)
|
||||
require.FileExists(t, dir+"/test.log")
|
||||
be.Err(t, err, nil)
|
||||
by, _ := os.ReadFile(dir + "/test.log")
|
||||
st := string(by)
|
||||
assert.Contains(t, st, fmt.Sprintf("@begin %s - one", whens))
|
||||
assert.Contains(t, st, fmt.Sprintf("@begin %s - two", whens))
|
||||
be.True(t, strings.Contains(st, fmt.Sprintf("@begin %s - one", whens)))
|
||||
be.True(t, strings.Contains(st, fmt.Sprintf("@begin %s - two", whens)))
|
||||
}
|
||||
|
||||
func appendTestAddNewLine(t *testing.T) {
|
||||
|
|
@ -102,11 +100,10 @@ func appendTestAddNewLine(t *testing.T) {
|
|||
Entries: e,
|
||||
}
|
||||
err := Append(l)
|
||||
assert.NoError(t, err)
|
||||
require.FileExists(t, dir+"/test.log")
|
||||
be.Err(t, err, nil)
|
||||
by, _ := os.ReadFile(dir + "/test.log")
|
||||
exp := fmt.Sprintf("foo\n@begin %s - one\n@id jimmy @end\n", whens)
|
||||
assert.Equal(t, exp, string(by))
|
||||
be.Equal(t, string(by), exp)
|
||||
}
|
||||
|
||||
func appendTestDontAddNewLine(t *testing.T) {
|
||||
|
|
@ -122,11 +119,10 @@ func appendTestDontAddNewLine(t *testing.T) {
|
|||
Entries: e,
|
||||
}
|
||||
err := Append(l)
|
||||
assert.NoError(t, err)
|
||||
require.FileExists(t, dir+"/test.log")
|
||||
be.Err(t, err, nil)
|
||||
by, _ := os.ReadFile(dir + "/test.log")
|
||||
exp := fmt.Sprintf("foo\n@begin %s - one\n@id jimmy @end\n", whens)
|
||||
assert.Equal(t, exp, string(by))
|
||||
be.Equal(t, string(by), exp)
|
||||
}
|
||||
|
||||
func appendTestBadEntry(t *testing.T) {
|
||||
|
|
@ -139,10 +135,9 @@ func appendTestBadEntry(t *testing.T) {
|
|||
Entries: []models.Entry{e},
|
||||
}
|
||||
err := Append(l)
|
||||
assert.NoError(t, err)
|
||||
require.FileExists(t, dir+"/test.log")
|
||||
be.Err(t, err, nil)
|
||||
by, _ := os.ReadFile(dir + "/test.log")
|
||||
assert.Equal(t, []byte{}, by)
|
||||
be.Equal(t, by, []byte{})
|
||||
}
|
||||
|
||||
func appendTestDotFolder(t *testing.T) {
|
||||
|
|
@ -161,12 +156,11 @@ func appendTestDotFolder(t *testing.T) {
|
|||
Entries: []models.Entry{e},
|
||||
}
|
||||
err := Append(l)
|
||||
require.NoError(t, err)
|
||||
require.FileExists(t, dir+"/sub/test.log")
|
||||
be.Err(t, err, nil)
|
||||
by, err := os.ReadFile(dir + "/sub/test.log")
|
||||
be.Err(t, err, nil)
|
||||
st := string(by)
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title))
|
||||
be.True(t, strings.Contains(st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title)))
|
||||
}
|
||||
|
||||
func appendTestDotFolderNo(t *testing.T) {
|
||||
|
|
@ -185,12 +179,11 @@ func appendTestDotFolderNo(t *testing.T) {
|
|||
Entries: []models.Entry{e},
|
||||
}
|
||||
err := Append(l)
|
||||
require.NoError(t, err)
|
||||
require.FileExists(t, dir+"/sub.test.log")
|
||||
be.Err(t, err, nil)
|
||||
by, err := os.ReadFile(dir + "/sub.test.log")
|
||||
be.Err(t, err, nil)
|
||||
st := string(by)
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title))
|
||||
be.True(t, strings.Contains(st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title)))
|
||||
}
|
||||
|
||||
func appendTestNoExt(t *testing.T) {
|
||||
|
|
@ -209,12 +202,11 @@ func appendTestNoExt(t *testing.T) {
|
|||
Entries: []models.Entry{e},
|
||||
}
|
||||
err := Append(l)
|
||||
require.NoError(t, err)
|
||||
require.FileExists(t, dir+"/foobar")
|
||||
be.Err(t, err, nil)
|
||||
by, err := os.ReadFile(dir + "/foobar")
|
||||
be.Err(t, err, nil)
|
||||
st := string(by)
|
||||
require.NoError(t, err)
|
||||
assert.Contains(t, st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title))
|
||||
be.True(t, strings.Contains(st, fmt.Sprintf("@begin %s - %s", e.Date.Format(models.DateFormat), e.Title)))
|
||||
}
|
||||
|
||||
func appendTestConfLoadErr(t *testing.T) {
|
||||
|
|
@ -230,7 +222,7 @@ func appendTestConfLoadErr(t *testing.T) {
|
|||
t.Cleanup(func() { config.ConfigPath = currConf })
|
||||
|
||||
err := Append(models.Log{})
|
||||
assert.ErrorContains(t, err, "toml")
|
||||
be.Err(t, err, "toml")
|
||||
}
|
||||
|
||||
func appendTestMkdirErr(t *testing.T) {
|
||||
|
|
@ -239,7 +231,7 @@ func appendTestMkdirErr(t *testing.T) {
|
|||
t.Cleanup(func() { delete(config.Overrides, "input.path") })
|
||||
|
||||
err := Append(models.Log{})
|
||||
assert.ErrorContains(t, err, "permission denied")
|
||||
be.Err(t, err, "permission denied")
|
||||
}
|
||||
|
||||
func appendTestOpenErr(t *testing.T) {
|
||||
|
|
@ -253,5 +245,5 @@ func appendTestOpenErr(t *testing.T) {
|
|||
f.Close()
|
||||
os.Chmod(fname, 0400)
|
||||
err := Append(l)
|
||||
assert.ErrorContains(t, err, "permission denied")
|
||||
be.Err(t, err, "permission denied")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue