refactor: Use specific testify assertions instead of True/False

Replace generic assert.True/False with more descriptive alternatives:
- strings.Contains → assert.Contains
- bytes.Equal → assert.Equal
- regexp.MatchString → assert.Regexp
- assert.False(x != y) → assert.Equal/Empty/Zero
- require.False(len(x) == 0) → require.NotEmpty
- error message checks → assert.ErrorContains

This improves test failure messages by leveraging testify's
built-in formatting for each assertion type.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: cv

internal/api/client_integration_test.go

@@ -210,7 +210,7 @@ func TestEncryptPayloadUsingKey_EmptyPayload(t *testing.T) {
 	encrypted, err := client.encryptPayloadUsingKey("")
 	require.NoError(t, err, "Failed to encrypt empty payload: %v")
 
-	assert.False(t, encrypted != "", "Expected empty encrypted payload for empty input")
+	assert.Empty(t, encrypted)
 }
 
 // TestEncryptPayloadUsingKey_MissingKey tests error when encryption key is missing

internal/api/client_test.go

@@ -87,8 +87,7 @@ func TestAPIRequest_EncryptionError(t *testing.T) {
 
 	// APIRequest retries on EncryptionError by fetching new keys
 	// Since our mock server always returns the same error, it eventually fails with wrapped error
-	expectedMsg := "failed to retrieve encryption keys"
-	assert.Truef(t, strings.Contains(err.Error(), expectedMsg), "Expected error containing %q, got: %v", expectedMsg, err)
+	assert.ErrorContains(t, err, "failed to retrieve encryption keys")
 }
 
 // TestAPIRequest_TokenExpired tests handling of expired token error
@@ -117,8 +116,7 @@ func TestAPIRequest_TokenExpired(t *testing.T) {
 
 	// APIRequest retries on TokenExpiredError by re-logging in
 	// Since re-login will fail (mock server only handles one endpoint), we get a wrapped error
-	expectedMsg := "failed to login"
-	assert.Truef(t, strings.Contains(err.Error(), expectedMsg), "Expected error containing %q, got: %v", expectedMsg, err)
+	assert.ErrorContains(t, err, "failed to login")
 }
 
 // TestAPIRequest_RequestInProgress tests handling of request in progress error

internal/api/types_test.go

