Skip to content

fix assert func args #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k7a-tomohiro merged 3 commits into from
Apr 21, 2026
Merged

fix assert func args #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02cc357
fix assert func args
k7a-tomohiro Apr 20, 2026
62738fd
fix lint error
k7a-tomohiro Apr 20, 2026
d0566de
fix lint error
k7a-tomohiro Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devtools/http-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func main() {
fmt.Fprintln(w, "Hello Go!!")
fmt.Fprintln(w, "It's", time.Now())
fmt.Fprintln(w, strings.Repeat("-", 50))
fmt.Fprintln(w, spew.Sdump(r))
fmt.Fprintln(w, spew.Sdump(r)) // #nosec G705: XSS via taint analysis (gosec)
}),
ReadTimeout: 30 * time.Second,
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aileron-projects/go

go 1.25
go 1.26

require (
github.com/davecgh/go-spew v1.1.1
Expand Down
20 changes: 10 additions & 10 deletions zcmp/cmp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ func TestTrue(t *testing.T) {
t.Run("test int", func(t *testing.T) {
t.Run("true", func(t *testing.T) {
v := zcmp.True(true, 1, 2)
ztesting.AssertEqual(t, "invalid response value.", 1, v)
ztesting.AssertEqual(t, 1, v)
})
t.Run("false", func(t *testing.T) {
v := zcmp.True(false, 1, 2)
ztesting.AssertEqual(t, "invalid response value.", 2, v)
ztesting.AssertEqual(t, 2, v)
})
})

t.Run("test nil", func(t *testing.T) {
t.Run("true", func(t *testing.T) {
var np *struct{}
v := zcmp.True(true, nil, np)
ztesting.AssertEqual(t, "invalid response value.", nil, v)
ztesting.AssertEqual(t, nil, v)
})
t.Run("false", func(t *testing.T) {
var np *struct{}
v := zcmp.True(false, nil, np)
ztesting.AssertEqual(t, "invalid response value.", np, v)
ztesting.AssertEqual(t, np, v)
})
})
}
Expand All @@ -41,24 +41,24 @@ func TestFalse(t *testing.T) {
t.Run("test int", func(t *testing.T) {
t.Run("false", func(t *testing.T) {
v := zcmp.False(false, 1, 2)
ztesting.AssertEqual(t, "invalid response value.", 1, v)
ztesting.AssertEqual(t, 1, v)
})
t.Run("true", func(t *testing.T) {
v := zcmp.False(true, 1, 2)
ztesting.AssertEqual(t, "invalid response value.", 2, v)
ztesting.AssertEqual(t, 2, v)
})
})

t.Run("test nil", func(t *testing.T) {
t.Run("false", func(t *testing.T) {
var np *struct{}
v := zcmp.False(false, nil, np)
ztesting.AssertEqual(t, "invalid response value.", nil, v)
ztesting.AssertEqual(t, nil, v)
})
t.Run("true", func(t *testing.T) {
var np *struct{}
v := zcmp.False(true, nil, np)
ztesting.AssertEqual(t, "invalid response value.", np, v)
ztesting.AssertEqual(t, np, v)
})
})
}
Expand Down Expand Up @@ -93,7 +93,7 @@ func TestOrSlice(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
v := zcmp.OrSlice(tc.vals...)
ztesting.AssertEqual(t, "wrong element returned.", tc.want, v)
ztesting.AssertEqual(t, tc.want, v)
})
}
}
Expand Down Expand Up @@ -128,7 +128,7 @@ func TestOrMap(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
v := zcmp.OrMap(tc.vals...)
ztesting.AssertEqual(t, "wrong element returned.", tc.want, v)
ztesting.AssertEqual(t, tc.want, v)
})
}
}
14 changes: 7 additions & 7 deletions zcrypto/internal/copy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ func TestCopy(t *testing.T) {
s := cipher.NewCTR(c, iv)
var w, ww bytes.Buffer
err := internal.Copy(s, &w, strings.NewReader("test"))
ztesting.AssertEqualErr(t, "error is not nil", nil, err)
ztesting.AssertEqual(t, "message unexpectedly match", false, w.String() == "test")
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, false, w.String() == "test")
err = zaes.CopyOFB(key, iv, &ww, strings.NewReader(w.String()))
ztesting.AssertEqualErr(t, "error is not nil", nil, err)
ztesting.AssertEqual(t, "message not match", "test", ww.String())
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, "test", ww.String())
})
t.Run("read error", func(t *testing.T) {
key := []byte("1234567890123456")
Expand All @@ -36,7 +36,7 @@ func TestCopy(t *testing.T) {
s := cipher.NewCTR(c, iv)
var w bytes.Buffer
err := internal.Copy(s, &w, ziotest.ErrReader(strings.NewReader("test"), 3))
ztesting.AssertEqualErr(t, "error not match", io.ErrClosedPipe, err)
ztesting.AssertEqualErr(t, io.ErrClosedPipe, err)
})
t.Run("write error", func(t *testing.T) {
key := []byte("1234567890123456")
Expand All @@ -45,7 +45,7 @@ func TestCopy(t *testing.T) {
s := cipher.NewCTR(c, iv)
var w bytes.Buffer
err := internal.Copy(s, ziotest.ErrWriter(&w, 3), strings.NewReader("test"))
ztesting.AssertEqualErr(t, "error not match", io.ErrClosedPipe, err)
ztesting.AssertEqualErr(t, io.ErrClosedPipe, err)
})
t.Run("short write error", func(t *testing.T) {
key := []byte("1234567890123456")
Expand All @@ -54,6 +54,6 @@ func TestCopy(t *testing.T) {
s := cipher.NewCTR(c, iv)
var w bytes.Buffer
err := internal.Copy(s, ziotest.ShortWriter(&w, 3), strings.NewReader("test"))
ztesting.AssertEqualErr(t, "error not match", io.ErrShortWrite, err)
ztesting.AssertEqualErr(t, io.ErrShortWrite, err)
})
}
52 changes: 26 additions & 26 deletions zcrypto/internal/padding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ func TestPadPKCS7(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
b, err := internal.PadPKCS7(tc.blockSize, tc.data)
ztesting.AssertEqualErr(t, "error not match", tc.err, err)
ztesting.AssertEqual(t, "data not match", tc.want, b)
ztesting.AssertEqualErr(t, tc.err, err)
ztesting.AssertEqual(t, tc.want, b)
if len(b) > 0 {
bb, err := internal.UnpadPKCS7(tc.blockSize, b)
ztesting.AssertEqualErr(t, "non nil error", nil, err)
ztesting.AssertEqual(t, "data not match", tc.data, bb)
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.data, bb)
}
})
}
Expand Down Expand Up @@ -182,12 +182,12 @@ func TestUnpadPKCS7(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
b, err := internal.UnpadPKCS7(tc.blockSize, tc.data)
ztesting.AssertEqualErr(t, "error not match", tc.err, err)
ztesting.AssertEqual(t, "data not match", tc.want, b)
ztesting.AssertEqualErr(t, tc.err, err)
ztesting.AssertEqual(t, tc.want, b)
if tc.err == nil {
bb, err := internal.PadPKCS7(tc.blockSize, b)
ztesting.AssertEqualErr(t, "non nil error", nil, err)
ztesting.AssertEqual(t, "data not match", tc.data, bb)
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.data, bb)
}
})
}
Expand Down Expand Up @@ -268,12 +268,12 @@ func TestPadISO7816(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
b, err := internal.PadISO7816(tc.blockSize, tc.data)
ztesting.AssertEqualErr(t, "error not match", tc.err, err)
ztesting.AssertEqual(t, "data not match", tc.want, b)
ztesting.AssertEqualErr(t, tc.err, err)
ztesting.AssertEqual(t, tc.want, b)
if len(b) > 0 {
bb, err := internal.UnpadISO7816(tc.blockSize, b)
ztesting.AssertEqualErr(t, "non nil error", nil, err)
ztesting.AssertEqual(t, "data not match", tc.data, bb)
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.data, bb)
}
})
}
Expand Down Expand Up @@ -357,12 +357,12 @@ func TestUnpadISO7816(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
b, err := internal.UnpadISO7816(tc.blockSize, tc.data)
ztesting.AssertEqualErr(t, "error not match", tc.err, err)
ztesting.AssertEqual(t, "data not match", tc.want, b)
ztesting.AssertEqualErr(t, tc.err, err)
ztesting.AssertEqual(t, tc.want, b)
if tc.err == nil {
bb, err := internal.PadISO7816(tc.blockSize, b)
ztesting.AssertEqualErr(t, "non nil error", nil, err)
ztesting.AssertEqual(t, "data not match", tc.data, bb)
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.data, bb)
}
})
}
Expand Down Expand Up @@ -444,12 +444,12 @@ func TestPadISO10126(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
b, err := internal.PadISO10126(tc.blockSize, tc.data)
ztesting.AssertEqualErr(t, "error not match", tc.err, err)
ztesting.AssertEqual(t, "data not match", tc.want, b)
ztesting.AssertEqualErr(t, tc.err, err)
ztesting.AssertEqual(t, tc.want, b)
if len(b) > 0 {
bb, err := internal.UnpadISO10126(tc.blockSize, b)
ztesting.AssertEqualErr(t, "non nil error", nil, err)
ztesting.AssertEqual(t, "data not match", tc.data, bb)
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.data, bb)
}
})
}
Expand All @@ -459,8 +459,8 @@ func TestPadISO10126_ReadError(t *testing.T) {
done := ztesting.ReplaceRandReader(strings.NewReader("1"))
defer done()
b, err := internal.PadISO10126(10, []byte("12345"))
ztesting.AssertEqualErr(t, "error not match", io.ErrUnexpectedEOF, err)
ztesting.AssertEqual(t, "data not match", nil, b)
ztesting.AssertEqualErr(t, io.ErrUnexpectedEOF, err)
ztesting.AssertEqual(t, nil, b)
}

