Apply testifylint fixes

common/authorization/default_authorizer_test.go

@@ -173,7 +173,7 @@ func (s *defaultAuthorizerSuite) testGetAuthorizerFromConfig(name string, valid
 		s.NoError(err)
 		s.NotNil(auth)
 		t := reflect.TypeOf(auth)
-		s.True(t == authorizerType)
+		s.Equal(t, authorizerType)
 	} else {
 		s.Error(err)
 		s.Nil(auth)

common/authorization/default_jwt_claim_mapper_test.go

@@ -134,7 +134,7 @@ func (s *defaultClaimMapperSuite) testTokenWithAdminPermissions(alg keyAlgorithm
 	s.NoError(err)
 	s.Equal(testSubject, claims.Subject)
 	s.Equal(RoleAdmin, claims.System)
-	s.Equal(1, len(claims.Namespaces))
+	s.Len(claims.Namespaces, 1)
 	defaultRole := claims.Namespaces[defaultNamespace]
 	s.Equal(RoleReader, defaultRole)
 }
@@ -154,7 +154,7 @@ func (s *defaultClaimMapperSuite) TestNamespacePermissionCaseSensitive() {
 	s.NoError(err)
 	s.Equal(testSubject, claims.Subject)
 	s.Equal(RoleUndefined, claims.System) // no system role
-	s.Equal(2, len(claims.Namespaces))
+	s.Len(claims.Namespaces, 2)
 	// claims contain namespace role for 'Foo', not for 'foo'.
 	s.Equal(RoleReader, claims.Namespaces["Foo"])
 	s.Equal(RoleAdmin, claims.Namespaces["Temporal-system"])
@@ -181,7 +181,7 @@ func (s *defaultClaimMapperSuite) testTokenWithReaderWriterWorkerPermissions(alg
 	s.NoError(err)
 	s.Equal(testSubject, claims.Subject)
 	s.Equal(RoleUndefined, claims.System)
-	s.Equal(1, len(claims.Namespaces))
+	s.Len(claims.Namespaces, 1)
 	defaultRole := claims.Namespaces[defaultNamespace]
 	s.Equal(RoleReader|RoleWriter|RoleWorker, defaultRole)
 }
@@ -198,7 +198,7 @@ func (s *defaultClaimMapperSuite) TestTokenWithReaderWriterWorkerPermissionsRege
 	s.NoError(err)
 	s.Equal(testSubject, claims.Subject)
 	s.Equal(RoleUndefined, claims.System)
-	s.Equal(1, len(claims.Namespaces))
+	s.Len(claims.Namespaces, 1)
 	defaultRole := claims.Namespaces[defaultNamespace]
 	s.Equal(RoleReader|RoleWriter|RoleWorker, defaultRole)
 }
@@ -258,7 +258,7 @@ func (s *defaultClaimMapperSuite) TestTokenWithAdminPermissionsRegex() {
 	s.NoError(err)
 	s.Equal(testSubject, claims.Subject)
 	s.Equal(RoleAdmin, claims.System)
-	s.Equal(1, len(claims.Namespaces))
+	s.Len(claims.Namespaces, 1)
 	defaultRole := claims.Namespaces[defaultNamespace]
 	s.Equal(RoleReader, defaultRole)
 }
@@ -314,7 +314,7 @@ func (s *defaultClaimMapperSuite) testGetClaimMapperFromConfig(name string, vali
 		s.NoError(err)
 		s.NotNil(cm)
 		t := reflect.TypeOf(cm)
-		s.True(t == cmType)
+		s.Equal(t, cmType)
 	} else {
 		s.Error(err)
 		s.Nil(cm)

common/backoff/jitter_test.go

@@ -30,12 +30,12 @@ func (s *jitterSuite) TestJitter_Int64() {
 
 	for range 1048576 {
 		result := Jitter(input, coefficient)
-		s.True(result >= lowerBound)
-		s.True(result < upperBound)
+		s.GreaterOrEqual(result, lowerBound)
+		s.Less(result, upperBound)
 
 		result = FullJitter(input)
-		s.True(result >= 0)
-		s.True(result < input)
+		s.GreaterOrEqual(result, int64(0))
+		s.Less(result, input)
 	}
 }
 
@@ -47,12 +47,12 @@ func (s *jitterSuite) TestJitter_Float64() {
 
 	for range 1048576 {
 		result := Jitter(input, coefficient)
-		s.True(result >= lowerBound)
-		s.True(result < upperBound)
+		s.GreaterOrEqual(result, lowerBound)
+		s.Less(result, upperBound)
 
 		result = FullJitter(input)
-		s.True(result >= 0)
-		s.True(result < input)
+		s.GreaterOrEqual(result, float64(0))
+		s.Less(result, input)
 	}
 }
 
@@ -64,12 +64,12 @@ func (s *jitterSuite) TestJitter_Duration() {
 
 	for range 1048576 {
 		result := Jitter(input, coefficient)
-		s.True(result >= lowerBound)
-		s.True(result < upperBound)
+		s.GreaterOrEqual(result, lowerBound)
+		s.Less(result, upperBound)
 
 		result = FullJitter(input)
-		s.True(result >= 0)
-		s.True(result < input)
+		s.GreaterOrEqual(result, time.Duration(0))
+		s.Less(result, input)
 	}
 }
 

common/backoff/retrypolicy_test.go

@@ -82,8 +82,8 @@ func (s *RetryPolicySuite) TestExponentialBackoff() {
 	for _, expected := range expectedResult {
 		min, max := getNextBackoffRange(expected)
 		next := r.NextBackOff(nil)
-		s.True(next >= min, "NextBackoff too low")
-		s.True(next < max, "NextBackoff too high")
+		s.GreaterOrEqual(next, min, "NextBackoff too low")
+		s.Less(next, max, "NextBackoff too high")
 	}
 }
 
@@ -116,8 +116,8 @@ func (s *RetryPolicySuite) TestMaximumInterval() {
 	for _, expected := range expectedResult {
 		min, max := getNextBackoffRange(expected)
 		next := r.NextBackOff(nil)
-		s.True(next >= min, "NextBackoff too low")
-		s.True(next < max, "NextBackoff too high")
+		s.GreaterOrEqual(next, min, "NextBackoff too low")
+		s.Less(next, max, "NextBackoff too high")
 	}
 }
 
@@ -129,8 +129,8 @@ func (s *RetryPolicySuite) TestBackoffCoefficient() {
 	min, max := getNextBackoffRange(2 * time.Second)
 	for range 10 {
 		next := r.NextBackOff(nil)
-		s.True(next >= min, "NextBackoff too low")
-		s.True(next < max, "NextBackoff too high")
+		s.GreaterOrEqual(next, min, "NextBackoff too low")
+		s.Less(next, max, "NextBackoff too high")
 	}
 }
 
@@ -152,15 +152,15 @@ func (s *RetryPolicySuite) TestExpirationOverflow() {
 	r, ts := createRetrier(policy)
 	next := r.NextBackOff(nil)
 	min, max := getNextBackoffRange(2 * time.Second)
-	s.True(next >= min, "NextBackoff too low")
-	s.True(next < max, "NextBackoff too high")
+	s.GreaterOrEqual(next, min, "NextBackoff too low")
+	s.Less(next, max, "NextBackoff too high")
 
 	ts.Advance(2 * time.Second)
 
 	next = r.NextBackOff(nil)
 	min, max = getNextBackoffRange(3 * time.Second)
-	s.True(next >= min, "NextBackoff too low")
-	s.True(next < max, "NextBackoff too high")
+	s.GreaterOrEqual(next, min, "NextBackoff too low")
+	s.Less(next, max, "NextBackoff too high")
 }
 
 func (s *RetryPolicySuite) TestDefaultPublishRetryPolicy() {
@@ -192,8 +192,8 @@ func (s *RetryPolicySuite) TestDefaultPublishRetryPolicy() {
 			s.Equal(done, next, "backoff not done yet!!!")
 		} else {
 			min, max := getNextBackoffRange(expected)
-			s.True(next >= min, "NextBackoff too low: actual: %v, min: %v", next, min)
-			s.True(next < max, "NextBackoff too high: actual: %v, max: %v", next, max)
+			s.GreaterOrEqual(next, min, "NextBackoff too low: actual: %v, min: %v", next, min)
+			s.Less(next, max, "NextBackoff too high: actual: %v, max: %v", next, max)
 			ts.Advance(expected)
 		}
 	}
@@ -262,8 +262,8 @@ func (s *RetryPolicySuite) TestErrorDependentPolicy() {
 	retrier, _ = createRetrier(policy)
 
 	delay = retrier.NextBackOff(fmt.Errorf("other error"))
-	s.True(delay >= 1*time.Second)
-	s.True(delay < 1500*time.Millisecond)
+	s.GreaterOrEqual(delay, 1*time.Second)
+	s.Less(delay, 1500*time.Millisecond)
 }
 
 func (s *RetryPolicySuite) TestConstantDelayPolicy() {
@@ -290,8 +290,8 @@ func (s *RetryPolicySuite) TestConstantDelayPolicy() {
 	retrier, _ = createRetrier(policy)
 
 	delay = retrier.NextBackOff(nil)
-	s.True(delay >= 2*time.Second)
-	s.True(delay < 2200*time.Millisecond)
+	s.GreaterOrEqual(delay, 2*time.Second)
+	s.Less(delay, 2200*time.Millisecond)
 }
 
 // Validate jitter computation
@@ -300,8 +300,8 @@ func (s *RetryPolicySuite) TestAddJitter() {
 		delay := 1 * time.Second
 		jitter := 0.5
 		jitteredDelay := addJitter(delay, jitter)
-		s.True(jitteredDelay >= 1*time.Second)
-		s.True(jitteredDelay < 1500*time.Millisecond)
+		s.GreaterOrEqual(jitteredDelay, 1*time.Second)
+		s.Less(jitteredDelay, 1500*time.Millisecond)
 	}
 }
 

common/cluster/metadata_test.go

@@ -127,11 +127,11 @@ func (s *metadataSuite) Test_RegisterMetadataChangeCallback() {
 	s.metadata.RegisterMetadataChangeCallback(
 		s,
 		func(oldClusterMetadata map[string]*ClusterInformation, newClusterMetadata map[string]*ClusterInformation) {
-			s.Equal(3, len(newClusterMetadata))
+			s.Len(newClusterMetadata, 3)
 		})
 
 	s.metadata.UnRegisterMetadataChangeCallback(s)
-	s.Equal(0, len(s.metadata.clusterChangeCallback))
+	s.Empty(s.metadata.clusterChangeCallback)
 }
 
 func (s *metadataSuite) Test_RefreshClusterMetadata_Success() {
@@ -389,5 +389,5 @@ func (s *metadataSuite) Test_ListAllClusterMetadataFromDB_Success() {
 
 	resp, err := s.metadata.listAllClusterMetadataFromDB(context.Background())
 	s.NoError(err)
-	s.Equal(2, len(resp))
+	s.Len(resp, 2)
 }

common/collection/concurrent_tx_map_test.go

@@ -64,7 +64,7 @@ func (s *ConcurrentTxMapSuite) TestGetAndDo() {
 		return nil
 	})
 	s.Nil(interf, "GetAndDo should return nil when key not found")
-	s.Nil(err, "GetAndDo should return nil when function not applied")
+	s.NoError(err, "GetAndDo should return nil when function not applied")
 	s.False(ok, "GetAndDo should return false when key not found")
 	s.False(fnApplied, "GetAndDo should not apply function when key not exixts")
 
@@ -79,7 +79,7 @@ func (s *ConcurrentTxMapSuite) TestGetAndDo() {
 
 	value1 := interf.(*intType)
 	s.Equal(*(value1), intType(2))
-	s.NotNil(err, "GetAndDo should return non nil when function applied")
+	s.Error(err, "GetAndDo should return non nil when function applied")
 	s.True(ok, "GetAndDo should return true when key found")
 	s.True(fnApplied, "GetAndDo should apply function when key exixts")
 }
@@ -97,7 +97,7 @@ func (s *ConcurrentTxMapSuite) TestPutOrDo() {
 	})
 	valueRetuern := interf.(*intType)
 	s.Equal(value, *valueRetuern)
-	s.Nil(err, "PutOrDo should return nil when function not applied")
+	s.NoError(err, "PutOrDo should return nil when function not applied")
 	s.False(ok, "PutOrDo should return false when function not applied")
 	s.False(fnApplied, "PutOrDo should not apply function when key not exixts")
 
@@ -110,7 +110,7 @@ func (s *ConcurrentTxMapSuite) TestPutOrDo() {
 	})
 	valueRetuern = interf.(*intType)
 	s.Equal(value, *valueRetuern)
