aboutsummaryrefslogtreecommitdiffstats
path: root/modules/util
diff options
context:
space:
mode:
authorTheFox0x7 <thefox0x7@gmail.com>2024-12-15 11:41:29 +0100
committerGitHub <noreply@github.com>2024-12-15 10:41:29 +0000
commit33e8e82c4b528db8efb1cf9fc4dbab2d9e21ace8 (patch)
tree6ee296e2ef469911d0db440100e1eb835945af89 /modules/util
parentdf9a78cd04e364264c103cf3a92d94179cc1dd4f (diff)
downloadgitea-33e8e82c4b528db8efb1cf9fc4dbab2d9e21ace8.tar.gz
gitea-33e8e82c4b528db8efb1cf9fc4dbab2d9e21ace8.zip
Enable tenv and testifylint rules (#32852)
Enables tenv and testifylint linters closes: https://github.com/go-gitea/gitea/issues/32842
Diffstat (limited to 'modules/util')
-rw-r--r--modules/util/color_test.go6
-rw-r--r--modules/util/keypair_test.go5
-rw-r--r--modules/util/time_str_test.go4
-rw-r--r--modules/util/util_test.go16
4 files changed, 15 insertions, 16 deletions
diff --git a/modules/util/color_test.go b/modules/util/color_test.go
index be6e6b122a..abd5551218 100644
--- a/modules/util/color_test.go
+++ b/modules/util/color_test.go
@@ -27,9 +27,9 @@ func Test_HexToRBGColor(t *testing.T) {
}
for n, c := range cases {
r, g, b := HexToRBGColor(c.colorString)
- assert.Equal(t, c.expectedR, r, "case %d: error R should match: expected %f, but get %f", n, c.expectedR, r)
- assert.Equal(t, c.expectedG, g, "case %d: error G should match: expected %f, but get %f", n, c.expectedG, g)
- assert.Equal(t, c.expectedB, b, "case %d: error B should match: expected %f, but get %f", n, c.expectedB, b)
+ assert.InDelta(t, c.expectedR, r, 0, "case %d: error R should match: expected %f, but get %f", n, c.expectedR, r)
+ assert.InDelta(t, c.expectedG, g, 0, "case %d: error G should match: expected %f, but get %f", n, c.expectedG, g)
+ assert.InDelta(t, c.expectedB, b, 0, "case %d: error B should match: expected %f, but get %f", n, c.expectedB, b)
}
}
diff --git a/modules/util/keypair_test.go b/modules/util/keypair_test.go
index c6f68c845a..2bade3bb28 100644
--- a/modules/util/keypair_test.go
+++ b/modules/util/keypair_test.go
@@ -10,7 +10,6 @@ import (
"crypto/sha256"
"crypto/x509"
"encoding/pem"
- "regexp"
"testing"
"github.com/stretchr/testify/assert"
@@ -23,8 +22,8 @@ func TestKeygen(t *testing.T) {
assert.NotEmpty(t, priv)
assert.NotEmpty(t, pub)
- assert.Regexp(t, regexp.MustCompile("^-----BEGIN RSA PRIVATE KEY-----.*"), priv)
- assert.Regexp(t, regexp.MustCompile("^-----BEGIN PUBLIC KEY-----.*"), pub)
+ assert.Regexp(t, "^-----BEGIN RSA PRIVATE KEY-----.*", priv)
+ assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----.*", pub)
}
func TestSignUsingKeys(t *testing.T) {
diff --git a/modules/util/time_str_test.go b/modules/util/time_str_test.go
index 67b7978d0b..8d1de51c8e 100644
--- a/modules/util/time_str_test.go
+++ b/modules/util/time_str_test.go
@@ -27,9 +27,9 @@ func TestTimeStr(t *testing.T) {
t.Run(test.input, func(t *testing.T) {
output, err := TimeEstimateParse(test.input)
if test.err {
- assert.NotNil(t, err)
+ assert.Error(t, err)
} else {
- assert.Nil(t, err)
+ assert.NoError(t, err)
}
assert.Equal(t, test.output, output)
})
diff --git a/modules/util/util_test.go b/modules/util/util_test.go
index 9ce72fb866..5abce08b41 100644
--- a/modules/util/util_test.go
+++ b/modules/util/util_test.go
@@ -122,8 +122,8 @@ func Test_NormalizeEOL(t *testing.T) {
func Test_RandomInt(t *testing.T) {
randInt, err := CryptoRandomInt(255)
- assert.True(t, randInt >= 0)
- assert.True(t, randInt <= 255)
+ assert.GreaterOrEqual(t, randInt, int64(0))
+ assert.LessOrEqual(t, randInt, int64(255))
assert.NoError(t, err)
}
@@ -223,22 +223,22 @@ func BenchmarkToUpper(b *testing.B) {
}
func TestToTitleCase(t *testing.T) {
- assert.Equal(t, ToTitleCase(`foo bar baz`), `Foo Bar Baz`)
- assert.Equal(t, ToTitleCase(`FOO BAR BAZ`), `Foo Bar Baz`)
+ assert.Equal(t, `Foo Bar Baz`, ToTitleCase(`foo bar baz`))
+ assert.Equal(t, `Foo Bar Baz`, ToTitleCase(`FOO BAR BAZ`))
}
func TestToPointer(t *testing.T) {
assert.Equal(t, "abc", *ToPointer("abc"))
assert.Equal(t, 123, *ToPointer(123))
abc := "abc"
- assert.False(t, &abc == ToPointer(abc))
+ assert.NotSame(t, &abc, ToPointer(abc))
val123 := 123
- assert.False(t, &val123 == ToPointer(val123))
+ assert.NotSame(t, &val123, ToPointer(val123))
}
func TestReserveLineBreakForTextarea(t *testing.T) {
- assert.Equal(t, ReserveLineBreakForTextarea("test\r\ndata"), "test\ndata")
- assert.Equal(t, ReserveLineBreakForTextarea("test\r\ndata\r\n"), "test\ndata\n")
+ assert.Equal(t, "test\ndata", ReserveLineBreakForTextarea("test\r\ndata"))
+ assert.Equal(t, "test\ndata\n", ReserveLineBreakForTextarea("test\r\ndata\r\n"))
}
func TestOptionalArg(t *testing.T) {