77 "testing"
88
99 "github.com/stretchr/testify/assert"
10+ "github.com/stretchr/testify/require"
1011)
1112
1213var (
@@ -74,14 +75,14 @@ var (
7475func TestNewASN1PBE (t * testing.T ) {
7576 for _ , tc := range nssPBETestCases {
7677 nssRaw , err := hex .DecodeString (tc .RawHexPBE )
77- assert . Equal ( t , nil , err )
78+ require . NoError ( t , err )
7879 pbe , err := NewASN1PBE (nssRaw )
79- assert . Equal ( t , nil , err )
80+ require . NoError ( t , err )
8081 nssPBETC , ok := pbe .(nssPBE )
81- assert .Equal ( t , true , ok )
82+ assert .True ( t , ok )
8283 assert .Equal (t , nssPBETC .Encrypted , tc .Encrypted )
8384 assert .Equal (t , nssPBETC .AlgoAttr .SaltAttr .EntrySalt , tc .GlobalSalt )
84- assert .Equal (t , nssPBETC .AlgoAttr .SaltAttr .Len , 20 )
85+ assert .Equal (t , 20 , nssPBETC .AlgoAttr .SaltAttr .Len )
8586 assert .Equal (t , nssPBETC .AlgoAttr .ObjectIdentifier , tc .ObjectIdentifier )
8687 }
8788}
@@ -108,8 +109,8 @@ func TestNssPBE_Encrypt(t *testing.T) {
108109 },
109110 }
110111 encrypted , err := nssPBETC .Encrypt (tc .GlobalSalt , tc .Plaintext )
111- assert . Equal ( t , nil , err )
112- assert .Equal (t , true , len ( encrypted ) > 0 )
112+ require . NoError ( t , err )
113+ assert .NotEmpty (t , encrypted )
113114 assert .Equal (t , nssPBETC .Encrypted , encrypted )
114115 }
115116}
@@ -136,20 +137,20 @@ func TestNssPBE_Decrypt(t *testing.T) {
136137 },
137138 }
138139 decrypted , err := nssPBETC .Decrypt (tc .GlobalSalt )
139- assert . Equal ( t , nil , err )
140- assert .Equal (t , true , len ( decrypted ) > 0 )
140+ require . NoError ( t , err )
141+ assert .NotEmpty (t , decrypted )
141142 assert .Equal (t , pbePlaintext , decrypted )
142143 }
143144}
144145
145146func TestNewASN1PBE_MetaPBE (t * testing.T ) {
146147 for _ , tc := range metaPBETestCases {
147148 metaRaw , err := hex .DecodeString (tc .RawHexPBE )
148- assert . Equal ( t , nil , err )
149+ require . NoError ( t , err )
149150 pbe , err := NewASN1PBE (metaRaw )
150- assert . Equal ( t , nil , err )
151+ require . NoError ( t , err )
151152 metaPBETC , ok := pbe .(metaPBE )
152- assert .Equal ( t , true , ok )
153+ assert .True ( t , ok )
153154 assert .Equal (t , metaPBETC .Encrypted , tc .Encrypted )
154155 assert .Equal (t , metaPBETC .AlgoAttr .Data .IVData .IV , tc .IV )
155156 assert .Equal (t , metaPBETC .AlgoAttr .Data .IVData .ObjectIdentifier , objWithSHA256AndAES )
@@ -193,8 +194,8 @@ func TestMetaPBE_Encrypt(t *testing.T) {
193194 Encrypted : tc .Encrypted ,
194195 }
195196 encrypted , err := metaPBETC .Encrypt (tc .GlobalSalt , tc .Plaintext )
196- assert . Equal ( t , nil , err )
197- assert .Equal (t , true , len ( encrypted ) > 0 )
197+ require . NoError ( t , err )
198+ assert .NotEmpty (t , encrypted )
198199 assert .Equal (t , metaPBETC .Encrypted , encrypted )
199200 }
200201}
@@ -236,20 +237,20 @@ func TestMetaPBE_Decrypt(t *testing.T) {
236237 Encrypted : tc .Encrypted ,
237238 }
238239 decrypted , err := metaPBETC .Decrypt (tc .GlobalSalt )
239- assert . Equal ( t , nil , err )
240- assert .Equal (t , true , len ( decrypted ) > 0 )
240+ require . NoError ( t , err )
241+ assert .NotEmpty (t , decrypted )
241242 assert .Equal (t , pbePlaintext , decrypted )
242243 }
243244}
244245
245246func TestNewASN1PBE_LoginPBE (t * testing.T ) {
246247 for _ , tc := range loginPBETestCases {
247248 loginRaw , err := hex .DecodeString (tc .RawHexPBE )
248- assert . Equal ( t , nil , err )
249+ require . NoError ( t , err )
249250 pbe , err := NewASN1PBE (loginRaw )
250- assert . Equal ( t , nil , err )
251+ require . NoError ( t , err )
251252 loginPBETC , ok := pbe .(loginPBE )
252- assert .Equal ( t , true , ok )
253+ assert .True ( t , ok )
253254 assert .Equal (t , loginPBETC .Encrypted , tc .Encrypted )
254255 assert .Equal (t , loginPBETC .Data .IV , tc .IV )
255256 assert .Equal (t , loginPBETC .Data .ObjectIdentifier , objWithMD5AndDESCBC )
@@ -270,8 +271,8 @@ func TestLoginPBE_Encrypt(t *testing.T) {
270271 Encrypted : tc .Encrypted ,
271272 }
272273 encrypted , err := loginPBETC .Encrypt (tc .GlobalSalt , plainText )
273- assert . Equal ( t , nil , err )
274- assert .Equal (t , true , len ( encrypted ) > 0 )
274+ require . NoError ( t , err )
275+ assert .NotEmpty (t , encrypted )
275276 assert .Equal (t , loginPBETC .Encrypted , encrypted )
276277 }
277278}
@@ -290,8 +291,8 @@ func TestLoginPBE_Decrypt(t *testing.T) {
290291 Encrypted : tc .Encrypted ,
291292 }
292293 decrypted , err := loginPBETC .Decrypt (tc .GlobalSalt )
293- assert . Equal ( t , nil , err )
294- assert .Equal (t , true , len ( decrypted ) > 0 )
294+ require . NoError ( t , err )
295+ assert .NotEmpty (t , decrypted )
295296 assert .Equal (t , pbePlaintext , decrypted )
296297 }
297298}
0 commit comments