func TestUnpadISO10126(t *testing.T) {
Expand Down Expand Up @@ -541,12 +541,12 @@ func TestUnpadISO10126(t *testing.T) {
for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
b, err := internal.UnpadISO10126(tc.blockSize, tc.data)
ztesting.AssertEqualErr(t, "error not match", tc.err, err)
ztesting.AssertEqual(t, "data not match", tc.want, b)
ztesting.AssertEqualErr(t, tc.err, err)
ztesting.AssertEqual(t, tc.want, b)
if tc.err == nil {
bb, err := internal.PadISO10126(tc.blockSize, b)
ztesting.AssertEqualErr(t, "non nil error", nil, err)
ztesting.AssertEqual(t, "data not match", tc.data, bb)
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.data, bb)
}
})
}
Expand Down
28 changes: 14 additions & 14 deletions zcrypto/zaes/aes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@ import (
func TestErrCipherLength(t *testing.T) {
t.Parallel()
e := ErrCipherLength(1)
ztesting.AssertEqual(t, "message not match", "zaes: incorrect ciphertext length. got:1", e.Error())
ztesting.AssertEqual(t, "zaes: incorrect ciphertext length. got:1", e.Error())
}

func TestNewAES(t *testing.T) {
t.Parallel()
t.Run("invalid key", func(t *testing.T) {
cb, iv, err := newAES([]byte("short"))
ztesting.AssertEqualErr(t, "unexpected error", aes.KeySizeError(5), err)
ztesting.AssertEqual(t, "non nil cipher block returned", nil, cb)
ztesting.AssertEqual(t, "non empty iv returned", nil, iv)
ztesting.AssertEqualErr(t, aes.KeySizeError(5), err)
ztesting.AssertEqual(t, nil, cb)
ztesting.AssertEqual(t, nil, iv)
})
t.Run("16 bytes key", func(t *testing.T) {
_, iv, err := newAES([]byte("1234567890123456"))
ztesting.AssertEqualErr(t, "non nil error returned", nil, err)
ztesting.AssertEqual(t, "iv length invalid", 16, len(iv))
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, 16, len(iv))
})
t.Run("24 bytes key", func(t *testing.T) {
_, iv, err := newAES([]byte("123456789012345678901234"))
ztesting.AssertEqualErr(t, "non nil error returned", nil, err)
ztesting.AssertEqual(t, "iv length invalid", 16, len(iv))
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, 16, len(iv))
})
t.Run("32 bytes key", func(t *testing.T) {
_, iv, err := newAES([]byte("12345678901234567890123456789012"))
ztesting.AssertEqualErr(t, "non nil error returned", nil, err)
ztesting.AssertEqual(t, "iv length invalid", 16, len(iv))
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, 16, len(iv))
})
}

Expand Down Expand Up @@ -77,14 +77,14 @@ func TestEncryptDecrypt(t *testing.T) {
done := ztesting.ReplaceRandReader(strings.NewReader("abcdefghijklmnop"))
defer done()
ciphertext, err := tc.enc([]byte(tc.key), []byte(tc.plain))
ztesting.AssertEqualErr(t, "error is not nil", nil, err)
ztesting.AssertEqual(t, "ciphertext not match", tc.cipher, hex.EncodeToString(ciphertext))
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.cipher, hex.EncodeToString(ciphertext))
})
t.Run(tc.name+"_decrypt", func(t *testing.T) {
cipher, _ := hex.DecodeString(tc.cipher)
plain, err := tc.dec([]byte(tc.key), cipher)
ztesting.AssertEqualErr(t, "error is not nil", nil, err)
ztesting.AssertEqual(t, "plaintext not match", tc.plain, string(plain))
ztesting.AssertEqualErr(t, nil, err)
ztesting.AssertEqual(t, tc.plain, string(plain))
})
}
}
Loading
Loading