-	s.NotNil(err, "PutOrDo should return non nil when function applied")
+	s.Error(err, "PutOrDo should return non nil when function applied")
 	s.True(ok, "PutOrDo should return true when function applied")
 	s.True(fnApplied, "PutOrDo should apply function when key exixts")
 }

common/dynamicconfig/collection_test.go

@@ -129,30 +129,30 @@ func (s *collectionSuite) TestGetFloat64Property() {
 func (s *collectionSuite) TestGetBoolProperty() {
 	setting := dynamicconfig.NewGlobalBoolSetting(testGetBoolPropertyKey, true, "")
 	value := setting.Get(s.cln)
-	s.Equal(true, value())
+	s.True(value())
 	s.client.SetValue(testGetBoolPropertyKey, false)
-	s.Equal(false, value())
+	s.False(value())
 	s.client.SetValue(testGetBoolPropertyKey, "false")
-	s.Equal(false, value())
+	s.False(value())
 }
 
 func (s *collectionSuite) TestGetBoolPropertyFilteredByNamespaceID() {
 	setting := dynamicconfig.NewNamespaceIDBoolSetting(testGetBoolPropertyFilteredByNamespaceIDKey, true, "")
 	namespaceID := namespace.ID("testNamespaceID")
 	value := setting.Get(s.cln)
-	s.Equal(true, value(namespaceID))
+	s.True(value(namespaceID))
 	s.client.SetValue(testGetBoolPropertyFilteredByNamespaceIDKey, false)
-	s.Equal(false, value(namespaceID))
+	s.False(value(namespaceID))
 }
 
 func (s *collectionSuite) TestGetBoolPropertyFilteredByTaskQueueInfo() {
 	setting := dynamicconfig.NewTaskQueueBoolSetting(testGetBoolPropertyFilteredByTaskQueueInfoKey, false, "")
 	namespace := "testNamespace"
 	taskQueue := "testTaskQueue"
 	value := setting.Get(s.cln)
-	s.Equal(false, value(namespace, taskQueue, 0))
+	s.False(value(namespace, taskQueue, 0))
 	s.client.SetValue(testGetBoolPropertyFilteredByTaskQueueInfoKey, true)
-	s.Equal(true, value(namespace, taskQueue, 0))
+	s.True(value(namespace, taskQueue, 0))
 }
 
 func (s *collectionSuite) TestGetDurationProperty() {

common/dynamicconfig/file_based_client_test.go

@@ -58,7 +58,7 @@ func (s *fileBasedClientSuite) SetupTest() {
 
 func (s *fileBasedClientSuite) TestGetValue() {
 	cvs := s.client.GetValue(dynamicconfig.MakeKey(testGetBoolPropertyKey))
-	s.Equal(3, len(cvs))
+	s.Len(cvs, 3)
 	s.ElementsMatch([]dynamicconfig.ConstrainedValue{
 		{Constraints: dynamicconfig.Constraints{}, Value: false},
 		{Constraints: dynamicconfig.Constraints{Namespace: "global-samples-namespace"}, Value: true},
@@ -91,10 +91,10 @@ func (s *fileBasedClientSuite) TestNewFileBasedClientWithoutMetrics() {
 
 func (s *fileBasedClientSuite) TestGetValue_CaseInsensitie() {
 	cvs := s.client.GetValue(dynamicconfig.MakeKey(testCaseInsensitivePropertyKey))
-	s.Equal(1, len(cvs))
+	s.Len(cvs, 1)
 
 	v := dynamicconfig.NewGlobalBoolSetting(testCaseInsensitivePropertyKey, false, "").Get(s.collection)()
-	s.Equal(true, v)
+	s.True(v)
 }
 
 func (s *fileBasedClientSuite) TestGetIntValue() {
@@ -185,7 +185,7 @@ func (s *fileBasedClientSuite) TestGetFloatValue_WrongType() {
 
 func (s *fileBasedClientSuite) TestGetBoolValue() {
 	v := dynamicconfig.NewGlobalBoolSetting(testGetBoolPropertyKey, true, "").Get(s.collection)()
-	s.Equal(false, v)
+	s.False(v)
 }
 
 func (s *fileBasedClientSuite) TestGetStringValue() {
@@ -902,7 +902,7 @@ testGetFloat64PropertyKey:
 - value: 22.222
 `))
 	s.Empty(lr.Errors)
-	s.Equal(1, len(lr.Warnings))
+	s.Len(lr.Warnings, 1)
 	s.ErrorContains(lr.Warnings[0], `unregistered key "testgetfloat64propertykey"`)
 }
 
@@ -914,7 +914,7 @@ testGetIntPropertyKey:
 - value: not a number
 `))
 	s.Empty(lr.Errors)
-	s.Equal(1, len(lr.Warnings))
+	s.Len(lr.Warnings, 1)
 	s.ErrorContains(lr.Warnings[0], `validation failed: key "testgetintpropertykey" value not a number: value type is not int`)
 }
 
@@ -928,7 +928,7 @@ testGetIntPropertyKey:
     namespace: samples-namespace
 `))
 	s.Empty(lr.Errors)
-	s.Equal(1, len(lr.Warnings))
+	s.Len(lr.Warnings, 1)
 	s.ErrorContains(lr.Warnings[0], `constraint "namespace" isn't valid for dynamic config key "testgetintpropertykey"`)
 }
 
@@ -944,12 +944,12 @@ testGetIntPropertyKey:
     namespace: samples-namespace
 `))
 	s.Empty(lr.Errors)
-	s.Equal(3, len(lr.Warnings))
+	s.Len(lr.Warnings, 3)
 }
 
 func (s *fileBasedClientSuite) TestErrorYamlDecode() {
 	lr := dynamicconfig.LoadYamlFile([]byte(`}}}}}}}}}`))
-	s.Equal(1, len(lr.Errors))
+	s.Len(lr.Errors, 1)
 	s.ErrorContains(lr.Errors[0], "decode error")
 }
 
@@ -962,7 +962,7 @@ testGetBoolPropertyKey:
   constraints:
     namespace: 35
 `))
-	s.Equal(1, len(lr.Errors))
+	s.Len(lr.Errors, 1)
 	s.ErrorContains(lr.Errors[0], "namespace constraint must be string")
 }