bjoernager/forgejo
bjoernager/forgejo
1
Fork 0
Code Activity

Add testifylint to lint checks (#4535)

Browse source 
go-require lint is ignored for now

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4535
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: TheFox0x7 <thefox0x7@gmail.com>
Co-committed-by: TheFox0x7 <thefox0x7@gmail.com>
This commit is contained in:
TheFox0x7 2024-07-30 19:41:10 +00:00 • committed by Earl Warren
parent 94933470cd
commit 4de909747b
504 changed files with 5028 additions and 4680 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/util/color_test.go
View file

@ -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)
}
}

11
modules/util/file_unix_test.go
View file

@ -10,16 +10,17 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestApplyUmask(t *testing.T) {
f, err := os.CreateTemp(t.TempDir(), "test-filemode-")
assert.NoError(t, err)
require.NoError(t, err)
err = os.Chmod(f.Name(), 0o777)
assert.NoError(t, err)
require.NoError(t, err)
st, err := os.Stat(f.Name())
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualValues(t, 0o777, st.Mode().Perm()&0o777)
oldDefaultUmask := defaultUmask
@ -28,8 +29,8 @@ func TestApplyUmask(t *testing.T) {
defaultUmask = oldDefaultUmask
}()
err = ApplyUmask(f.Name(), os.ModePerm)
assert.NoError(t, err)
require.NoError(t, err)
st, err = os.Stat(f.Name())
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualValues(t, 0o740, st.Mode().Perm()&0o777)
}

7
modules/util/filebuffer/file_backed_buffer_test.go
View file

@ -9,6 +9,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestFileBackedBuffer(t *testing.T) {
@ -22,14 +23,14 @@ func TestFileBackedBuffer(t *testing.T) {
for _, c := range cases {
buf, err := CreateFromReader(strings.NewReader(c.Data), c.MaxMemorySize)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualValues(t, len(c.Data), buf.Size())
data, err := io.ReadAll(buf)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, c.Data, string(data))
assert.NoError(t, buf.Close())
require.NoError(t, buf.Close())
}
}

19
modules/util/io_test.go
View file

@ -9,6 +9,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
type readerWithError struct {
@ -27,40 +28,40 @@ func TestReadWithLimit(t *testing.T) {
// normal test
buf, err := readWithLimit(bytes.NewBuffer(bs), 5, 2)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("01"), buf)
buf, err = readWithLimit(bytes.NewBuffer(bs), 5, 5)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("01234"), buf)
buf, err = readWithLimit(bytes.NewBuffer(bs), 5, 6)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("012345"), buf)
buf, err = readWithLimit(bytes.NewBuffer(bs), 5, len(bs))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("0123456789abcdef"), buf)
buf, err = readWithLimit(bytes.NewBuffer(bs), 5, 100)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("0123456789abcdef"), buf)
// test with error
buf, err = readWithLimit(&readerWithError{bytes.NewBuffer(bs)}, 5, 10)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("0123456789"), buf)
buf, err = readWithLimit(&readerWithError{bytes.NewBuffer(bs)}, 5, 100)
assert.ErrorContains(t, err, "test error")
require.ErrorContains(t, err, "test error")
assert.Empty(t, buf)
// test public function
buf, err = ReadWithLimit(bytes.NewBuffer(bs), 2)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("01"), buf)
buf, err = ReadWithLimit(bytes.NewBuffer(bs), 9999999)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []byte("0123456789abcdef"), buf)
}

13
modules/util/keypair_test.go
View file

