Cleanup use of assert.Error/Contains with ErrorContains

config_test.go

@@ -138,8 +138,7 @@ func TestConfigWithMissingAttributes(t *testing.T) {
 		t.Run(tt.desc, func(t *testing.T) {
 			cfg := tt.cfg
 			_, err := cfg.Build()
-			require.Error(t, err)
-			assert.Equal(t, tt.expectErr, err.Error())
+			assert.EqualError(t, err, tt.expectErr)
 		})
 	}
 }

global_test.go

@@ -143,8 +143,7 @@ func TestNewStdLogAtFatal(t *testing.T) {
 
 func TestNewStdLogAtInvalid(t *testing.T) {
 	_, err := NewStdLogAt(NewNop(), zapcore.Level(99))
-	assert.Error(t, err, "Expected to get error.")
-	assert.Contains(t, err.Error(), "99", "Expected level code in error message")
+	assert.ErrorContains(t, err, "99", "Expected level code in error message")
 }
 
 func TestRedirectStdLog(t *testing.T) {
@@ -262,8 +261,7 @@ func TestRedirectStdLogAtInvalid(t *testing.T) {
 			restore()
 		}
 	}()
-	require.Error(t, err, "Expected to get error.")
-	assert.Contains(t, err.Error(), "99", "Expected level code in error message")
+	assert.ErrorContains(t, err, "99", "Expected level code in error message")
 }
 
 func checkStdLogMessage(t *testing.T, msg string, logs *observer.ObservedLogs) {

level_test.go

@@ -27,6 +27,7 @@ import (
 	"go.uber.org/zap/zapcore"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestLevelEnablerFunc(t *testing.T) {
@@ -71,11 +72,10 @@ func TestParseAtomicLevel(t *testing.T) {
 	for _, tt := range tests {
 		parsedAtomicLevel, err := ParseAtomicLevel(tt.text)
 		if len(tt.err) == 0 {
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tt.level, parsedAtomicLevel)
 		} else {
-			assert.Error(t, err)
-			assert.Contains(t, err.Error(), tt.err)
+			assert.ErrorContains(t, err, tt.err)
 		}
 	}
 }

sink_test.go

@@ -92,9 +92,7 @@ func TestRegisterSinkErrors(t *testing.T) {
 			defer resetSinkRegistry()
 
 			err := RegisterSink(tt.scheme, nopFactory)
-			if assert.Error(t, err, "expected error") {
-				assert.Contains(t, err.Error(), tt.err, "unexpected error")
-			}
+			assert.ErrorContains(t, err, tt.err)
 		})
 	}
 }

writer_test.go

@@ -249,7 +249,7 @@ func TestOpenWithErroringSinkFactory(t *testing.T) {
 
 	assert.NoError(t, RegisterSink("test", factory), "Failed to register sink factory.")
 	_, _, err := Open("test://some/path")
-	assert.Contains(t, err.Error(), msg, "Unexpected error.")
+	assert.ErrorContains(t, err, msg)
 }
 
 func TestCombineWriteSyncers(t *testing.T) {

zapcore/increase_level_test.go

@@ -87,8 +87,7 @@ func TestIncreaseLevel(t *testing.T) {
 
 			filteredLogger, err := NewIncreaseLevelCore(logger, tt.increaseLevel)
 			if tt.wantErr {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), "invalid increase level")
+				assert.ErrorContains(t, err, "invalid increase level")
 				return
 			}
 

zapcore/level_test.go

@@ -93,8 +93,7 @@ func TestParseLevel(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Equal(t, tt.level, parsedLevel)
 		} else {
-			assert.Error(t, err)
-			assert.Contains(t, err.Error(), tt.err)
+			assert.ErrorContains(t, err, tt.err)
 		}
 	}
 }
@@ -170,7 +169,7 @@ func TestLevelNils(t *testing.T) {
 func TestLevelUnmarshalUnknownText(t *testing.T) {
 	var l Level
 	err := l.UnmarshalText([]byte("foo"))
-	assert.Contains(t, err.Error(), "unrecognized level", "Expected unmarshaling arbitrary text to fail.")
+	assert.ErrorContains(t, err, "unrecognized level", "Expected unmarshaling arbitrary text to fail.")
 }
 
 func TestLevelAsFlagValue(t *testing.T) {