diff --git a/cryptor/aes_test.go b/cryptor/aes_test.go index 15c7484..928d63e 100644 --- a/cryptor/aes_test.go +++ b/cryptor/aes_test.go @@ -13,10 +13,8 @@ func TestAesEcbEncrypt(t *testing.T) { aesEcbEncrypt := AesEcbEncrypt([]byte(data), []byte(key)) aesEcbDecrypt := AesEcbDecrypt(aesEcbEncrypt, []byte(key)) - if string(aesEcbDecrypt) != data { - internal.LogFailedTestInfo(t, "AesEcbEncrypt/AesEcbDecrypt", data, data, string(aesEcbDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestAesEcbEncrypt") + assert.Equal(data, string(aesEcbDecrypt)) } func TestAesCbcEncrypt(t *testing.T) { @@ -26,10 +24,8 @@ func TestAesCbcEncrypt(t *testing.T) { aesCbcEncrypt := AesCbcEncrypt([]byte(data), []byte(key)) aesCbcDecrypt := AesCbcDecrypt(aesCbcEncrypt, []byte(key)) - if string(aesCbcDecrypt) != data { - internal.LogFailedTestInfo(t, "AesCbcEncrypt/AesCbcDecrypt", data, data, string(aesCbcDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestAesCbcEncrypt") + assert.Equal(data, string(aesCbcDecrypt)) } func TestAesCtrCrypt(t *testing.T) { @@ -39,10 +35,8 @@ func TestAesCtrCrypt(t *testing.T) { aesCtrCrypt := AesCtrCrypt([]byte(data), []byte(key)) aesCtrDeCrypt := AesCtrCrypt(aesCtrCrypt, []byte(key)) - if string(aesCtrDeCrypt) != data { - internal.LogFailedTestInfo(t, "AesCtrCrypt", data, data, string(aesCtrDeCrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestAesCtrCrypt") + assert.Equal(data, string(aesCtrDeCrypt)) } func TestAesCfbEncrypt(t *testing.T) { @@ -52,10 +46,8 @@ func TestAesCfbEncrypt(t *testing.T) { aesCfbEncrypt := AesCfbEncrypt([]byte(data), []byte(key)) aesCfbDecrypt := AesCfbDecrypt(aesCfbEncrypt, []byte(key)) - if string(aesCfbDecrypt) != data { - internal.LogFailedTestInfo(t, "AesCfbEncrypt/AesCfbDecrypt", data, data, string(aesCfbDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestAesCfbEncrypt") + assert.Equal(data, string(aesCfbDecrypt)) } func TestAesOfbEncrypt(t *testing.T) { @@ -65,8 +57,6 @@ func TestAesOfbEncrypt(t *testing.T) { aesOfbEncrypt := AesOfbEncrypt([]byte(data), []byte(key)) aesOfbDecrypt := AesOfbDecrypt(aesOfbEncrypt, []byte(key)) - if string(aesOfbDecrypt) != data { - internal.LogFailedTestInfo(t, "AesOfbEncrypt/AesOfbDecrypt", data, data, string(aesOfbDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestAesOfbEncrypt") + assert.Equal(data, string(aesOfbDecrypt)) } diff --git a/cryptor/basic_test.go b/cryptor/basic_test.go index 95af5cc..f0cccbe 100644 --- a/cryptor/basic_test.go +++ b/cryptor/basic_test.go @@ -1,66 +1,36 @@ package cryptor import ( - "fmt" - "os" "testing" "github.com/duke-git/lancet/internal" ) func TestBase64StdEncode(t *testing.T) { - s := "hello world" - bs := Base64StdEncode(s) - - if bs != "aGVsbG8gd29ybGQ=" { - internal.LogFailedTestInfo(t, "Base64StdEncode", s, "aGVsbG8gd29ybGQ=", bs) - t.FailNow() - } + assert := internal.NewAssert(t, "TestBase64StdEncode") + assert.Equal("aGVsbG8gd29ybGQ=", Base64StdEncode("hello world")) } func TestBase64StdDecode(t *testing.T) { - bs := "aGVsbG8gd29ybGQ=" - s := Base64StdDecode(bs) - - if s != "hello world" { - internal.LogFailedTestInfo(t, "Base64StdDecode", bs, "hello world=", s) - t.FailNow() - } + assert := internal.NewAssert(t, "TestBase64StdDecode") + assert.Equal("hello world", Base64StdEncode("aGVsbG8gd29ybGQ=")) } func TestMd5String(t *testing.T) { - s := "hello" - smd5 := Md5String(s) - expected := "5d41402abc4b2a76b9719d911017c592" - - if smd5 != expected { - internal.LogFailedTestInfo(t, "Md5String", s, expected, smd5) - t.FailNow() - } + assert := internal.NewAssert(t, "TestMd5String") + assert.Equal("5d41402abc4b2a76b9719d911017c592", Md5String("hello")) } func TestMd5File(t *testing.T) { - file, _ := os.Create("./hello.txt") - defer file.Close() - file.WriteString("hello\n") - - fileMd5, err := Md5File("./hello.txt") - if err != nil { - t.FailNow() - } - fmt.Println(fileMd5) + fileMd5, err := Md5File("./basic.go") + assert := internal.NewAssert(t, "TestMd5File") + assert.IsNotNil(fileMd5) + assert.IsNil(err) } func TestHmacMd5(t *testing.T) { - s := "hello world" - key := "12345" - hmacMd5 := HmacMd5(s, key) - expected := "5f4c9faaff0a1ad3007d9ddc06abe36d" - - if hmacMd5 != expected { - internal.LogFailedTestInfo(t, "HmacMd5", s, expected, hmacMd5) - t.FailNow() - } + assert := internal.NewAssert(t, "TestHmacMd5") + assert.Equal("5f4c9faaff0a1ad3007d9ddc06abe36d", HmacMd5("hello world", "12345")) } func TestHmacSha1(t *testing.T) { @@ -69,10 +39,8 @@ func TestHmacSha1(t *testing.T) { hmacSha1 := HmacSha1(s, key) expected := "3826f812255d8683f051ee97346d1359234d5dbd" - if hmacSha1 != expected { - internal.LogFailedTestInfo(t, "HmacSha1", s, expected, hmacSha1) - t.FailNow() - } + assert := internal.NewAssert(t, "TestHmacSha1") + assert.Equal(expected, hmacSha1) } func TestHmacSha256(t *testing.T) { @@ -81,10 +49,8 @@ func TestHmacSha256(t *testing.T) { hmacSha256 := HmacSha256(s, key) expected := "9dce2609f2d67d41f74c7f9efc8ccd44370d41ad2de52982627588dfe7289ab8" - if hmacSha256 != expected { - internal.LogFailedTestInfo(t, "HmacSha256", s, expected, hmacSha256) - t.FailNow() - } + assert := internal.NewAssert(t, "TestHmacSha256") + assert.Equal(expected, hmacSha256) } func TestHmacSha512(t *testing.T) { @@ -93,10 +59,8 @@ func TestHmacSha512(t *testing.T) { hmacSha512 := HmacSha512(s, key) expected := "5b1563ac4e9b49c9ada8ccb232588fc4f0c30fd12f756b3a0b95af4985c236ca60925253bae10ce2c6bf9af1c1679b51e5395ff3d2826c0a2c7c0d72225d4175" - if hmacSha512 != expected { - internal.LogFailedTestInfo(t, "HmacSha512", s, expected, hmacSha512) - t.FailNow() - } + assert := internal.NewAssert(t, "TestHmacSha512") + assert.Equal(expected, hmacSha512) } func TestSha1(t *testing.T) { @@ -104,10 +68,8 @@ func TestSha1(t *testing.T) { sha1 := Sha1(s) expected := "2aae6c35c94fcfb415dbe95f408b9ce91ee846ed" - if sha1 != expected { - internal.LogFailedTestInfo(t, "Sha1", s, expected, sha1) - t.FailNow() - } + assert := internal.NewAssert(t, "TestSha1") + assert.Equal(expected, sha1) } func TestSha256(t *testing.T) { @@ -115,10 +77,8 @@ func TestSha256(t *testing.T) { sha256 := Sha256(s) expected := "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9" - if sha256 != expected { - internal.LogFailedTestInfo(t, "Sha256", s, expected, sha256) - t.FailNow() - } + assert := internal.NewAssert(t, "TestSha256") + assert.Equal(expected, sha256) } func TestSha512(t *testing.T) { @@ -126,8 +86,6 @@ func TestSha512(t *testing.T) { sha512 := Sha512(s) expected := "309ecc489c12d6eb4cc40f50c902f2b4d0ed77ee511a7c7a9bcd3ca86d4cd86f989dd35bc5ff499670da34255b45b0cfd830e81f605dcf7dc5542e93ae9cd76f" - if sha512 != expected { - internal.LogFailedTestInfo(t, "Sha512", s, expected, sha512) - t.FailNow() - } + assert := internal.NewAssert(t, "TestSha512") + assert.Equal(expected, sha512) } diff --git a/cryptor/des_test.go b/cryptor/des_test.go index f73336e..229fd41 100644 --- a/cryptor/des_test.go +++ b/cryptor/des_test.go @@ -13,10 +13,8 @@ func TestDesEcbEncrypt(t *testing.T) { desEcbEncrypt := DesEcbEncrypt([]byte(data), []byte(key)) desEcbDecrypt := DesEcbDecrypt(desEcbEncrypt, []byte(key)) - if string(desEcbDecrypt) != data { - internal.LogFailedTestInfo(t, "DesEcbEncrypt/DesEcbDecrypt", data, data, string(desEcbDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestDesEcbEncrypt") + assert.Equal(data, string(desEcbDecrypt)) } func TestDesCbcEncrypt(t *testing.T) { @@ -26,10 +24,8 @@ func TestDesCbcEncrypt(t *testing.T) { desCbcEncrypt := DesCbcEncrypt([]byte(data), []byte(key)) desCbcDecrypt := DesCbcDecrypt(desCbcEncrypt, []byte(key)) - if string(desCbcDecrypt) != data { - internal.LogFailedTestInfo(t, "DesCbcEncrypt/DesCbcDecrypt", data, data, string(desCbcDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestDesCbcEncrypt") + assert.Equal(data, string(desCbcDecrypt)) } func TestDesCtrCrypt(t *testing.T) { @@ -39,10 +35,8 @@ func TestDesCtrCrypt(t *testing.T) { desCtrCrypt := DesCtrCrypt([]byte(data), []byte(key)) desCtrDeCrypt := DesCtrCrypt(desCtrCrypt, []byte(key)) - if string(desCtrDeCrypt) != data { - internal.LogFailedTestInfo(t, "DesCtrCrypt", data, data, string(desCtrDeCrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestDesCtrCrypt") + assert.Equal(data, string(desCtrDeCrypt)) } func TestDesCfbEncrypt(t *testing.T) { @@ -52,10 +46,8 @@ func TestDesCfbEncrypt(t *testing.T) { desCfbEncrypt := DesCfbEncrypt([]byte(data), []byte(key)) desCfbDecrypt := DesCfbDecrypt(desCfbEncrypt, []byte(key)) - if string(desCfbDecrypt) != data { - internal.LogFailedTestInfo(t, "DesCfbEncrypt/DesCfbDecrypt", data, data, string(desCfbDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestDesCfbEncrypt") + assert.Equal(data, string(desCfbDecrypt)) } func TestDesOfbEncrypt(t *testing.T) { @@ -65,8 +57,6 @@ func TestDesOfbEncrypt(t *testing.T) { desOfbEncrypt := DesOfbEncrypt([]byte(data), []byte(key)) desOfbDecrypt := DesOfbDecrypt(desOfbEncrypt, []byte(key)) - if string(desOfbDecrypt) != data { - internal.LogFailedTestInfo(t, "DesOfbEncrypt/DesOfbDecrypt", data, data, string(desOfbDecrypt)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestDesOfbEncrypt") + assert.Equal(data, string(desOfbDecrypt)) } diff --git a/cryptor/rsa_test.go b/cryptor/rsa_test.go index 58be7c2..8ed2a34 100644 --- a/cryptor/rsa_test.go +++ b/cryptor/rsa_test.go @@ -12,8 +12,6 @@ func TestRsaEncrypt(t *testing.T) { encrypted := RsaEncrypt(data, "rsa_public.pem") decrypted := RsaDecrypt(encrypted, "rsa_private.pem") - if string(data) != string(decrypted) { - internal.LogFailedTestInfo(t, "RsaEncrypt/RsaDecrypt", string(data), string(data), string(decrypted)) - t.FailNow() - } + assert := internal.NewAssert(t, "TestRsaEncrypt") + assert.Equal(string(data), string(decrypted)) }