From 3b7a37cca4048c2cdc92982ad4f4965efccf947a Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Sat, 29 Apr 2023 13:08:53 -0400 Subject: Use required.NoError for faster failure in tests Signed-off-by: Dave Henderson --- crypto/aes_test.go | 15 ++++++++------- crypto/ecdsa_test.go | 11 ++++++----- crypto/pbkdf2_test.go | 23 ++++++++++++----------- crypto/rsa_test.go | 9 +++++---- 4 files changed, 31 insertions(+), 27 deletions(-) (limited to 'crypto') diff --git a/crypto/aes_test.go b/crypto/aes_test.go index df00b14b..f4656a40 100644 --- a/crypto/aes_test.go +++ b/crypto/aes_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestEncryptDecryptAESCBC(t *testing.T) { @@ -24,7 +25,7 @@ func TestEncryptDecryptAESCBC(t *testing.T) { // empty content is a pass-through out, err := EncryptAESCBC(key, []byte{}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte{}, out) testdata := [][]byte{ @@ -37,31 +38,31 @@ func TestEncryptDecryptAESCBC(t *testing.T) { for _, d := range testdata { out, err = EncryptAESCBC(key, d) - assert.NoError(t, err) + require.NoError(t, err) assert.NotEqual(t, d, out) out, err = DecryptAESCBC(key, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d, out) } // 128-bit key key = bytes.Repeat([]byte{'a'}, 16) out, err = EncryptAESCBC(key, []byte("foo")) - assert.NoError(t, err) + require.NoError(t, err) assert.NotEqual(t, []byte("foo"), out) out, err = DecryptAESCBC(key, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte("foo"), out) // 192-bit key key = bytes.Repeat([]byte{'a'}, 24) out, err = EncryptAESCBC(key, []byte("foo")) - assert.NoError(t, err) + require.NoError(t, err) assert.NotEqual(t, []byte("foo"), out) out, err = DecryptAESCBC(key, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte("foo"), out) } diff --git a/crypto/ecdsa_test.go b/crypto/ecdsa_test.go index 186dd7eb..eb7a5ce2 100644 --- a/crypto/ecdsa_test.go +++ b/crypto/ecdsa_test.go @@ -10,6 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func genECDSAPrivKey() (*ecdsa.PrivateKey, string) { @@ -34,28 +35,28 @@ func deriveECPubkey(priv *ecdsa.PrivateKey) string { func TestECDSAGenerateKey(t *testing.T) { key, err := ECDSAGenerateKey(elliptic.P224()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), "-----END EC PRIVATE KEY-----\n")) key, err = ECDSAGenerateKey(elliptic.P256()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), "-----END EC PRIVATE KEY-----\n")) key, err = ECDSAGenerateKey(elliptic.P384()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), "-----END EC PRIVATE KEY-----\n")) key, err = ECDSAGenerateKey(elliptic.P521()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), @@ -74,6 +75,6 @@ func TestECDSADerivePublicKey(t *testing.T) { expected := deriveECPubkey(priv) actual, err := ECDSADerivePublicKey([]byte(privKey)) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, string(actual)) } diff --git a/crypto/pbkdf2_test.go b/crypto/pbkdf2_test.go index 327ee322..a905a41d 100644 --- a/crypto/pbkdf2_test.go +++ b/crypto/pbkdf2_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestPBKDF2(t *testing.T) { @@ -22,7 +23,7 @@ func TestPBKDF2(t *testing.T) { 0x2e, 0x83, 0xfe, 0x1b, 0x13, 0x5a, 0x70, 0xe2, 0x3a, 0xed, 0x76, 0x2e, 0x97, 0x10, 0xa1, 0x2e, }, dk) - assert.NoError(t, err) + require.NoError(t, err) dk, err = PBKDF2([]byte("ThisIsAPassword"), []byte("ThisIsASSID"), 4096, 32, crypto.SHA1) assert.EqualValues(t, []byte{ @@ -31,7 +32,7 @@ func TestPBKDF2(t *testing.T) { 0x20, 0x9b, 0x63, 0xdf, 0x70, 0x7d, 0xd5, 0x08, 0xd1, 0x45, 0x81, 0xf8, 0x98, 0x27, 0x21, 0xaf, }, dk) - assert.NoError(t, err) + require.NoError(t, err) dk, err = PBKDF2([]byte("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), []byte("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"), 4096, 32, crypto.SHA1) assert.EqualValues(t, []byte{ @@ -40,7 +41,7 @@ func TestPBKDF2(t *testing.T) { 0x8c, 0x59, 0xaf, 0xcb, 0x6e, 0xae, 0x73, 0x48, 0x85, 0x00, 0x13, 0x00, 0xa9, 0x81, 0xcc, 0x62, }, dk) - assert.NoError(t, err) + require.NoError(t, err) // some longer hash functions dk, err = PBKDF2([]byte("password"), []byte("IEEE"), 4096, 64, crypto.SHA512) @@ -54,7 +55,7 @@ func TestPBKDF2(t *testing.T) { 0x47, 0x92, 0x35, 0x2f, 0x66, 0x76, 0xd1, 0x3b, 0x20, 0xa4, 0xc0, 0x37, 0x54, 0x90, 0x3d, 0x7e, }, dk) - assert.NoError(t, err) + require.NoError(t, err) } func TestStrToHash(t *testing.T) { @@ -65,23 +66,23 @@ func TestStrToHash(t *testing.T) { assert.Error(t, err) h, err = StrToHash("SHA-1") assert.Equal(t, crypto.SHA1, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA224") assert.Equal(t, crypto.SHA224, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA-256") assert.Equal(t, crypto.SHA256, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA384") assert.Equal(t, crypto.SHA384, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA-512") assert.Equal(t, crypto.SHA512, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA-512/224") assert.Equal(t, crypto.SHA512_224, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA512/256") assert.Equal(t, crypto.SHA512_256, h) - assert.NoError(t, err) + require.NoError(t, err) } diff --git a/crypto/rsa_test.go b/crypto/rsa_test.go index 42297f2c..38c36d06 100644 --- a/crypto/rsa_test.go +++ b/crypto/rsa_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func genPKCS1PrivKey() (*rsa.PrivateKey, string) { @@ -69,10 +70,10 @@ func TestRSACrypt(t *testing.T) { t.Parallel() enc, err := RSAEncrypt(d.encKey, d.in) - assert.NoError(t, err) + require.NoError(t, err) dec, err := RSADecrypt(d.decKey, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.in, dec) }) } @@ -112,7 +113,7 @@ func TestRSAGenerateKey(t *testing.T) { assert.Error(t, err) key, err := RSAGenerateKey(2048) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN RSA PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), @@ -133,6 +134,6 @@ func TestRSADerivePublicKey(t *testing.T) { expected := derivePKIXPubKey(priv) actual, err := RSADerivePublicKey([]byte(privKey)) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, string(actual)) } -- cgit v1.2.3