Merge pull request #1 from MaximeZmt/Work-Mzmt-RefactorEvotingMod_Test

Change some error checking method
MaximeZmt · Feb 27, 2024 · 036084d · 036084d
2 parents c819e31 + 7998bd6
commit 036084d
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/contracts/evoting/mod_test.go b/contracts/evoting/mod_test.go
@@ -202,15 +202,15 @@ func TestCommand_CastVote(t *testing.T) {
 	require.EqualError(t, err, unmarshalTransactionErr)
 
 	err = cmd.castVote(fake.NewBadSnapshot(), makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), "failed to get key")
+	require.ErrorContains(t, err, "failed to get key")
 
 	snap := fake.NewSnapshot()
 
 	err = snap.Set(dummyFormIDBuff, invalidForm)
 	require.NoError(t, err)
 
 	err = cmd.castVote(snap, makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), deserializeErr)
+	require.ErrorContains(t, err, deserializeErr)
 
 	err = snap.Set(dummyFormIDBuff, formBuf)
 	require.NoError(t, err)
@@ -330,15 +330,15 @@ func TestCommand_CloseForm(t *testing.T) {
 	require.EqualError(t, err, unmarshalTransactionErr)
 
 	err = cmd.closeForm(fake.NewBadSnapshot(), makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), "failed to get key")
+	require.ErrorContains(t, err, "failed to get key")
 
 	snap := fake.NewSnapshot()
 
 	err = snap.Set(dummyFormIDBuff, invalidForm)
 	require.NoError(t, err)
 
 	err = cmd.closeForm(snap, makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), deserializeErr)
+	require.ErrorContains(t, err, deserializeErr)
 
 	err = snap.Set(dummyFormIDBuff, formBuf)
 	require.NoError(t, err)
@@ -533,7 +533,7 @@ func TestCommand_ShuffleBallotsFormatErrors(t *testing.T) {
 	require.EqualError(t, err, unmarshalTransactionErr)
 
 	err = cmd.shuffleBallots(fake.NewBadSnapshot(), makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), "failed to get key")
+	require.ErrorContains(t, err, "failed to get key")
 
 	// Wrong form id format
 	snap := fake.NewSnapshot()
@@ -542,7 +542,7 @@ func TestCommand_ShuffleBallotsFormatErrors(t *testing.T) {
 	require.NoError(t, err)
 
 	err = cmd.shuffleBallots(snap, makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), deserializeErr)
+	require.ErrorContains(t, err, deserializeErr)
 
 	// Form not closed
 	err = snap.Set(dummyFormIDBuff, formBuf)
@@ -759,15 +759,15 @@ func TestCommand_RegisterPubShares(t *testing.T) {
 	require.EqualError(t, err, unmarshalTransactionErr)
 
 	err = cmd.registerPubshares(fake.NewBadSnapshot(), makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), "failed to get key")
+	require.ErrorContains(t, err, "failed to get key")
 
 	snap := fake.NewSnapshot()
 
 	err = snap.Set(dummyFormIDBuff, invalidForm)
 	require.NoError(t, err)
 
 	err = cmd.registerPubshares(snap, makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), deserializeErr)
+	require.ErrorContains(t, err, deserializeErr)
 
 	err = snap.Set(dummyFormIDBuff, formBuf)
 	require.NoError(t, err)
@@ -960,15 +960,15 @@ func TestCommand_DecryptBallots(t *testing.T) {
 	require.EqualError(t, err, unmarshalTransactionErr)
 
 	err = cmd.combineShares(fake.NewBadSnapshot(), makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), "failed to get key")
+	require.ErrorContains(t, err, "failed to get key")
 
 	snap := fake.NewSnapshot()
 
 	err = snap.Set(dummyFormIDBuff, invalidForm)
 	require.NoError(t, err)
 
 	err = cmd.combineShares(snap, makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), deserializeErr)
+	require.ErrorContains(t, err, deserializeErr)
 
 	err = snap.Set(dummyFormIDBuff, formBuf)
 	require.NoError(t, err)
@@ -1060,15 +1060,15 @@ func TestCommand_CancelForm(t *testing.T) {
 	require.EqualError(t, err, unmarshalTransactionErr)
 
 	err = cmd.cancelForm(fake.NewBadSnapshot(), makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), "failed to get key")
+	require.ErrorContains(t, err, "failed to get key")
 
 	snap := fake.NewSnapshot()
 
 	err = snap.Set(dummyFormIDBuff, invalidForm)
 	require.NoError(t, err)
 
 	err = cmd.cancelForm(snap, makeStep(t, FormArg, string(data)))
-	require.Contains(t, err.Error(), deserializeErr)
+	require.ErrorContains(t, err, deserializeErr)
 
 	err = snap.Set(dummyFormIDBuff, formBuf)
 	require.NoError(t, err)