diff --git a/build/testing/integration/api/api.go b/build/testing/integration/api/api.go
index cc677b6fa4..fc23f34c52 100644
--- a/build/testing/integration/api/api.go
+++ b/build/testing/integration/api/api.go
@@ -664,7 +664,7 @@ func API(t *testing.T, ctx context.Context, opts integration.TestOpts) {
}
assert.Equal(t, ruleTwo.Id, distribution.RuleId)
- assert.Equal(t, float32(100), distribution.Rollout)
+ assert.InDelta(t, 100, distribution.Rollout, 0)
distribution, err = client.Flipt().CreateDistribution(ctx, &flipt.CreateDistributionRequest{
NamespaceKey: namespace.Key,
@@ -733,7 +733,7 @@ func API(t *testing.T, ctx context.Context, opts integration.TestOpts) {
assert.Equal(t, "boolean_disabled", rolloutSegment.FlagKey)
assert.Equal(t, int32(1), rolloutSegment.Rank)
assert.Equal(t, "everyone", rolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.SegmentKey)
- assert.Equal(t, true, rolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.Value)
+ assert.True(t, rolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.Value)
anotherRolloutSegment, err := client.Flipt().CreateRollout(ctx, &flipt.CreateRolloutRequest{
NamespaceKey: namespace.Key,
@@ -753,7 +753,7 @@ func API(t *testing.T, ctx context.Context, opts integration.TestOpts) {
assert.Equal(t, "boolean_disabled", anotherRolloutSegment.FlagKey)
assert.Equal(t, int32(2), anotherRolloutSegment.Rank)
assert.Equal(t, "another-segment", anotherRolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.SegmentKey)
- assert.Equal(t, false, anotherRolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.Value)
+ assert.False(t, anotherRolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.Value)
updatedAnotherRolloutSegment, err := client.Flipt().UpdateRollout(ctx, &flipt.UpdateRolloutRequest{
Id: anotherRolloutSegment.Id,
@@ -773,7 +773,7 @@ func API(t *testing.T, ctx context.Context, opts integration.TestOpts) {
assert.Equal(t, int32(2), updatedAnotherRolloutSegment.Rank)
assert.Contains(t, updatedAnotherRolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.SegmentKeys, "segment")
assert.Contains(t, updatedAnotherRolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.SegmentKeys, "another-segment")
- assert.Equal(t, false, updatedAnotherRolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.Value)
+ assert.False(t, updatedAnotherRolloutSegment.Rule.(*flipt.Rollout_Segment).Segment.Value)
rolloutThreshold, err := client.Flipt().CreateRollout(ctx, &flipt.CreateRolloutRequest{
NamespaceKey: namespace.Key,
@@ -793,8 +793,8 @@ func API(t *testing.T, ctx context.Context, opts integration.TestOpts) {
assert.Equal(t, "boolean_disabled", rolloutThreshold.FlagKey)
assert.Equal(t, "50% disabled", rolloutThreshold.Description)
assert.Equal(t, int32(3), rolloutThreshold.Rank)
- assert.Equal(t, float32(50.0), rolloutThreshold.Rule.(*flipt.Rollout_Threshold).Threshold.Percentage)
- assert.Equal(t, true, rolloutThreshold.Rule.(*flipt.Rollout_Threshold).Threshold.Value)
+ assert.InDelta(t, 50.0, rolloutThreshold.Rule.(*flipt.Rollout_Threshold).Threshold.Percentage, 0)
+ assert.True(t, rolloutThreshold.Rule.(*flipt.Rollout_Threshold).Threshold.Value)
t.Log(`Ensure multiple rollouts with same rank can not be created`)
@@ -874,8 +874,8 @@ func API(t *testing.T, ctx context.Context, opts integration.TestOpts) {
assert.Equal(t, "boolean_disabled", updatedRollout.FlagKey)
assert.Equal(t, "50% enabled", updatedRollout.Description)
assert.Equal(t, int32(3), updatedRollout.Rank)
- assert.Equal(t, float32(50.0), updatedRollout.Rule.(*flipt.Rollout_Threshold).Threshold.Percentage)
- assert.Equal(t, false, updatedRollout.Rule.(*flipt.Rollout_Threshold).Threshold.Value)
+ assert.InDelta(t, 50.0, updatedRollout.Rule.(*flipt.Rollout_Threshold).Threshold.Percentage, 0)
+ assert.False(t, updatedRollout.Rule.(*flipt.Rollout_Threshold).Threshold.Value)
t.Run("Cannot change rollout type", func(t *testing.T) {
_, err := client.Flipt().UpdateRollout(ctx, &flipt.UpdateRolloutRequest{
diff --git a/build/testing/integration/readonly/readonly_test.go b/build/testing/integration/readonly/readonly_test.go
index 9d54becc80..c4ed7de829 100644
--- a/build/testing/integration/readonly/readonly_test.go
+++ b/build/testing/integration/readonly/readonly_test.go
@@ -237,9 +237,9 @@ func TestReadOnly(t *testing.T) {
require.Len(t, rule.Distributions, 2)
assert.NotEmpty(t, rule.Distributions[0].Id)
- assert.Equal(t, float32(50.0), rule.Distributions[0].Rollout)
+ assert.InDelta(t, 50.0, rule.Distributions[0].Rollout, 0)
assert.NotEmpty(t, rule.Distributions[1].Id)
- assert.Equal(t, float32(50.0), rule.Distributions[1].Rollout)
+ assert.InDelta(t, 50.0, rule.Distributions[1].Rollout, 0)
})
t.Run("ListRules", func(t *testing.T) {
@@ -268,9 +268,9 @@ func TestReadOnly(t *testing.T) {
require.Len(t, rule.Distributions, 2)
assert.NotEmpty(t, rule.Distributions[0].Id)
- assert.Equal(t, float32(50.0), rule.Distributions[0].Rollout)
+ assert.InDelta(t, 50.0, rule.Distributions[0].Rollout, 0)
assert.NotEmpty(t, rule.Distributions[1].Id)
- assert.Equal(t, float32(50.0), rule.Distributions[1].Rollout)
+ assert.InDelta(t, 50.0, rule.Distributions[1].Rollout, 0)
t.Run("Paginated (page size 10)", func(t *testing.T) {
var (
@@ -373,7 +373,7 @@ func TestReadOnly(t *testing.T) {
})
require.NoError(t, err)
- assert.Equal(t, true, response.Match)
+ assert.True(t, response.Match)
assert.Equal(t, "variant_002", response.Value)
assert.Equal(t, flipt.EvaluationReason_MATCH_EVALUATION_REASON, response.Reason)
})
@@ -401,11 +401,11 @@ func TestReadOnly(t *testing.T) {
require.NoError(t, err)
require.Len(t, response.Responses, 2)
- assert.Equal(t, true, response.Responses[0].Match)
+ assert.True(t, response.Responses[0].Match)
assert.Equal(t, "variant_002", response.Responses[0].Value)
assert.Equal(t, flipt.EvaluationReason_MATCH_EVALUATION_REASON, response.Responses[0].Reason)
- assert.Equal(t, true, response.Responses[1].Match)
+ assert.True(t, response.Responses[1].Match)
assert.Equal(t, "variant_001", response.Responses[1].Value)
assert.Equal(t, flipt.EvaluationReason_MATCH_EVALUATION_REASON, response.Responses[1].Reason)
})
@@ -424,7 +424,7 @@ func TestReadOnly(t *testing.T) {
})
require.NoError(t, err)
- assert.Equal(t, true, response.Match)
+ assert.True(t, response.Match)
assert.Equal(t, "flag_001", response.FlagKey)
assert.Equal(t, "variant_002", response.VariantKey)
assert.Equal(t, evaluation.EvaluationReason_MATCH_EVALUATION_REASON, response.Reason)
@@ -443,7 +443,7 @@ func TestReadOnly(t *testing.T) {
})
require.NoError(t, err)
- assert.Equal(t, true, response.Match)
+ assert.True(t, response.Match)
assert.Equal(t, "variant_002", response.VariantKey)
assert.Equal(t, "flag_variant_and_segments", response.FlagKey)
assert.Equal(t, evaluation.EvaluationReason_MATCH_EVALUATION_REASON, response.Reason)
@@ -462,7 +462,7 @@ func TestReadOnly(t *testing.T) {
})
require.NoError(t, err)
- assert.Equal(t, false, response.Match)
+ assert.False(t, response.Match)
assert.Empty(t, response.VariantKey)
assert.Equal(t, evaluation.EvaluationReason_UNKNOWN_EVALUATION_REASON, response.Reason)
})
@@ -476,7 +476,7 @@ func TestReadOnly(t *testing.T) {
})
require.NoError(t, err)
- assert.Equal(t, true, response.Match)
+ assert.True(t, response.Match)
assert.Equal(t, "variant_001", response.VariantKey)
assert.Equal(t, "flag_using_entity_id", response.FlagKey)
assert.Equal(t, evaluation.EvaluationReason_MATCH_EVALUATION_REASON, response.Reason)
@@ -521,7 +521,7 @@ func TestReadOnly(t *testing.T) {
})
require.NoError(t, err)
- assert.Equal(t, true, response.Match)
+ assert.True(t, response.Match)
assert.Equal(t, "flag_no_distributions", response.FlagKey)
assert.Equal(t, evaluation.EvaluationReason_MATCH_EVALUATION_REASON, response.Reason)
assert.Contains(t, response.SegmentKeys, "segment_001")
diff --git a/internal/cache/memory/cache_test.go b/internal/cache/memory/cache_test.go
index 20d72a9ac8..98dabaa1b3 100644
--- a/internal/cache/memory/cache_test.go
+++ b/internal/cache/memory/cache_test.go
@@ -60,15 +60,15 @@ func TestDelete(t *testing.T) {
require.NoError(t, err)
v, ok, err := c.Get(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.True(t, ok)
assert.Equal(t, []byte("value"), v)
err = c.Delete(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
v, ok, err = c.Get(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.False(t, ok)
assert.Nil(t, v)
}
diff --git a/internal/cache/redis/cache_test.go b/internal/cache/redis/cache_test.go
index a97d5d9d6e..0acaf20c1b 100644
--- a/internal/cache/redis/cache_test.go
+++ b/internal/cache/redis/cache_test.go
@@ -37,20 +37,20 @@ func TestGet(t *testing.T) {
defer teardown()
err := c.Set(ctx, "key", []byte("value"))
- assert.NoError(t, err)
+ require.NoError(t, err)
v, ok, err := c.Get(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.True(t, ok)
assert.Equal(t, []byte("value"), v)
v, ok, err = c.Get(ctx, "foo")
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.False(t, ok)
assert.Nil(t, v)
v, ok, err = c.Get(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.True(t, ok)
assert.Equal(t, []byte("value"), v)
}
@@ -64,18 +64,18 @@ func TestDelete(t *testing.T) {
defer teardown()
err := c.Set(ctx, "key", []byte("value"))
- assert.NoError(t, err)
+ require.NoError(t, err)
v, ok, err := c.Get(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.True(t, ok)
assert.Equal(t, []byte("value"), v)
err = c.Delete(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
v, ok, err = c.Get(ctx, "key")
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.False(t, ok)
assert.Nil(t, v)
}
diff --git a/internal/cmd/grpc_test.go b/internal/cmd/grpc_test.go
index 726a76f6d3..447485f2a4 100644
--- a/internal/cmd/grpc_test.go
+++ b/internal/cmd/grpc_test.go
@@ -7,6 +7,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
"go.flipt.io/flipt/internal/config"
"go.flipt.io/flipt/internal/info"
"go.uber.org/zap/zaptest"
@@ -19,7 +20,7 @@ func TestNewGRPCServer(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
t.Cleanup(cancel)
s, err := NewGRPCServer(ctx, zaptest.NewLogger(t), cfg, info.Flipt{}, false)
- assert.NoError(t, err)
+ require.NoError(t, err)
t.Cleanup(func() {
err := s.Shutdown(ctx)
assert.NoError(t, err)
diff --git a/internal/cmd/http_test.go b/internal/cmd/http_test.go
index 791dcd8498..76eb4148be 100644
--- a/internal/cmd/http_test.go
+++ b/internal/cmd/http_test.go
@@ -9,6 +9,7 @@ import (
"github.com/go-chi/chi/v5"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
const (
@@ -40,21 +41,21 @@ func TestTrailingSlashMiddleware(t *testing.T) {
// Request with the middleware on.
req, err := http.NewRequestWithContext(context.TODO(), http.MethodGet, fmt.Sprintf("%s/hello/", s.URL), nil)
- assert.NoError(t, err)
+ require.NoError(t, err)
req.Header.Set(tsoHeader, "on")
res, err := http.DefaultClient.Do(req)
- assert.NoError(t, err)
+ require.NoError(t, err)
- assert.Equal(t, http.StatusOK, res.StatusCode)
+ require.Equal(t, http.StatusOK, res.StatusCode)
res.Body.Close()
// Request with the middleware off.
req, err = http.NewRequestWithContext(context.TODO(), http.MethodGet, fmt.Sprintf("%s/hello/", s.URL), nil)
- assert.NoError(t, err)
+ require.NoError(t, err)
res, err = http.DefaultClient.Do(req)
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.Equal(t, http.StatusNotFound, res.StatusCode)
res.Body.Close()
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 95961bf332..257094457d 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -57,7 +57,7 @@ func TestScheme(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, want, scheme.String())
json, err := scheme.MarshalJSON()
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.JSONEq(t, fmt.Sprintf("%q", want), string(json))
})
}
@@ -90,7 +90,7 @@ func TestCacheBackend(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, want, backend.String())
json, err := backend.MarshalJSON()
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.JSONEq(t, fmt.Sprintf("%q", want), string(json))
})
}
@@ -128,7 +128,7 @@ func TestTracingExporter(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, want, exporter.String())
json, err := exporter.MarshalJSON()
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.JSONEq(t, fmt.Sprintf("%q", want), string(json))
})
}
@@ -176,7 +176,7 @@ func TestDatabaseProtocol(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, want, protocol.String())
json, err := protocol.MarshalJSON()
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.JSONEq(t, fmt.Sprintf("%q", want), string(json))
})
}
@@ -209,7 +209,7 @@ func TestLogEncoding(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, want, encoding.String())
json, err := encoding.MarshalJSON()
- assert.NoError(t, err)
+ require.NoError(t, err)
assert.JSONEq(t, fmt.Sprintf("%q", want), string(json))
})
}
diff --git a/internal/server/audit/types_test.go b/internal/server/audit/types_test.go
index 4334d4eced..739cb3d348 100644
--- a/internal/server/audit/types_test.go
+++ b/internal/server/audit/types_test.go
@@ -80,7 +80,7 @@ func testDistributionHelper(t *testing.T, d *flipt.Distribution) {
assert.Equal(t, nd.Id, d.Id)
assert.Equal(t, nd.RuleId, d.RuleId)
assert.Equal(t, nd.VariantId, d.VariantId)
- assert.Equal(t, nd.Rollout, d.Rollout)
+ assert.InDelta(t, nd.Rollout, d.Rollout, 0)
}
func TestDistribution(t *testing.T) {
d := &flipt.Distribution{
diff --git a/internal/server/authn/method/github/server_test.go b/internal/server/authn/method/github/server_test.go
index 3491e6adea..2ff0c8c8bc 100644
--- a/internal/server/authn/method/github/server_test.go
+++ b/internal/server/authn/method/github/server_test.go
@@ -16,7 +16,6 @@ import (
"github.com/h2non/gock"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "go.flipt.io/flipt/errors"
"go.flipt.io/flipt/internal/config"
middleware "go.flipt.io/flipt/internal/server/middleware/grpc"
"go.flipt.io/flipt/internal/storage/authn/memory"
@@ -174,8 +173,7 @@ func Test_Server(t *testing.T) {
JSON([]githubSimpleOrganization{{Login: "flipt-io"}})
_, err := client.Callback(ctx, &auth.CallbackRequest{Code: "github_code"})
- uerr := errors.ErrUnauthenticatedf("request was not authenticated")
- assert.ErrorAs(t, err, &uerr)
+ assert.ErrorContains(t, err, "request was not authenticated")
})
t.Run("should authorize successfully when the user is a member of one of the allowed organizations and it's inside the allowed team", func(t *testing.T) {
diff --git a/internal/storage/authn/sql/store_test.go b/internal/storage/authn/sql/store_test.go
index fc1fc8a608..db744f56a8 100644
--- a/internal/storage/authn/sql/store_test.go
+++ b/internal/storage/authn/sql/store_test.go
@@ -147,6 +147,7 @@ func TestAuthentication_CreateAuthentication(t *testing.T) {
clientToken, created, err := store.CreateAuthentication(ctx, test.req)
if test.expectedErrAs != nil {
+ // nolint:testifylint
require.ErrorAs(t, err, test.expectedErrAs)
return
}
@@ -202,6 +203,7 @@ func TestAuthentication_GetAuthenticationByClientToken(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
retrieved, err := storeFn(commonOpts(t)...).GetAuthenticationByClientToken(ctx, clientToken)
if expectedErrAs != nil {
+ // nolint:testifylint
require.ErrorAs(t, err, expectedErrAs)
return
}
diff --git a/internal/storage/authn/testing/testing.go b/internal/storage/authn/testing/testing.go
index 2ba855eefa..fb78e10b6d 100644
--- a/internal/storage/authn/testing/testing.go
+++ b/internal/storage/authn/testing/testing.go
@@ -128,9 +128,8 @@ func TestAuthenticationStoreHarness(t *testing.T, fn func(t *testing.T) storagea
auth, err := store.GetAuthenticationByClientToken(ctx, created[99].Token)
var expected errors.ErrNotFound
- if !assert.ErrorAs(t, err, &expected, "authentication still exists in the database") {
- t.Log("Auth still exists", auth)
- }
+ require.ErrorAs(t, err, &expected, "authentication still exists in the database")
+ assert.Nil(t, auth)
})
t.Run("Delete by method Token with before expired constraint", func(t *testing.T) {
diff --git a/internal/storage/sql/evaluation_test.go b/internal/storage/sql/evaluation_test.go
index d2447a26fd..5f4098a273 100644
--- a/internal/storage/sql/evaluation_test.go
+++ b/internal/storage/sql/evaluation_test.go
@@ -570,13 +570,13 @@ func (s *DBTestSuite) TestGetEvaluationDistributions_MaintainOrder() {
assert.Equal(t, rule.Id, evaluationDistributions[0].RuleID)
assert.Equal(t, variant1.Id, evaluationDistributions[0].VariantID)
assert.Equal(t, variant1.Key, evaluationDistributions[0].VariantKey)
- assert.Equal(t, float32(80.00), evaluationDistributions[0].Rollout)
+ assert.InDelta(t, 80.00, evaluationDistributions[0].Rollout, 0)
assert.NotEmpty(t, evaluationDistributions[1].ID)
assert.Equal(t, rule.Id, evaluationDistributions[1].RuleID)
assert.Equal(t, variant2.Id, evaluationDistributions[1].VariantID)
assert.Equal(t, variant2.Key, evaluationDistributions[1].VariantKey)
- assert.Equal(t, float32(20.00), evaluationDistributions[1].Rollout)
+ assert.InDelta(t, 20.00, evaluationDistributions[1].Rollout, 0)
// update dist1 with same values
_, err = s.store.UpdateDistribution(context.TODO(), &flipt.UpdateDistributionRequest{
@@ -612,13 +612,13 @@ func (s *DBTestSuite) TestGetEvaluationDistributions_MaintainOrder() {
assert.Equal(t, rule.Id, evaluationDistributions[0].RuleID)
assert.Equal(t, variant1.Id, evaluationDistributions[0].VariantID)
assert.Equal(t, variant1.Key, evaluationDistributions[0].VariantKey)
- assert.Equal(t, float32(80.00), evaluationDistributions[0].Rollout)
+ assert.InDelta(t, 80.00, evaluationDistributions[0].Rollout, 0)
assert.NotEmpty(t, evaluationDistributions[1].ID)
assert.Equal(t, rule.Id, evaluationDistributions[1].RuleID)
assert.Equal(t, variant2.Id, evaluationDistributions[1].VariantID)
assert.Equal(t, variant2.Key, evaluationDistributions[1].VariantKey)
- assert.Equal(t, float32(20.00), evaluationDistributions[1].Rollout)
+ assert.InDelta(t, 20.00, evaluationDistributions[1].Rollout, 0)
}
func (s *DBTestSuite) TestGetEvaluationRollouts() {
@@ -677,7 +677,7 @@ func (s *DBTestSuite) TestGetEvaluationRollouts() {
assert.Equal(t, "default", evaluationRollouts[0].NamespaceKey)
assert.Equal(t, int32(1), evaluationRollouts[0].Rank)
assert.NotNil(t, evaluationRollouts[0].Threshold)
- assert.Equal(t, float32(50.0), evaluationRollouts[0].Threshold.Percentage)
+ assert.InDelta(t, 50.0, evaluationRollouts[0].Threshold.Percentage, 0)
assert.False(t, evaluationRollouts[0].Threshold.Value, "percentage value is false")
assert.Equal(t, "default", evaluationRollouts[1].NamespaceKey)
@@ -766,7 +766,7 @@ func (s *DBTestSuite) TestGetEvaluationRollouts_NoNamespace() {
assert.Equal(t, "default", evaluationRollouts[0].NamespaceKey)
assert.Equal(t, int32(1), evaluationRollouts[0].Rank)
assert.NotNil(t, evaluationRollouts[0].Threshold)
- assert.Equal(t, float32(50.0), evaluationRollouts[0].Threshold.Percentage)
+ assert.InDelta(t, 50.0, evaluationRollouts[0].Threshold.Percentage, 0)
assert.False(t, evaluationRollouts[0].Threshold.Value, "percentage value is false")
assert.Equal(t, "default", evaluationRollouts[1].NamespaceKey)
@@ -778,7 +778,7 @@ func (s *DBTestSuite) TestGetEvaluationRollouts_NoNamespace() {
assert.Len(t, evaluationRollouts[1].Segment.Segments[firstSegment.Key].Constraints, 1)
assert.Equal(t, secondSegment.Key, evaluationRollouts[1].Segment.Segments[secondSegment.Key].SegmentKey)
- assert.Len(t, evaluationRollouts[1].Segment.Segments[secondSegment.Key].Constraints, 0)
+ assert.Empty(t, evaluationRollouts[1].Segment.Segments[secondSegment.Key].Constraints)
}
func (s *DBTestSuite) TestGetEvaluationRollouts_NonDefaultNamespace() {
@@ -852,7 +852,7 @@ func (s *DBTestSuite) TestGetEvaluationRollouts_NonDefaultNamespace() {
assert.Equal(t, s.namespace, evaluationRollouts[0].NamespaceKey)
assert.Equal(t, int32(1), evaluationRollouts[0].Rank)
assert.NotNil(t, evaluationRollouts[0].Threshold)
- assert.Equal(t, float32(50.0), evaluationRollouts[0].Threshold.Percentage)
+ assert.InDelta(t, 50.0, evaluationRollouts[0].Threshold.Percentage, 0)
assert.False(t, evaluationRollouts[0].Threshold.Value, "percentage value is false")
assert.Equal(t, s.namespace, evaluationRollouts[1].NamespaceKey)
diff --git a/internal/storage/sql/rollout_test.go b/internal/storage/sql/rollout_test.go
index 56b7e8c260..0f6d181b52 100644
--- a/internal/storage/sql/rollout_test.go
+++ b/internal/storage/sql/rollout_test.go
@@ -563,7 +563,7 @@ func (s *DBTestSuite) TestUpdateRollout() {
assert.Equal(t, int32(1), rollout.Rank)
assert.Equal(t, flipt.RolloutType_SEGMENT_ROLLOUT_TYPE, rollout.Type)
assert.Equal(t, segmentOne.Key, rollout.GetSegment().SegmentKey)
- assert.Equal(t, true, rollout.GetSegment().Value)
+ assert.True(t, rollout.GetSegment().Value)
assert.NotZero(t, rollout.CreatedAt)
assert.Equal(t, rollout.CreatedAt.Seconds, rollout.UpdatedAt.Seconds)
assert.Equal(t, flipt.SegmentOperator_OR_SEGMENT_OPERATOR, rollout.GetSegment().SegmentOperator)
@@ -650,7 +650,7 @@ func (s *DBTestSuite) TestUpdateRollout_OneSegment() {
assert.Equal(t, flipt.RolloutType_SEGMENT_ROLLOUT_TYPE, rollout.Type)
assert.Contains(t, rollout.GetSegment().SegmentKeys, segmentOne.Key)
assert.Contains(t, rollout.GetSegment().SegmentKeys, segmentTwo.Key)
- assert.Equal(t, true, rollout.GetSegment().Value)
+ assert.True(t, rollout.GetSegment().Value)
assert.NotZero(t, rollout.CreatedAt)
assert.Equal(t, rollout.CreatedAt.Seconds, rollout.UpdatedAt.Seconds)
assert.Equal(t, flipt.SegmentOperator_AND_SEGMENT_OPERATOR, rollout.GetSegment().SegmentOperator)
@@ -717,8 +717,8 @@ func (s *DBTestSuite) TestUpdateRolloutNamespace() {
assert.Equal(t, flag.Key, rollout.FlagKey)
assert.Equal(t, int32(1), rollout.Rank)
assert.Equal(t, flipt.RolloutType_THRESHOLD_ROLLOUT_TYPE, rollout.Type)
- assert.Equal(t, float32(40), rollout.GetThreshold().Percentage)
- assert.Equal(t, true, rollout.GetThreshold().Value)
+ assert.InDelta(t, 40, rollout.GetThreshold().Percentage, 0)
+ assert.True(t, rollout.GetThreshold().Value)
assert.NotZero(t, rollout.CreatedAt)
assert.Equal(t, rollout.CreatedAt.Seconds, rollout.UpdatedAt.Seconds)
@@ -743,8 +743,8 @@ func (s *DBTestSuite) TestUpdateRolloutNamespace() {
assert.Equal(t, "foobar", updated.Description)
assert.Equal(t, int32(1), updated.Rank)
assert.Equal(t, flipt.RolloutType_THRESHOLD_ROLLOUT_TYPE, updated.Type)
- assert.Equal(t, float32(80), updated.GetThreshold().Percentage)
- assert.Equal(t, false, updated.GetThreshold().Value)
+ assert.InDelta(t, 80, updated.GetThreshold().Percentage, 0)
+ assert.False(t, updated.GetThreshold().Value)
assert.NotZero(t, updated.CreatedAt)
assert.NotZero(t, updated.UpdatedAt)
}
@@ -794,7 +794,7 @@ func (s *DBTestSuite) TestUpdateRollout_InvalidType() {
assert.Equal(t, int32(1), rollout.Rank)
assert.Equal(t, flipt.RolloutType_SEGMENT_ROLLOUT_TYPE, rollout.Type)
assert.Equal(t, "segment_one", rollout.GetSegment().SegmentKey)
- assert.Equal(t, true, rollout.GetSegment().Value)
+ assert.True(t, rollout.GetSegment().Value)
assert.NotZero(t, rollout.CreatedAt)
assert.Equal(t, rollout.CreatedAt.Seconds, rollout.UpdatedAt.Seconds)
@@ -908,7 +908,7 @@ func (s *DBTestSuite) TestDeleteRollout() {
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 2, len(got))
+ assert.Len(t, got, 2)
assert.Equal(t, rollouts[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)
assert.Equal(t, storage.DefaultNamespace, got[0].NamespaceKey)
@@ -968,7 +968,7 @@ func (s *DBTestSuite) TestDeleteRolloutNamespace() {
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 2, len(got))
+ assert.Len(t, got, 2)
assert.Equal(t, rollouts[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)
assert.Equal(t, s.namespace, got[0].NamespaceKey)
@@ -1078,7 +1078,7 @@ func (s *DBTestSuite) TestOrderRollouts() {
require.NoError(t, err)
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 3, len(got))
+ assert.Len(t, got, 3)
assert.Equal(t, rollouts[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)
@@ -1152,7 +1152,7 @@ func (s *DBTestSuite) TestOrderRolloutsNamespace() {
require.NoError(t, err)
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 3, len(got))
+ assert.Len(t, got, 3)
assert.Equal(t, rollouts[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)
diff --git a/internal/storage/sql/rule_test.go b/internal/storage/sql/rule_test.go
index 571bc621c6..b9784d5f8d 100644
--- a/internal/storage/sql/rule_test.go
+++ b/internal/storage/sql/rule_test.go
@@ -682,11 +682,11 @@ func (s *DBTestSuite) TestListRulesPagination_FullWalk() {
require.Len(t, found[i].Distributions, 2)
assert.Equal(t, found[i].Id, found[i].Distributions[0].RuleId)
assert.Equal(t, variant.Id, found[i].Distributions[0].VariantId)
- assert.Equal(t, float32(100.0), found[i].Distributions[0].Rollout)
+ assert.InDelta(t, 100.0, found[i].Distributions[0].Rollout, 0)
assert.Equal(t, found[i].Id, found[i].Distributions[1].RuleId)
assert.Equal(t, variant.Id, found[i].Distributions[1].VariantId)
- assert.Equal(t, float32(100.0), found[i].Distributions[1].Rollout)
+ assert.InDelta(t, 100.0, found[i].Distributions[1].Rollout, 0)
}
}
@@ -749,7 +749,7 @@ func (s *DBTestSuite) TestCreateRuleAndDistribution() {
assert.NotZero(t, distribution.Id)
assert.Equal(t, rule.Id, distribution.RuleId)
assert.Equal(t, variant.Id, distribution.VariantId)
- assert.Equal(t, float32(100), distribution.Rollout)
+ assert.InDelta(t, 100, distribution.Rollout, 0)
assert.NotZero(t, distribution.CreatedAt)
assert.Equal(t, distribution.CreatedAt.Seconds, distribution.UpdatedAt.Seconds)
}
@@ -821,7 +821,7 @@ func (s *DBTestSuite) TestCreateRuleAndDistributionNamespace() {
assert.NotZero(t, distribution.Id)
assert.Equal(t, rule.Id, distribution.RuleId)
assert.Equal(t, variant.Id, distribution.VariantId)
- assert.Equal(t, float32(100), distribution.Rollout)
+ assert.InDelta(t, 100, distribution.Rollout, 0)
assert.NotZero(t, distribution.CreatedAt)
assert.Equal(t, distribution.CreatedAt.Seconds, distribution.UpdatedAt.Seconds)
}
@@ -999,7 +999,7 @@ func (s *DBTestSuite) TestUpdateRuleAndDistribution() {
assert.NotZero(t, distribution.Id)
assert.Equal(t, rule.Id, distribution.RuleId)
assert.Equal(t, variantOne.Id, distribution.VariantId)
- assert.Equal(t, float32(100), distribution.Rollout)
+ assert.InDelta(t, 100, distribution.Rollout, 0)
assert.NotZero(t, distribution.CreatedAt)
assert.Equal(t, distribution.CreatedAt.Seconds, distribution.UpdatedAt.Seconds)
@@ -1063,7 +1063,7 @@ func (s *DBTestSuite) TestUpdateRuleAndDistribution() {
assert.Equal(t, distribution.Id, updatedDistribution.Id)
assert.Equal(t, rule.Id, updatedDistribution.RuleId)
assert.Equal(t, variantOne.Id, updatedDistribution.VariantId)
- assert.Equal(t, float32(10), updatedDistribution.Rollout)
+ assert.InDelta(t, 10, updatedDistribution.Rollout, 0)
assert.NotZero(t, rule.UpdatedAt)
// update distribution variant
@@ -1079,7 +1079,7 @@ func (s *DBTestSuite) TestUpdateRuleAndDistribution() {
assert.Equal(t, distribution.Id, updatedDistribution.Id)
assert.Equal(t, rule.Id, updatedDistribution.RuleId)
assert.Equal(t, variantTwo.Id, updatedDistribution.VariantId)
- assert.Equal(t, float32(10), updatedDistribution.Rollout)
+ assert.InDelta(t, 10, updatedDistribution.Rollout, 0)
assert.NotZero(t, rule.UpdatedAt)
err = s.store.DeleteDistribution(context.TODO(), &flipt.DeleteDistributionRequest{
@@ -1166,7 +1166,7 @@ func (s *DBTestSuite) TestUpdateRuleAndDistributionNamespace() {
assert.NotZero(t, distribution.Id)
assert.Equal(t, rule.Id, distribution.RuleId)
assert.Equal(t, variantOne.Id, distribution.VariantId)
- assert.Equal(t, float32(100), distribution.Rollout)
+ assert.InDelta(t, 100, distribution.Rollout, 0)
assert.NotZero(t, distribution.CreatedAt)
assert.Equal(t, distribution.CreatedAt.Seconds, distribution.UpdatedAt.Seconds)
@@ -1212,7 +1212,7 @@ func (s *DBTestSuite) TestUpdateRuleAndDistributionNamespace() {
assert.Equal(t, distribution.Id, updatedDistribution.Id)
assert.Equal(t, rule.Id, updatedDistribution.RuleId)
assert.Equal(t, variantOne.Id, updatedDistribution.VariantId)
- assert.Equal(t, float32(10), updatedDistribution.Rollout)
+ assert.InDelta(t, 10, updatedDistribution.Rollout, 0)
// assert.Equal(t, distribution.CreatedAt.Seconds, updatedDistribution.CreatedAt.Seconds)
assert.NotZero(t, rule.UpdatedAt)
@@ -1230,7 +1230,7 @@ func (s *DBTestSuite) TestUpdateRuleAndDistributionNamespace() {
assert.Equal(t, distribution.Id, updatedDistribution.Id)
assert.Equal(t, rule.Id, updatedDistribution.RuleId)
assert.Equal(t, variantTwo.Id, updatedDistribution.VariantId)
- assert.Equal(t, float32(10), updatedDistribution.Rollout)
+ assert.InDelta(t, 10, updatedDistribution.Rollout, 0)
// assert.Equal(t, distribution.CreatedAt.Seconds, updatedDistribution.CreatedAt.Seconds)
assert.NotZero(t, rule.UpdatedAt)
@@ -1368,7 +1368,7 @@ func (s *DBTestSuite) TestDeleteRule() {
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 2, len(got))
+ assert.Len(t, got, 2)
assert.Equal(t, rules[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)
assert.Equal(t, storage.DefaultNamespace, got[0].NamespaceKey)
@@ -1443,7 +1443,7 @@ func (s *DBTestSuite) TestDeleteRuleNamespace() {
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 2, len(got))
+ assert.Len(t, got, 2)
assert.Equal(t, rules[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)
assert.Equal(t, s.namespace, got[0].NamespaceKey)
@@ -1565,7 +1565,7 @@ func (s *DBTestSuite) TestOrderRules() {
require.NoError(t, err)
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 3, len(got))
+ assert.Len(t, got, 3)
assert.Equal(t, rules[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)
@@ -1654,7 +1654,7 @@ func (s *DBTestSuite) TestOrderRulesNamespace() {
require.NoError(t, err)
got := res.Results
assert.NotNil(t, got)
- assert.Equal(t, 3, len(got))
+ assert.Len(t, got, 3)
assert.Equal(t, rules[0].Id, got[0].Id)
assert.Equal(t, int32(1), got[0].Rank)