@@ -187,7 +187,11 @@ func TestVehicleStatusResponse_Unmarshal(t *testing.T) {
 	assert.EqualValuesf(t, -122.4194, alert.PositionInfo.Longitude, "Expected Longitude -122.4194, got %f", alert.PositionInfo.Longitude)
 
 	door := alert.Door
-	assert.False(t, door.DrStatDrv != 0 || door.DrStatPsngr != 0 || door.DrStatRl != 0 || door.DrStatRr != 0 || door.DrStatTrnkLg != 0, "Expected all doors to be locked (0)")
+	assert.Zero(t, door.DrStatDrv)
+	assert.Zero(t, door.DrStatPsngr)
+	assert.Zero(t, door.DrStatRl)
+	assert.Zero(t, door.DrStatRr)
+	assert.Zero(t, door.DrStatTrnkLg)
 }
 
 func TestEVVehicleStatusResponse_Unmarshal(t *testing.T) {

internal/api/undisplayed_fields_test.go

@@ -103,7 +103,7 @@ func TestUndisplayedFieldsInVehicleStatus(t *testing.T) {
 		// DriveInformation.OdoDispValue
 		remoteInfos, ok := getMapSlice(responseData, "remoteInfos")
 		require.True(t, ok, "remoteInfos not found in response")
-		require.False(t, len(remoteInfos) == 0, "remoteInfos is empty")
+		require.NotEmpty(t, remoteInfos)
 		driveInfo, ok := getMap(remoteInfos[0], "DriveInformation")
 		require.True(t, ok, "DriveInformation not found in response")
 		odometer, ok := getFloat64(driveInfo, "OdoDispValue")
@@ -115,7 +115,7 @@ func TestUndisplayedFieldsInVehicleStatus(t *testing.T) {
 		// alertInfos[].Door.DrStatHood
 		alertInfos, ok := getMapSlice(responseData, "alertInfos")
 		require.True(t, ok, "alertInfos not found in response")
-		require.False(t, len(alertInfos) == 0, "alertInfos is empty")
+		require.NotEmpty(t, alertInfos)
 		door, ok := getMap(alertInfos[0], "Door")
 		require.True(t, ok, "Door not found in response")
 		hoodStatus, ok := getFloat64(door, "DrStatHood")
@@ -127,7 +127,7 @@ func TestUndisplayedFieldsInVehicleStatus(t *testing.T) {
 		// alertInfos[].Door.FuelLidOpenStatus
 		alertInfos, ok := getMapSlice(responseData, "alertInfos")
 		require.True(t, ok, "alertInfos not found in response")
-		require.False(t, len(alertInfos) == 0, "alertInfos is empty")
+		require.NotEmpty(t, alertInfos)
 		door, ok := getMap(alertInfos[0], "Door")
 		require.True(t, ok, "Door not found in response")
 		fuelLid, ok := getFloat64(door, "FuelLidOpenStatus")
@@ -139,7 +139,7 @@ func TestUndisplayedFieldsInVehicleStatus(t *testing.T) {
 		// alertInfos[].Door.LockLinkSwDrv/Psngr/Rl/Rr
 		alertInfos, ok := getMapSlice(responseData, "alertInfos")
 		require.True(t, ok, "alertInfos not found in response")
-		require.False(t, len(alertInfos) == 0, "alertInfos is empty")
+		require.NotEmpty(t, alertInfos)
 		door, ok := getMap(alertInfos[0], "Door")
 		require.True(t, ok, "Door not found in response")
 
@@ -155,7 +155,7 @@ func TestUndisplayedFieldsInVehicleStatus(t *testing.T) {
 		// alertInfos[].Pw.PwPosDrv/Psngr/Rl/Rr
 		alertInfos, ok := getMapSlice(responseData, "alertInfos")
 		require.True(t, ok, "alertInfos not found in response")
-		require.False(t, len(alertInfos) == 0, "alertInfos is empty")
+		require.NotEmpty(t, alertInfos)
 		pw, ok := getMap(alertInfos[0], "Pw")
 		require.True(t, ok, "Pw not found in response")
 
@@ -171,7 +171,7 @@ func TestUndisplayedFieldsInVehicleStatus(t *testing.T) {
 		// alertInfos[].HazardLamp.HazardSw
 		alertInfos, ok := getMapSlice(responseData, "alertInfos")
 		require.True(t, ok, "alertInfos not found in response")
-		require.False(t, len(alertInfos) == 0, "alertInfos is empty")
+		require.NotEmpty(t, alertInfos)
 		hazard, ok := getMap(alertInfos[0], "HazardLamp")
 		require.True(t, ok, "HazardLamp not found in response")
 		hazardSw, ok := getFloat64(hazard, "HazardSw")
@@ -238,7 +238,8 @@ func TestUndisplayedFieldsInEVVehicleStatus(t *testing.T) {
 	t.Run("VerifyACChargeTimeField", func(t *testing.T) {
 		// ChargeInfo.MaxChargeMinuteAC
 		resultData, ok := getMapSlice(responseData, "resultData")
-		require.False(t, !ok || len(resultData) == 0, "resultData not found in response")
+		require.True(t, ok, "resultData not found in response")
+		require.NotEmpty(t, resultData)
 		plusBInfo, ok := getMap(resultData[0], "PlusBInformation")
 		require.True(t, ok, "PlusBInformation not found in response")
 		vehicleInfo, ok := getMap(plusBInfo, "VehicleInfo")
@@ -253,7 +254,8 @@ func TestUndisplayedFieldsInEVVehicleStatus(t *testing.T) {
 	t.Run("VerifyQuickChargeTimeField", func(t *testing.T) {
 		// ChargeInfo.MaxChargeMinuteQBC
 		resultData, ok := getMapSlice(responseData, "resultData")
-		require.False(t, !ok || len(resultData) == 0, "resultData not found in response")
+		require.True(t, ok, "resultData not found in response")
+		require.NotEmpty(t, resultData)
 		plusBInfo, ok := getMap(resultData[0], "PlusBInformation")
 		require.True(t, ok, "PlusBInformation not found in response")
 		vehicleInfo, ok := getMap(plusBInfo, "VehicleInfo")
@@ -268,7 +270,8 @@ func TestUndisplayedFieldsInEVVehicleStatus(t *testing.T) {
 	t.Run("VerifyBatteryHeaterAutoField", func(t *testing.T) {
 		// ChargeInfo.CstmzStatBatHeatAutoSW
 		resultData, ok := getMapSlice(responseData, "resultData")
-		require.False(t, !ok || len(resultData) == 0, "resultData not found in response")
+		require.True(t, ok, "resultData not found in response")
+		require.NotEmpty(t, resultData)
 		plusBInfo, ok := getMap(resultData[0], "PlusBInformation")
 		require.True(t, ok, "PlusBInformation not found in response")
 		vehicleInfo, ok := getMap(plusBInfo, "VehicleInfo")
@@ -283,7 +286,8 @@ func TestUndisplayedFieldsInEVVehicleStatus(t *testing.T) {
 	t.Run("VerifyBatteryHeaterOnField", func(t *testing.T) {
 		// ChargeInfo.BatteryHeaterON
 		resultData, ok := getMapSlice(responseData, "resultData")
-		require.False(t, !ok || len(resultData) == 0, "resultData not found in response")
+		require.True(t, ok, "resultData not found in response")
+		require.NotEmpty(t, resultData)
 		plusBInfo, ok := getMap(resultData[0], "PlusBInformation")
 		require.True(t, ok, "PlusBInformation not found in response")
 		vehicleInfo, ok := getMap(plusBInfo, "VehicleInfo")
@@ -298,7 +302,8 @@ func TestUndisplayedFieldsInEVVehicleStatus(t *testing.T) {
 	t.Run("VerifyInteriorTempField", func(t *testing.T) {
 		// RemoteHvacInfo.InteriorTemp
 		resultData, ok := getMapSlice(responseData, "resultData")
-		require.False(t, !ok || len(resultData) == 0, "resultData not found in response")
+		require.True(t, ok, "resultData not found in response")
+		require.NotEmpty(t, resultData)
 		plusBInfo, ok := getMap(resultData[0], "PlusBInformation")
 		require.True(t, ok, "PlusBInformation not found in response")
 		vehicleInfo, ok := getMap(plusBInfo, "VehicleInfo")
@@ -313,7 +318,8 @@ func TestUndisplayedFieldsInEVVehicleStatus(t *testing.T) {
 	t.Run("VerifyTargetTempField", func(t *testing.T) {
 		// RemoteHvacInfo.TargetTemp
 		resultData, ok := getMapSlice(responseData, "resultData")
-		require.False(t, !ok || len(resultData) == 0, "resultData not found in response")
+		require.True(t, ok, "resultData not found in response")
+		require.NotEmpty(t, resultData)
 		plusBInfo, ok := getMap(resultData[0], "PlusBInformation")
 		require.True(t, ok, "PlusBInformation not found in response")
 		vehicleInfo, ok := getMap(plusBInfo, "VehicleInfo")
@@ -394,7 +400,8 @@ func TestVehicleStatusWithVariedValues(t *testing.T) {
 
 	// Verify varied values
 	alertInfos, ok := getMapSlice(responseData, "alertInfos")
-	require.False(t, !ok || len(alertInfos) == 0, "alertInfos not found in response")
+	require.True(t, ok, "alertInfos not found in response")
+	require.NotEmpty(t, alertInfos)
 	door, ok := getMap(alertInfos[0], "Door")
 	require.True(t, ok, "Door not found")
 	hoodStatus, ok := getFloat64(door, "DrStatHood")
@@ -422,7 +429,8 @@ func TestVehicleStatusWithVariedValues(t *testing.T) {
 	assert.EqualValues(t, 1, hazardSw)
 
 	remoteInfos, ok := getMapSlice(responseData, "remoteInfos")
-	require.False(t, !ok || len(remoteInfos) == 0, "remoteInfos not found in response")
+	require.True(t, ok, "remoteInfos not found in response")
+	require.NotEmpty(t, remoteInfos)
 	driveInfo, ok := getMap(remoteInfos[0], "DriveInformation")
 	require.True(t, ok, "DriveInformation not found")
 	odometer, ok := getFloat64(driveInfo, "OdoDispValue")
@@ -477,7 +485,8 @@ func TestEVVehicleStatusWithVariedValues(t *testing.T) {
 
 	// Verify varied values
 	resultData, ok := getMapSlice(responseData, "resultData")
-	require.False(t, !ok || len(resultData) == 0, "resultData not found in response")
+	require.True(t, ok, "resultData not found in response")
+	require.NotEmpty(t, resultData)
 	plusBInfo, ok := getMap(resultData[0], "PlusBInformation")
 	require.True(t, ok, "PlusBInformation not found in response")
 	vehicleInfo, ok := getMap(plusBInfo, "VehicleInfo")

internal/cli/root_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"os"
-	"strings"
 	"syscall"
 	"testing"
 	"time"
@@ -25,7 +24,7 @@ func TestRootCmd_Version(t *testing.T) {
 	require.NoError(t, err, "Execute() error = %v")
 
 	result := output.String()
-	assert.Truef(t, strings.Contains(result, "mcs version"), "Expected version output, got: %s", result)
+	assert.Contains(t, result, "mcs version")
 }
 
 func TestRootCmd_Help(t *testing.T) {
@@ -39,9 +38,9 @@ func TestRootCmd_Help(t *testing.T) {
 	require.NoError(t, err, "Execute() error = %v")
 
 	result := output.String()
-	assert.Truef(t, strings.Contains(result, "mcs"), "Expected help output to contain 'mcs', got: %s", result)
+	assert.Contains(t, result, "mcs")
 	// Check for content from the Long description
-	assert.Truef(t, strings.Contains(result, "manufacturer API"), "Expected help output to contain 'manufacturer API', got: %s", result)
+	assert.Contains(t, result, "manufacturer API")
 }
 
 func TestRootCmd_NoArgs(t *testing.T) {

internal/cli/skill_test.go

@@ -267,7 +267,7 @@ func TestSkillUninstallCommand_Execute(t *testing.T) {
 			output := outBuf.String()
 			assert.NotEqual(t, 0, len(output), "Expected output message")
 			if len(tt.expectedOutput) > 0 {
-				assert.Truef(t, bytes.Contains([]byte(output), []byte(tt.expectedOutput)), "Expected output to contain '%s', got '%s'", tt.expectedOutput, output)
+				assert.Contains(t, output, tt.expectedOutput)
 			}
 
 			// Verify directory is removed

internal/cli/status_test.go

@@ -2,7 +2,6 @@ package cli
 
 import (
 	"bytes"
-	"strings"
 	"testing"
 	"time"
 
@@ -475,7 +474,7 @@ func TestFormatTiresStatus(t *testing.T) {
 			result, err := formatTiresStatus(tireInfo, false)
 			require.NoError(t, err, "Unexpected error: %v")
 
-			assert.Truef(t, strings.Contains(result, tt.expectedPart), "Expected output to contain '%s', got '%s'", tt.expectedPart, result)
+			assert.Contains(t, result, tt.expectedPart)
 		})
 	}
 }
@@ -513,7 +512,7 @@ func TestFormatLocationStatus(t *testing.T) {
 			require.NoError(t, err, "Unexpected error: %v")
 
 			for _, expected := range tt.expectedContains {
-				assert.Truef(t, strings.Contains(result, expected), "Expected output to contain '%s', got '%s'", expected, result)
+				assert.Contains(t, result, expected)
 			}
 		})
 	}
@@ -1256,15 +1255,15 @@ func TestFormatTimestamp(t *testing.T) {
 			result := formatTimestamp(tt.timestamp)
 
 			if tt.expectedFormat != "" {
-				assert.Truef(t, strings.Contains(result, tt.expectedFormat), "Expected result to contain '%s', got '%s'", tt.expectedFormat, result)
+				assert.Contains(t, result, tt.expectedFormat)
 				// Should also contain relative time in parentheses
 				assert.Contains(t, result, "(")
 				assert.Contains(t, result, ")")
 
 			}
 
 			for _, expected := range tt.expectedContains {
-				assert.Truef(t, strings.Contains(result, expected), "Expected result to contain '%s', got '%s'", expected, result)
+				assert.Contains(t, result, expected)
 			}
 		})
 	}
@@ -1513,7 +1512,7 @@ func TestDisplayStatusWithVehicle(t *testing.T) {
 
 			output := buf.String()
 			for _, expected := range tt.expectedOutput {
-				assert.Truef(t, strings.Contains(output, expected), "Expected output to contain '%s', got '%s'", expected, output)
+				assert.Contains(t, output, expected)
 			}
 		})
 	}
@@ -1688,7 +1687,7 @@ func TestDisplayAllStatus(t *testing.T) {
 				}
 			} else {
 				for _, expected := range tt.expectedOutput {
-					assert.Truef(t, strings.Contains(result, expected), "Expected output to contain '%s', got '%s'", expected, result)
+					assert.Contains(t, result, expected)
 				}
 			}
 		})

internal/crypto/crypto_test.go

@@ -1,7 +1,6 @@
 package crypto
 
 import (
-	"bytes"
 	"crypto/aes"
 	"testing"
 
@@ -82,7 +81,7 @@ func TestPKCS7Unpad(t *testing.T) {
 			}
 
 			if !tt.wantErr {
-				assert.Truef(t, bytes.Equal(result, tt.want), "PKCS7Unpad() = %v, want %v", result, tt.want)
+				assert.Equal(t, tt.want, result)
 			}
 
 		})
@@ -94,7 +93,7 @@ func TestPKCS7PadUnpad_RoundTrip(t *testing.T) {
 	padded := PKCS7Pad(data, aes.BlockSize)
 	unpadded, err := PKCS7Unpad(padded)
 	require.NoError(t, err, "PKCS7Unpad() error = %v")
-	assert.Truef(t, bytes.Equal(unpadded, data), "Round trip failed: got %v, want %v", unpadded, data)
+	assert.Equal(t, data, unpadded)
 }
 
 func TestEncryptDecryptAES128CBC(t *testing.T) {
@@ -108,7 +107,7 @@ func TestEncryptDecryptAES128CBC(t *testing.T) {
 	decrypted, err := DecryptAES128CBC(encrypted, key, iv)
 	require.NoError(t, err, "DecryptAES128CBC() error = %v")
 
-	assert.Truef(t, bytes.Equal(decrypted, plaintext), "DecryptAES128CBC() = %v, want %v", decrypted, plaintext)
+	assert.Equal(t, plaintext, decrypted)
 }
 
 func TestEncryptAES128CBC_InvalidKey(t *testing.T) {

internal/sensordata/key_event_test.go

@@ -1,7 +1,6 @@
 package sensordata
 
 import (
-	"strings"
 	"testing"
 	"time"
 
@@ -72,8 +71,8 @@ func TestKeyEventList_ToString(t *testing.T) {
 	result := list.ToString()
 
 	// Should contain both events
-	assert.True(t, strings.Contains(result, "2,5000,517;"), "Expected ToString to contain first event")
-	assert.True(t, strings.Contains(result, "2,30,517,1;"), "Expected ToString to contain second event")
+	assert.Contains(t, result, "2,5000,517;", "first event")
+	assert.Contains(t, result, "2,30,517,1;", "second event")
 }
 
 func TestKeyEventList_ToString_Empty(t *testing.T) {

internal/sensordata/sensor_data_test.go

@@ -1,7 +1,6 @@
 package sensordata
 
 import (
-	"regexp"
 	"strings"
 	"testing"
 	"time"
@@ -39,7 +38,7 @@ func TestSensorDataBuilder_GenerateSensorData(t *testing.T) {
 
 	// Format is: 1,a,<aes_key>,<hmac_key>$<encrypted_data>$<timestamps>
 	// Check that it ends with timestamps in format: $<num>,<num>,<num>
-	assert.True(t, regexp.MustCompile(`\$[0-9]+,[0-9]+,[0-9]+$`).MatchString(result), "Expected timestamp format at end: $<num>,<num>,<num>")
+	assert.Regexp(t, `\$[0-9]+,[0-9]+,[0-9]+$`, result, "expected timestamp format at end")
 }
 
 func TestCountSeparators(t *testing.T) {