@ -14,11 +14,12 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestKeygen(t *testing.T) {
priv, pub, err := GenerateKeyPair(2048)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotEmpty(t, priv)
assert.NotEmpty(t, pub)
@ -29,7 +30,7 @@ func TestKeygen(t *testing.T) {
func TestSignUsingKeys(t *testing.T) {
priv, pub, err := GenerateKeyPair(2048)
assert.NoError(t, err)
require.NoError(t, err)
privPem, _ := pem.Decode([]byte(priv))
if privPem == nil || privPem.Type != "RSA PRIVATE KEY" {
@ -37,7 +38,7 @@ func TestSignUsingKeys(t *testing.T) {
}
privParsed, err := x509.ParsePKCS1PrivateKey(privPem.Bytes)
assert.NoError(t, err)
require.NoError(t, err)
pubPem, _ := pem.Decode([]byte(pub))
if pubPem == nil || pubPem.Type != "PUBLIC KEY" {
@ -45,7 +46,7 @@ func TestSignUsingKeys(t *testing.T) {
}
pubParsed, err := x509.ParsePKIXPublicKey(pubPem.Bytes)
assert.NoError(t, err)
require.NoError(t, err)
// Sign
msg := "activity pub is great!"
@ -53,9 +54,9 @@ func TestSignUsingKeys(t *testing.T) {
h.Write([]byte(msg))
d := h.Sum(nil)
sig, err := rsa.SignPKCS1v15(rand.Reader, privParsed, crypto.SHA256, d)
assert.NoError(t, err)
require.NoError(t, err)
// Verify
err = rsa.VerifyPKCS1v15(pubParsed.(*rsa.PublicKey), crypto.SHA256, d, sig)
assert.NoError(t, err)
require.NoError(t, err)
}

7
modules/util/legacy_test.go
View file

@ -10,6 +10,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestCopyFile(t *testing.T) {
@ -28,10 +29,10 @@ func TestCopyFile(t *testing.T) {
}()
err := os.WriteFile(srcFile, testContent, 0o777)
assert.NoError(t, err)
require.NoError(t, err)
err = CopyFile(srcFile, dstFile)
assert.NoError(t, err)
require.NoError(t, err)
dstContent, err := os.ReadFile(dstFile)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, testContent, dstContent)
}

12
modules/util/pack_test.go
View file

@ -6,7 +6,7 @@ package util
import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestPackAndUnpackData(t *testing.T) {
@ -19,10 +19,10 @@ func TestPackAndUnpackData(t *testing.T) {
var f2 float32
data, err := PackData(s, i, f)
assert.NoError(t, err)
require.NoError(t, err)
assert.NoError(t, UnpackData(data, &s2, &i2, &f2))
assert.NoError(t, UnpackData(data, &s2))
assert.Error(t, UnpackData(data, &i2))
assert.Error(t, UnpackData(data, &s2, &f2))
require.NoError(t, UnpackData(data, &s2, &i2, &f2))
require.NoError(t, UnpackData(data, &s2))
require.Error(t, UnpackData(data, &i2))
require.Error(t, UnpackData(data, &s2, &f2))
}

5
modules/util/path_test.go
View file

@ -9,6 +9,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestFileURLToPath(t *testing.T) {
@ -48,9 +49,9 @@ func TestFileURLToPath(t *testing.T) {
u, _ := url.Parse(c.url)
p, err := FileURLToPath(u)
if c.haserror {
assert.Error(t, err, "case %d: should return error", n)
require.Error(t, err, "case %d: should return error", n)
} else {
assert.NoError(t, err, "case %d: should not return error", n)
require.NoError(t, err, "case %d: should not return error", n)
assert.Equal(t, c.expected, p, "case %d: should be equal", n)
}
}

17
modules/util/rotatingfilewriter/writer_test.go
View file

@ -11,6 +11,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestCompressOldFile(t *testing.T) {
@ -19,9 +20,9 @@ func TestCompressOldFile(t *testing.T) {
nonGzip := filepath.Join(tmpDir, "test-nonGzip")
f, err := os.OpenFile(fname, os.O_CREATE|os.O_WRONLY, 0o660)
assert.NoError(t, err)
require.NoError(t, err)
ng, err := os.OpenFile(nonGzip, os.O_CREATE|os.O_WRONLY, 0o660)
assert.NoError(t, err)
require.NoError(t, err)
for i := 0; i < 999; i++ {
f.WriteString("This is a test file\n")
@ -31,18 +32,18 @@ func TestCompressOldFile(t *testing.T) {
ng.Close()
err = compressOldFile(fname, gzip.DefaultCompression)
assert.NoError(t, err)
require.NoError(t, err)
_, err = os.Lstat(fname + ".gz")
assert.NoError(t, err)
require.NoError(t, err)
f, err = os.Open(fname + ".gz")
assert.NoError(t, err)
require.NoError(t, err)
zr, err := gzip.NewReader(f)
assert.NoError(t, err)
require.NoError(t, err)
data, err := io.ReadAll(zr)
assert.NoError(t, err)
require.NoError(t, err)
original, err := os.ReadFile(nonGzip)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, original, data)
}

43
modules/util/util_test.go
View file

@ -11,6 +11,7 @@ import (
"code.gitea.io/gitea/modules/optional"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestURLJoin(t *testing.T) {
@ -122,36 +123,36 @@ 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.NoError(t, err)
assert.GreaterOrEqual(t, randInt, int64(0))
assert.LessOrEqual(t, randInt, int64(255))
require.NoError(t, err)
}
func Test_RandomString(t *testing.T) {
str1, err := CryptoRandomString(32)
assert.NoError(t, err)
require.NoError(t, err)
matches, err := regexp.MatchString(`^[a-zA-Z0-9]{32}$`, str1)
assert.NoError(t, err)
require.NoError(t, err)
assert.True(t, matches)
str2, err := CryptoRandomString(32)
assert.NoError(t, err)
require.NoError(t, err)
matches, err = regexp.MatchString(`^[a-zA-Z0-9]{32}$`, str1)
assert.NoError(t, err)
require.NoError(t, err)
assert.True(t, matches)
assert.NotEqual(t, str1, str2)
str3, err := CryptoRandomString(256)
assert.NoError(t, err)
require.NoError(t, err)
matches, err = regexp.MatchString(`^[a-zA-Z0-9]{256}$`, str3)
assert.NoError(t, err)
require.NoError(t, err)
assert.True(t, matches)
str4, err := CryptoRandomString(256)
assert.NoError(t, err)
require.NoError(t, err)
matches, err = regexp.MatchString(`^[a-zA-Z0-9]{256}$`, str4)
assert.NoError(t, err)
require.NoError(t, err)
assert.True(t, matches)
assert.NotEqual(t, str3, str4)
@ -159,18 +160,18 @@ func Test_RandomString(t *testing.T) {
func Test_RandomBytes(t *testing.T) {
bytes1, err := CryptoRandomBytes(32)
assert.NoError(t, err)
require.NoError(t, err)
bytes2, err := CryptoRandomBytes(32)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotEqual(t, bytes1, bytes2)
bytes3, err := CryptoRandomBytes(256)
assert.NoError(t, err)
require.NoError(t, err)
bytes4, err := CryptoRandomBytes(256)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotEqual(t, bytes3, bytes4)
}
@ -223,20 +224,20 @@ 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"))
}