From 4dbcefb51e193563ad969ce0ca95a44fe70832b1 Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Sun, 21 Jun 2026 10:21:40 -0700 Subject: [PATCH 1/7] Apply testifylint auto-fixes --- chasm/fields_iterator_test.go | 2 +- chasm/registry_test.go | 44 ++-- chasm/tree_test.go | 2 +- chasm/visibility_value_test.go | 2 +- client/history/historytest/clienttest.go | 4 +- common/api/metadata_test.go | 4 +- .../archiver/filestore/query_parser_test.go | 2 +- common/archiver/filestore/util_test.go | 8 +- .../archiver/gcloud/connector/client_test.go | 4 +- .../archiver/gcloud/history_archiver_test.go | 10 +- common/archiver/gcloud/util_test.go | 10 +- common/archiver/history_iterator_test.go | 6 +- common/archiver/s3store/util_test.go | 6 +- .../authorization/default_authorizer_test.go | 2 +- .../default_jwt_claim_mapper_test.go | 12 +- common/backoff/jitter_test.go | 24 +- common/backoff/retrypolicy_test.go | 36 +-- common/cache/lru_test.go | 34 +-- common/cluster/metadata_test.go | 6 +- common/collection/concurrent_tx_map_test.go | 8 +- common/collection/paging_iterator_test.go | 8 +- common/collection/sync_map_test.go | 4 +- common/dynamicconfig/collection_test.go | 14 +- common/dynamicconfig/deepcopy_test.go | 4 +- .../dynamicconfig/file_based_client_test.go | 20 +- common/effect/buffer_test.go | 8 +- common/effect/immediate_test.go | 4 +- common/finalizer/finalizer_test.go | 6 +- common/goro/goro_test.go | 2 +- common/locks/id_mutex_test.go | 2 +- common/locks/priority_mutex_test.go | 4 +- common/log/zap_logger_test.go | 16 +- common/masker/masker_test.go | 6 +- common/membership/ringpop/factory_test.go | 4 +- common/membership/ringpop/monitor_test.go | 24 +- common/metrics/grpc_test.go | 20 +- .../metrics/metricstest/task_queues_test.go | 4 +- common/metrics/otel_metrics_handler_test.go | 4 +- common/metrics/registry_test.go | 4 +- common/metrics/tally/statsd/reporter_test.go | 2 +- common/namespace/namespace_test.go | 2 +- common/namespace/nsregistry/registry_test.go | 8 +- .../replication_task_executor_test.go | 18 +- common/payload/payload_test.go | 4 +- common/payloads/payloads_test.go | 2 +- common/persistence/client/quotas_test.go | 2 +- common/persistence/history_node_util_test.go | 2 +- .../history_task_queue_manager_test.go | 2 +- .../fixed_address_translator_test.go | 2 +- .../operation_mode_validator_test.go | 48 ++-- .../cluster_metadata_manager.go | 54 ++--- .../history_v2_persistence.go | 206 +++++++++--------- .../metadata_persistence_v2.go | 112 +++++----- .../persistence-tests/queue_persistence.go | 40 ++-- .../persistence_metrics_clients_test.go | 8 +- common/persistence/query_util_test.go | 2 +- .../serialization/serializer_test.go | 16 +- .../serialization/task_serializers_test.go | 12 +- common/persistence/serializer_test.go | 16 +- .../sqlplugin/mysql/session/session_test.go | 2 +- .../sqlplugin/tests/history_transfer_task.go | 2 +- .../tests/history_visibility_task.go | 2 +- .../sql/sqlplugin/tests/queue_v2.go | 8 +- .../tests/execution_mutable_state.go | 2 +- .../tests/execution_mutable_state_task.go | 6 +- .../persistence/tests/nexus_endpoint_suite.go | 4 +- .../persistence/tests/queue_v2_test_suite.go | 18 +- .../tests/visibility_persistence_suite.go | 118 +++++----- .../versionhistory/version_history_test.go | 16 +- .../store/elasticsearch/converter_test.go | 8 +- .../store/elasticsearch/processor_test.go | 8 +- .../visibility_store_read_test.go | 60 ++--- .../visibility_store_write_test.go | 10 +- .../store/sql/pagination_token_legacy_test.go | 6 +- .../workflow_state_status_validator_test.go | 4 +- common/retrypolicy/retry_policy_test.go | 6 +- common/rpc/context_test.go | 4 +- common/rpc/dial_tracer_test.go | 4 +- common/rpc/encryption/tls_config_test.go | 60 ++--- .../interceptor/dc_redirection_policy_test.go | 44 ++-- .../interceptor/mask_internal_error_test.go | 2 +- common/rpc/interceptor/sdk_version_test.go | 2 +- common/rpc/interceptor/stream_error_test.go | 4 +- common/rpc/test/rpc_common_test.go | 2 +- common/rpc/test/rpc_localstore_tls_test.go | 2 +- common/searchattribute/manager_test.go | 12 +- .../sadefs/encode_value_test.go | 2 +- common/searchattribute/stringify_test.go | 2 +- common/searchattribute/validator_test.go | 2 +- .../service_error_with_dpanic_test.go | 4 +- common/stream_batcher/batcher_test.go | 2 +- common/tasks/group_by_scheduler_test.go | 6 +- common/telemetry/config_test.go | 22 +- common/telemetry/grpc_test.go | 4 +- .../testing/historyrequire/history_require.go | 6 +- common/util/strings_test.go | 6 +- common/util/util_test.go | 8 +- .../worker_versioning_test.go | 4 +- schema/embed_test.go | 2 +- service/frontend/admin_handler_test.go | 20 +- service/frontend/configs/quotas_test.go | 6 +- service/frontend/namespace_handler_test.go | 28 +-- service/frontend/nexus_handler_test.go | 14 +- service/frontend/workflow_handler_test.go | 20 +- .../api/command_attr_validator_test.go | 14 +- .../getdlqtasks/getdlqtaskstest/apitest.go | 2 +- service/history/api/pollupdate/api_test.go | 2 +- .../api/respondactivitytaskfailed/api_test.go | 8 +- .../signal_with_start_workflow_test.go | 2 +- .../history/api/signalworkflow/api_test.go | 2 +- .../archival_queue_task_executor_test.go | 2 +- service/history/configs/quotas_test.go | 2 +- service/history/events/cache_test.go | 6 +- service/history/events/notifier_test.go | 8 +- service/history/handler_test.go | 2 +- service/history/history_engine2_test.go | 48 ++-- .../history/history_engine3_eventsv2_test.go | 10 +- service/history/history_engine_test.go | 142 ++++++------ .../historybuilder/history_builder_test.go | 39 ++-- service/history/hsm/tree_test.go | 8 +- service/history/queues/queue_base_test.go | 32 +-- service/history/queues/reader_group_test.go | 2 +- service/history/queues/reader_test.go | 2 +- service/history/queues/slice_test.go | 6 +- .../executable_history_task_test.go | 8 +- .../stream_sender_flow_controller_test.go | 2 +- service/history/shard/context_test.go | 20 +- service/history/shard/controller_test.go | 8 +- service/history/shard/ownership_test.go | 2 +- .../history/shard/task_key_generator_test.go | 2 +- service/history/tasks/key_test.go | 10 +- .../timer_queue_active_task_executor_test.go | 18 +- .../timer_queue_standby_task_executor_test.go | 40 ++-- ...ransfer_queue_active_task_executor_test.go | 10 +- ...ansfer_queue_standby_task_executor_test.go | 36 +-- .../visibility_queue_task_executor_test.go | 28 +-- service/history/workflow/activity_test.go | 24 +- service/history/workflow/cache/cache_test.go | 2 +- .../workflow/mutable_state_impl_test.go | 94 ++++---- .../workflow/mutable_state_rebuilder_test.go | 96 ++++---- .../history/workflow/query_registry_test.go | 6 +- service/history/workflow/query_test.go | 2 +- .../workflow/state_machine_timers_test.go | 12 +- .../history/workflow/task_generator_test.go | 14 +- .../history/workflow/timer_sequence_test.go | 2 +- .../workflow/update/abort_reason_test.go | 2 +- .../history/workflow/update/registry_test.go | 8 +- service/matching/fair_level_test.go | 2 +- service/matching/matcher_data_test.go | 14 +- service/matching/matcher_test.go | 30 +-- service/matching/matching_engine_test.go | 150 ++++++------- service/matching/reachability_test.go | 8 +- .../task_queue_partition_manager_test.go | 20 +- service/matching/task_validation_test.go | 4 +- service/matching/version_rule_helper_test.go | 2 +- service/matching/version_rule_test.go | 12 +- .../worker/deletenamespace/activities_test.go | 2 +- .../deleteexecutions/workflow_test.go | 4 +- .../reclaimresources/workflow_test.go | 13 +- .../worker/deletenamespace/workflow_test.go | 4 +- service/worker/dlq/workflow_test.go | 2 +- service/worker/migration/activities_test.go | 12 +- .../force_replication_workflow_test.go | 6 +- .../worker/scanner/executions/task_test.go | 4 +- .../worker/scanner/history/scavenger_test.go | 36 +-- temporal/environment/env_test.go | 2 +- temporal/fx_test.go | 2 +- tools/cassandra/cqlclient_tests.go | 2 +- tools/cassandra/handler_test.go | 20 +- tools/cassandra/setup_task_tests.go | 6 +- tools/cassandra/update_task_tests.go | 4 +- tools/cassandra/version_tests.go | 2 +- tools/common/schema/handler_test.go | 8 +- tools/common/schema/test/dbtest.go | 38 ++-- tools/common/schema/test/setuptest.go | 18 +- tools/common/schema/test/updatetest.go | 18 +- tools/common/schema/updatetask_test.go | 20 +- tools/elasticsearch/main_test.go | 4 +- tools/sql/clitest/conn_tests.go | 2 +- tools/sql/clitest/handler_tests.go | 6 +- tools/sql/clitest/update_task_tests.go | 2 +- tools/tdbg/app_test.go | 2 +- tools/tdbg/util_test.go | 8 +- tools/testrunner/junit_test.go | 2 +- tools/testrunner/log_test.go | 4 +- 185 files changed, 1396 insertions(+), 1400 deletions(-) diff --git a/chasm/fields_iterator_test.go b/chasm/fields_iterator_test.go index 261ca0ff68a..4d7737ffe79 100644 --- a/chasm/fields_iterator_test.go +++ b/chasm/fields_iterator_test.go @@ -211,7 +211,7 @@ func (s *fieldsIteratorSuite) TestUnmanagedFieldsOf() { for r := range unmanagedFieldsOf(reflect.TypeFor[unmanagedFields]()) { result = append(result, r.name) } - s.Equal(2, len(result)) + s.Len(result, 2) s.ElementsMatch([]string{"unmanaged", "anotherPtr"}, result) } diff --git a/chasm/registry_test.go b/chasm/registry_test.go index 8429f03eb17..5ace693f07c 100644 --- a/chasm/registry_test.go +++ b/chasm/registry_test.go @@ -57,29 +57,29 @@ func (s *RegistryTestSuite) TestRegistry_RegisterComponents_Success() { lib.EXPECT().NexusServiceProcessors().Return(nil) err := r.Register(lib) - require.NoError(s.T(), err) + s.Require().NoError(err) rc1, ok := r.Component("TestLibrary.Component1") - require.True(s.T(), ok) - require.Equal(s.T(), "TestLibrary.Component1", rc1.FqType()) + s.Require().True(ok) + s.Require().Equal("TestLibrary.Component1", rc1.FqType()) missingRC, ok := r.Component("TestLibrary.Component2") - require.False(s.T(), ok) - require.Nil(s.T(), missingRC) + s.Require().False(ok) + s.Require().Nil(missingRC) cInstance1 := chasm.NewMockComponent(ctrl) rc2, ok := r.ComponentFor(cInstance1) - require.True(s.T(), ok) - require.Equal(s.T(), "TestLibrary.Component1", rc2.FqType()) + s.Require().True(ok) + s.Require().Equal("TestLibrary.Component1", rc2.FqType()) rc2, ok = r.ComponentOf(reflect.TypeOf(cInstance1)) - require.True(s.T(), ok) - require.Equal(s.T(), "TestLibrary.Component1", rc2.FqType()) + s.Require().True(ok) + s.Require().Equal("TestLibrary.Component1", rc2.FqType()) cInstance2 := "invalid component instance" rc3, ok := r.ComponentFor(cInstance2) - require.False(s.T(), ok) - require.Nil(s.T(), rc3) + s.Require().False(ok) + s.Require().Nil(rc3) } func (s *RegistryTestSuite) TestRegistry_RegisterComponents_WithDetached() { @@ -129,31 +129,31 @@ func (s *RegistryTestSuite) TestRegistry_RegisterTasks_Success() { }) err := r.Register(lib) - require.NoError(s.T(), err) + s.Require().NoError(err) rt1, ok := r.Task("TestLibrary.Task1") - require.True(s.T(), ok) - require.Equal(s.T(), "TestLibrary.Task1", rt1.FqType()) + s.Require().True(ok) + s.Require().Equal("TestLibrary.Task1", rt1.FqType()) s.Require().Equal("test-task-group", rt1.TaskGroup()) missingRT, ok := r.Task("TestLibrary.TaskMissing") - require.False(s.T(), ok) - require.Nil(s.T(), missingRT) + s.Require().False(ok) + s.Require().Nil(missingRT) tInstance1 := testTask2{} rt2, ok := r.TaskFor(tInstance1) - require.True(s.T(), ok) - require.Equal(s.T(), "TestLibrary.Task2", rt2.FqType()) + s.Require().True(ok) + s.Require().Equal("TestLibrary.Task2", rt2.FqType()) s.Require().Equal(rt2.FqType(), rt2.TaskGroup()) rt2, ok = r.TaskOf(reflect.TypeOf(tInstance1)) - require.True(s.T(), ok) - require.Equal(s.T(), "TestLibrary.Task2", rt2.FqType()) + s.Require().True(ok) + s.Require().Equal("TestLibrary.Task2", rt2.FqType()) tInstance2 := "invalid task instance" rt3, ok := r.TaskFor(tInstance2) - require.False(s.T(), ok) - require.Nil(s.T(), rt3) + s.Require().False(ok) + s.Require().Nil(rt3) } func (s *RegistryTestSuite) TestRegistry_Register_LibraryError() { diff --git a/chasm/tree_test.go b/chasm/tree_test.go index 0cb36f65926..72c9bd2e310 100644 --- a/chasm/tree_test.go +++ b/chasm/tree_test.go @@ -752,7 +752,7 @@ func (s *nodeSuite) TestDeserializeNode_ComponentAttributes() { s.IsType(&TestComponent{}, node.value) tc := node.value.(*TestComponent) s.Equal(tc.SubComponent1.Internal.node, node.children["SubComponent1"]) - s.Equal(tc.ComponentData.CreateRequestId, "component-data") + s.Equal("component-data", tc.ComponentData.CreateRequestId) s.Equal(valueStateSynced, node.valueState) s.Nil(tc.SubComponent1.Internal.value()) diff --git a/chasm/visibility_value_test.go b/chasm/visibility_value_test.go index fd6bb8d6feb..1bdd77c2efd 100644 --- a/chasm/visibility_value_test.go +++ b/chasm/visibility_value_test.go @@ -46,7 +46,7 @@ func TestVisibilityValue(t *testing.T) { var out bool err := payload.Decode(p, &out) require.NoError(t, err) - require.Equal(t, true, out) + require.True(t, out) require.True(t, v.Equal(VisibilityValueBool(true))) require.False(t, v.Equal(VisibilityValueBool(false))) diff --git a/client/history/historytest/clienttest.go b/client/history/historytest/clienttest.go index effa2479c77..f758fad6848 100644 --- a/client/history/historytest/clienttest.go +++ b/client/history/historytest/clienttest.go @@ -94,7 +94,7 @@ func TestClient(t *testing.T, historyTaskQueueManager persistence.HistoryTaskQue PageSize: 10, }) require.NoError(t, err) - assert.Equal(t, 1, len(res.DlqTasks)) + assert.Len(t, res.DlqTasks, 1) assert.Equal(t, int64(persistence.FirstQueueMessageID+1), res.DlqTasks[0].Metadata.MessageId) }) @@ -128,7 +128,7 @@ func readTasks( NextPageToken: nextPageToken, }) require.NoError(t, err) - assert.Equal(t, 1, len(res.DlqTasks)) + assert.Len(t, res.DlqTasks, 1) assert.Equal(t, int64(persistence.FirstQueueMessageID+i), res.DlqTasks[0].Metadata.MessageId) nextPageToken = res.NextPageToken } diff --git a/common/api/metadata_test.go b/common/api/metadata_test.go index 6b7791a6cd5..4a768098bb1 100644 --- a/common/api/metadata_test.go +++ b/common/api/metadata_test.go @@ -105,6 +105,6 @@ func getMethodNames(tp reflect.Type) []string { func TestServiceName(t *testing.T) { assert.Equal(t, WorkflowServicePrefix, ServiceName(WorkflowServicePrefix+"SomeAPI")) assert.Equal(t, AdminServicePrefix, ServiceName(AdminServicePrefix+"SomeAPI")) - assert.Equal(t, "", ServiceName("SomeAPI")) - assert.Equal(t, "", ServiceName("")) + assert.Empty(t, ServiceName("SomeAPI")) + assert.Empty(t, ServiceName("")) } diff --git a/common/archiver/filestore/query_parser_test.go b/common/archiver/filestore/query_parser_test.go index 1b5c8ab607b..ed1939cb5b7 100644 --- a/common/archiver/filestore/query_parser_test.go +++ b/common/archiver/filestore/query_parser_test.go @@ -221,7 +221,7 @@ func (s *queryParserSuite) TestParseCloseStatus() { s.NoError(err) s.Equal(tc.parsedQuery.emptyResult, parsedQuery.emptyResult) if !tc.parsedQuery.emptyResult { - s.EqualValues(tc.parsedQuery.status, parsedQuery.status) + s.Equal(tc.parsedQuery.status, parsedQuery.status) } } } diff --git a/common/archiver/filestore/util_test.go b/common/archiver/filestore/util_test.go index ff994157f50..5a9901e3fc3 100644 --- a/common/archiver/filestore/util_test.go +++ b/common/archiver/filestore/util_test.go @@ -147,7 +147,7 @@ func (s *UtilSuite) TestListFilesByPrefix() { } actualFileNames, err := listFilesByPrefix(dir, "file_") s.NoError(err) - s.Equal(len(expectedFileNames), len(actualFileNames)) + s.Len(actualFileNames, len(expectedFileNames)) } func (s *UtilSuite) TestEncodeDecodeHistoryBatches() { @@ -398,16 +398,16 @@ func (s *UtilSuite) TestSerializeDeserializeGetHistoryToken() { } serializedToken, err := serializeToken(token) - s.Nil(err) + s.NoError(err) deserializedToken, err := deserializeGetHistoryToken(serializedToken) - s.Nil(err) + s.NoError(err) s.Equal(token, deserializedToken) } func (s *UtilSuite) createFile(dir string, filename string) { err := os.WriteFile(filepath.Join(dir, filename), []byte("file contents"), testFileMode) - s.Nil(err) + s.NoError(err) } func (s *UtilSuite) assertFileExists(filepath string) { diff --git a/common/archiver/gcloud/connector/client_test.go b/common/archiver/gcloud/connector/client_test.go index 10c32a9dfc4..87278fccf8c 100644 --- a/common/archiver/gcloud/connector/client_test.go +++ b/common/archiver/gcloud/connector/client_test.go @@ -240,7 +240,7 @@ func (s *clientSuite) TestQuery() { s.Require().NoError(err) fileNames, err = storageWrapper.Query(ctx, URI, "7478875943689868082123907395549832634615673687049942026838") s.Require().NoError(err) - s.Equal(strings.Join(fileNames, ", "), "fileName_01") + s.Equal("fileName_01", strings.Join(fileNames, ", ")) } func (s *clientSuite) TestQueryWithFilter() { @@ -277,7 +277,7 @@ func (s *clientSuite) TestQueryWithFilter() { fileNames, _, _, err = storageWrapper.QueryWithFilters(ctx, URI, "closeTimeout_2020-02-27T09:42:28Z", 0, 0, []connector.Precondition{newWorkflowIDPrecondition("4418294404690464320")}) s.Require().NoError(err) - s.Equal(strings.Join(fileNames, ", "), "closeTimeout_2020-02-27T09:42:28Z_12851121011173788097_4418294404690464320_15619178330501475177.visibility") + s.Equal("closeTimeout_2020-02-27T09:42:28Z_12851121011173788097_4418294404690464320_15619178330501475177.visibility", strings.Join(fileNames, ", ")) } func newWorkflowIDPrecondition(workflowID string) connector.Precondition { diff --git a/common/archiver/gcloud/history_archiver_test.go b/common/archiver/gcloud/history_archiver_test.go index 237118461f3..f800ff23dba 100644 --- a/common/archiver/gcloud/history_archiver_test.go +++ b/common/archiver/gcloud/history_archiver_test.go @@ -517,7 +517,7 @@ func (h *historyArchiverSuite) TestGet_Success_PageSize() { response, err := historyArchiver.Get(ctx, h.testArchivalURI, request) h.NoError(err) h.NotNil(response.NextPageToken) - h.EqualValues(len(response.HistoryBatches), 2) + h.EqualValues(2, len(response.HistoryBatches)) } func (h *historyArchiverSuite) TestGet_Success_FromToken() { @@ -557,15 +557,15 @@ func (h *historyArchiverSuite) TestGet_Success_FromToken() { token, err = deserializeGetHistoryToken(response.NextPageToken) h.NoError(err) - h.EqualValues(5, token.HighestPart) - h.EqualValues(5, token.CurrentPart) - h.EqualValues(3, len(response.HistoryBatches)) + h.Equal(5, token.HighestPart) + h.Equal(5, token.CurrentPart) + h.Len(response.HistoryBatches, 3) numOfEvents := 0 for _, batch := range response.HistoryBatches { numOfEvents += len(batch.Events) } - h.EqualValues(4, numOfEvents) + h.Equal(4, numOfEvents) } func (h *historyArchiverSuite) TestGet_NoHistory() { diff --git a/common/archiver/gcloud/util_test.go b/common/archiver/gcloud/util_test.go index 26f335d182e..232562c8e60 100644 --- a/common/archiver/gcloud/util_test.go +++ b/common/archiver/gcloud/util_test.go @@ -92,10 +92,10 @@ func (s *utilSuite) TestSerializeDeserializeGetHistoryToken() { } serializedToken, err := serializeToken(token) - s.Nil(err) + s.NoError(err) deserializedToken, err := deserializeGetHistoryToken(serializedToken) - s.Nil(err) + s.NoError(err) s.Equal(token, deserializedToken) } @@ -144,7 +144,7 @@ func (s *utilSuite) TestWorkflowIdPrecondition() { } for _, testCase := range testCases { - s.Equal(newWorkflowIDPrecondition(testCase.workflowID)(testCase.fileName), testCase.expectedResult) + s.Equal(testCase.expectedResult, newWorkflowIDPrecondition(testCase.workflowID)(testCase.fileName)) } } @@ -177,7 +177,7 @@ func (s *utilSuite) TestRunIdPrecondition() { } for _, testCase := range testCases { - s.Equal(newRunIDPrecondition(testCase.runID)(testCase.fileName), testCase.expectedResult) + s.Equal(testCase.expectedResult, newRunIDPrecondition(testCase.runID)(testCase.fileName)) } } @@ -214,7 +214,7 @@ func (s *utilSuite) TestWorkflowTypeNamePrecondition() { } for _, testCase := range testCases { - s.Equal(newWorkflowTypeNamePrecondition(testCase.workflowTypeName)(testCase.fileName), testCase.expectedResult) + s.Equal(testCase.expectedResult, newWorkflowTypeNamePrecondition(testCase.workflowTypeName)(testCase.fileName)) } } diff --git a/common/archiver/history_iterator_test.go b/common/archiver/history_iterator_test.go index be1e86f1ab6..2765c546a5d 100644 --- a/common/archiver/history_iterator_test.go +++ b/common/archiver/history_iterator_test.go @@ -99,7 +99,7 @@ func (s *HistoryIteratorSuite) TestReadHistory_Success_EventsV2() { itr := s.constructTestHistoryIterator(s.mockExecutionMgr, testDefaultTargetHistoryBlobSize, nil) history, err := itr.readHistory(context.Background(), common.FirstEventID) s.NoError(err) - s.Len(history, 0) + s.Empty(history) } // In the following test: @@ -325,7 +325,7 @@ func (s *HistoryIteratorSuite) TestNext_Fail_IteratorDepleted() { // set target history batches such that a single call to next will read all of history itr := s.constructTestHistoryIterator(s.mockExecutionMgr, 16*testDefaultHistoryEventSize, nil) blob, err := itr.Next(context.Background()) - s.Nil(err) + s.NoError(err) expectedIteratorState := historyIteratorState{ // when iteration is finished page token is not advanced @@ -561,7 +561,7 @@ func (s *HistoryIteratorSuite) TestNext_Success_SameHistoryDifferentPage() { s.NoError(err) s.Equal(history1.Header, history2.Header) - s.Equal(len(history1.Body), len(history2.Body)) + s.Len(history2.Body, len(history1.Body)) s.Equal(expectedFirstEventID[i], history1.Body[0].Events[0].GetEventId()) s.Equal(expectedFirstEventID[i], history2.Body[0].Events[0].GetEventId()) } diff --git a/common/archiver/s3store/util_test.go b/common/archiver/s3store/util_test.go index 34d5a629254..9b5b831c8d4 100644 --- a/common/archiver/s3store/util_test.go +++ b/common/archiver/s3store/util_test.go @@ -10,11 +10,10 @@ func TestConstructVisibilitySearchPrefix(t *testing.T) { t.Parallel() assert.Equal( t, - constructVisibilitySearchPrefix( + "path/namespaceID/visibility", constructVisibilitySearchPrefix( "path", "namespaceID", ), - "path/namespaceID/visibility", ) } @@ -22,13 +21,12 @@ func TestConstructIndexedVisibilitySearchPrefix(t *testing.T) { t.Parallel() assert.Equal( t, - constructIndexedVisibilitySearchPrefix( + "path/namespaceID/visibility/primaryIndexKey/primaryIndexValue/secondaryIndexType", constructIndexedVisibilitySearchPrefix( "/path", "namespaceID", "primaryIndexKey", "primaryIndexValue", "secondaryIndexType", ), - "path/namespaceID/visibility/primaryIndexKey/primaryIndexValue/secondaryIndexType", ) } diff --git a/common/authorization/default_authorizer_test.go b/common/authorization/default_authorizer_test.go index 344accf3b9e..0316688c677 100644 --- a/common/authorization/default_authorizer_test.go +++ b/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) diff --git a/common/authorization/default_jwt_claim_mapper_test.go b/common/authorization/default_jwt_claim_mapper_test.go index 2c683c65fa1..34dcfdd944f 100644 --- a/common/authorization/default_jwt_claim_mapper_test.go +++ b/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) diff --git a/common/backoff/jitter_test.go b/common/backoff/jitter_test.go index 9b3f5bf62fd..9e4e2344d6e 100644 --- a/common/backoff/jitter_test.go +++ b/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, 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, 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, 0) + s.Less(result, input) } } diff --git a/common/backoff/retrypolicy_test.go b/common/backoff/retrypolicy_test.go index 78ee024a282..79f622454f7 100644 --- a/common/backoff/retrypolicy_test.go +++ b/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) } } diff --git a/common/cache/lru_test.go b/common/cache/lru_test.go index bb73bc38ab4..4c3c3fe03ac 100644 --- a/common/cache/lru_test.go +++ b/common/cache/lru_test.go @@ -67,7 +67,7 @@ func TestLRU(t *testing.T) { assert.Nil(t, cache.Get("B")) // Oldest, should be evicted assert.Equal(t, 4, cache.Size()) snapshot = capture.Snapshot() - assert.Equal(t, 2, len(snapshot[metrics.CacheUsage.Name()])) + assert.Len(t, snapshot[metrics.CacheUsage.Name()], 2) assert.Equal(t, float64(4), snapshot[metrics.CacheUsage.Name()][1].Value) // Access C, D is now LRU @@ -81,7 +81,7 @@ func TestLRU(t *testing.T) { assert.Nil(t, cache.Get("A")) assert.Equal(t, 3, cache.Size()) snapshot = capture.Snapshot() - assert.Equal(t, 1, len(snapshot[metrics.CacheUsage.Name()])) + assert.Len(t, snapshot[metrics.CacheUsage.Name()], 1) assert.Equal(t, float64(3), snapshot[metrics.CacheUsage.Name()][0].Value) } @@ -136,10 +136,10 @@ func TestLRUWithTTL(t *testing.T) { timeSource.Advance(time.Millisecond * 300) assert.Nil(t, cache.Get("A")) snapshot = capture.Snapshot() - assert.Equal(t, 2, len(snapshot[metrics.CacheUsage.Name()])) + assert.Len(t, snapshot[metrics.CacheUsage.Name()], 2) assert.Equal(t, float64(0), snapshot[metrics.CacheUsage.Name()][1].Value) assert.Equal(t, 0, cache.Size()) - assert.Equal(t, 1, len(snapshot[metrics.CacheEntryAgeOnGet.Name()])) + assert.Len(t, snapshot[metrics.CacheEntryAgeOnGet.Name()], 1) assert.Equal(t, time.Millisecond*300, snapshot[metrics.CacheEntryAgeOnEviction.Name()][0].Value) } @@ -389,7 +389,7 @@ func TestZeroSizeCache(t *testing.T) { cache := NewLRU(0, metrics.NoopMetricsHandler) _, err := cache.PutIfNotExist("A", t) assert.NoError(t, err) - assert.Equal(t, nil, cache.Get("A")) + assert.Nil(t, cache.Get("A")) assert.Equal(t, 0, cache.Size()) it := cache.Iterator() assert.False(t, it.HasNext()) @@ -398,7 +398,7 @@ func TestZeroSizeCache(t *testing.T) { cache.Delete("A") v, err := cache.PutIfNotExist("A", t) assert.Equal(t, v, t) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, 0, cache.Size()) } @@ -409,12 +409,12 @@ func TestCache_ItemSizeTooLarge(t *testing.T) { cache := NewLRU(maxTotalBytes, metrics.NoopMetricsHandler) res := cache.Put(uuid.New(), &testEntryWithCacheSize{maxTotalBytes}) - assert.Equal(t, res, nil) + assert.Nil(t, res) assert.Equal(t, 10, cache.Size()) res, err := cache.PutIfNotExist(uuid.New(), &testEntryWithCacheSize{maxTotalBytes + 1}) assert.Equal(t, err, ErrCacheItemTooLarge) - assert.Equal(t, res, nil) + assert.Nil(t, res) assert.Equal(t, 10, cache.Size()) } @@ -435,7 +435,7 @@ func TestCache_ItemHasCacheSizeDefined(t *testing.T) { go func() { startWG.Wait() - assert.True(t, cache.Size() < maxTotalBytes) + assert.Less(t, cache.Size(), maxTotalBytes) }() for range numPuts { go func() { @@ -492,7 +492,7 @@ func TestCache_ItemHasCacheSizeDefined_PutWithSameKeyAndDifferentSizes(t *testin assert.Equal(t, 8, cache.Size()) // put same key with smaller size, should not evict any items cache.Put(key2, &testEntryWithCacheSize{3}) - assert.Equal(t, cache.Get(key1), &testEntryWithCacheSize{4}) + assert.Equal(t, &testEntryWithCacheSize{4}, cache.Get(key1)) // 8 - 4 + 3 = 7 < 10, should not evict any items assert.Equal(t, 7, cache.Size()) @@ -501,15 +501,15 @@ func TestCache_ItemHasCacheSizeDefined_PutWithSameKeyAndDifferentSizes(t *testin // 7 - 3 + 6 = 10 =< 10, should not evict any items assert.Equal(t, 10, cache.Size()) // get key1 after to make it the most recently used - assert.Equal(t, cache.Get(key2), &testEntryWithCacheSize{6}) - assert.Equal(t, cache.Get(key1), &testEntryWithCacheSize{4}) + assert.Equal(t, &testEntryWithCacheSize{6}, cache.Get(key2)) + assert.Equal(t, &testEntryWithCacheSize{4}, cache.Get(key1)) // put same key with larger size, but take all cache size, should evict all items cache.Put(key2, &testEntryWithCacheSize{10}) // 10 - 4 - 6 + 10 = 10 =< 10, should evict all items assert.Equal(t, 10, cache.Size()) - assert.Equal(t, cache.Get(key1), nil) - assert.Equal(t, cache.Get(key2), &testEntryWithCacheSize{10}) + assert.Nil(t, cache.Get(key1)) + assert.Equal(t, &testEntryWithCacheSize{10}, cache.Get(key2)) } func TestCache_ItemHasCacheSizeDefined_PutWithSameKey(t *testing.T) { @@ -709,11 +709,11 @@ func TestCache_InvokeLifecycleCallbacks(t *testing.T) { TTL: ttl, TimeSource: timeSource, OnPut: func(val any) { - require.Equal(t, val, "value") + require.Equal(t, "value", val) onPut++ }, OnEvict: func(val any) { - require.Equal(t, val, "value") + require.Equal(t, "value", val) onEvict++ }, }, @@ -803,7 +803,7 @@ func TestCache_UnusedExpiry(t *testing.T) { // The cache should still have entry 4, r.Equal(1, cache.Size()) // but this Get call will check the (hard) ttl & expire it. - r.Equal(nil, cache.Get(4)) + r.Nil(cache.Get(4)) } func TestCache_UnusedExpiryPin(t *testing.T) { diff --git a/common/cluster/metadata_test.go b/common/cluster/metadata_test.go index d4abbc476ed..fbe8ecca44c 100644 --- a/common/cluster/metadata_test.go +++ b/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) } diff --git a/common/collection/concurrent_tx_map_test.go b/common/collection/concurrent_tx_map_test.go index c69d4947467..10b520e9632 100644 --- a/common/collection/concurrent_tx_map_test.go +++ b/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") } diff --git a/common/collection/paging_iterator_test.go b/common/collection/paging_iterator_test.go index e788af230f0..e34507177d4 100644 --- a/common/collection/paging_iterator_test.go +++ b/common/collection/paging_iterator_test.go @@ -50,7 +50,7 @@ func (s *pagingIteratorSuite) TestIteration_NoErr() { pagingFn := func(token []byte) ([]int, []byte, error) { switch phase { case 0: - s.Equal(0, len(token)) + s.Empty(token) defer func() { phase++ }() return outputs[phase], tokens[phase], nil case 1: @@ -74,7 +74,7 @@ func (s *pagingIteratorSuite) TestIteration_NoErr() { ite := NewPagingIterator(pagingFn) for ite.HasNext() { num, err := ite.Next() - s.Nil(err) + s.NoError(err) result = append(result, num) } s.Equal([]int{1, 2, 3, 4, 5, 6}, result) @@ -95,7 +95,7 @@ func (s *pagingIteratorSuite) TestIteration_Err_Beginging() { s.True(ite.HasNext()) item, err := ite.Next() s.Nil(item) - s.NotNil(err) + s.Error(err) s.False(ite.HasNext()) } @@ -111,7 +111,7 @@ func (s *pagingIteratorSuite) TestIteration_Err_NotBegining() { pagingFn := func(token []byte) ([]any, []byte, error) { switch phase { case 0: - s.Equal(0, len(token)) + s.Empty(token) defer func() { phase++ }() return outputs[phase], tokens[phase], nil case 1: diff --git a/common/collection/sync_map_test.go b/common/collection/sync_map_test.go index 87521542f79..80d6c21152c 100644 --- a/common/collection/sync_map_test.go +++ b/common/collection/sync_map_test.go @@ -122,7 +122,7 @@ func TestMap_Pop_ReturnsTrueWhenKeyExists(t *testing.T) { func TestMap_PopAll(t *testing.T) { m := collection.NewSyncMap[int, int]() values := m.PopAll() - assert.Equal(t, 0, len(values)) + assert.Empty(t, values) m.Set(1, 1) m.Set(2, 2) @@ -133,7 +133,7 @@ func TestMap_PopAll(t *testing.T) { mCopy := m values = m.PopAll() - assert.Equal(t, 3, len(values)) + assert.Len(t, values, 3) sum := 0 for _, v := range values { sum += v diff --git a/common/dynamicconfig/collection_test.go b/common/dynamicconfig/collection_test.go index 7ae80fdbd63..9964293e6f0 100644 --- a/common/dynamicconfig/collection_test.go +++ b/common/dynamicconfig/collection_test.go @@ -129,20 +129,20 @@ 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() { @@ -150,9 +150,9 @@ func (s *collectionSuite) TestGetBoolPropertyFilteredByTaskQueueInfo() { 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() { diff --git a/common/dynamicconfig/deepcopy_test.go b/common/dynamicconfig/deepcopy_test.go index a612eafbb15..e2e58d6cd25 100644 --- a/common/dynamicconfig/deepcopy_test.go +++ b/common/dynamicconfig/deepcopy_test.go @@ -70,7 +70,7 @@ func TestDeepCopy_Map(t *testing.T) { b := deepCopyForMapstructure(a) a[3] = 7 a[8] = 9 - assert.Equal(t, b[3], 5) + assert.Equal(t, 5, b[3]) assert.Zero(t, b[8]) } @@ -81,7 +81,7 @@ func TestDeepCopy_MapMap(t *testing.T) { } b := deepCopyForMapstructure(a) a[5]["five"] = 3 - assert.Equal(t, b[5]["five"], 5) + assert.Equal(t, 5, b[5]["five"]) } func TestDeepCopy_OtherReferenceTypes_Nil(t *testing.T) { diff --git a/common/dynamicconfig/file_based_client_test.go b/common/dynamicconfig/file_based_client_test.go index 5ae15d8c50d..612ef11e2a8 100644 --- a/common/dynamicconfig/file_based_client_test.go +++ b/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") } diff --git a/common/effect/buffer_test.go b/common/effect/buffer_test.go index c26d23a40bf..6a7db23a219 100644 --- a/common/effect/buffer_test.go +++ b/common/effect/buffer_test.go @@ -47,8 +47,8 @@ func TestBufferCancelAfterApply(t *testing.T) { buf.Apply(context.TODO()) buf.Cancel(context.TODO()) - require.Equal(t, commit, 1) - require.Equal(t, rollback, 0) + require.Equal(t, 1, commit) + require.Equal(t, 0, rollback) } func TestBufferApplyAfterCancel(t *testing.T) { @@ -64,6 +64,6 @@ func TestBufferApplyAfterCancel(t *testing.T) { buf.Apply(context.TODO()) buf.Cancel(context.TODO()) - require.Equal(t, commit, 0) - require.Equal(t, rollback, 1) + require.Equal(t, 0, commit) + require.Equal(t, 1, rollback) } diff --git a/common/effect/immediate_test.go b/common/effect/immediate_test.go index bf25924bc1a..85c60e86416 100644 --- a/common/effect/immediate_test.go +++ b/common/effect/immediate_test.go @@ -12,8 +12,8 @@ func TestImmediate(t *testing.T) { var i int immediate := effect.Immediate(context.TODO()) immediate.OnAfterCommit(func(context.Context) { i = 1 }) - require.Equal(t, i, 1, "commit func should have run") + require.Equal(t, 1, i, "commit func should have run") immediate.OnAfterRollback(func(context.Context) { i = 2 }) - require.Equal(t, i, 1, "rollback func should not run") + require.Equal(t, 1, i, "rollback func should not run") } diff --git a/common/finalizer/finalizer_test.go b/common/finalizer/finalizer_test.go index 0e80f591fae..52d134403c9 100644 --- a/common/finalizer/finalizer_test.go +++ b/common/finalizer/finalizer_test.go @@ -76,7 +76,7 @@ func TestFinalizer(t *testing.T) { })) } - require.EqualValues(t, 5, f.Run(1*time.Second)) + require.Equal(t, 5, f.Run(1*time.Second)) require.EqualValues(t, 5, completed.Load()) snap := capture.Snapshot() @@ -105,7 +105,7 @@ func TestFinalizer(t *testing.T) { capture := mh.StartCapture() completed := f.Run(timeout) - require.EqualValues(t, 1, completed, "expected only one callback to complete") + require.Equal(t, 1, completed, "expected only one callback to complete") snap := capture.Snapshot() require.Equal(t, int64(1), snap[metrics.FinalizerItemsCompleted.Name()][0].Value) @@ -142,7 +142,7 @@ func TestFinalizer(t *testing.T) { func(ctx context.Context) error { return nil })) - require.EqualValues(t, 1, f.Run(1*time.Second)) + require.Equal(t, 1, f.Run(1*time.Second)) // 2nd call require.Zero(t, f.Run(1*time.Second), "expected no callbacks to complete") diff --git a/common/goro/goro_test.go b/common/goro/goro_test.go index 3b5d56c4d6c..7aef59865ac 100644 --- a/common/goro/goro_test.go +++ b/common/goro/goro_test.go @@ -43,7 +43,7 @@ func TestGoroCancel(t *testing.T) { g.Cancel() <-g.Done() require.ErrorIs(t, context.Canceled, g.Err()) - require.Nil(t, pctx.Err()) + require.NoError(t, pctx.Err()) } func TestGoroMultiCancel(t *testing.T) { diff --git a/common/locks/id_mutex_test.go b/common/locks/id_mutex_test.go index ec1c70ae721..f0fc6c65e95 100644 --- a/common/locks/id_mutex_test.go +++ b/common/locks/id_mutex_test.go @@ -202,6 +202,6 @@ func (s *idMutexSuite) TestConcurrentAccess() { s.Equal(iteration, counter) impl := s.idMutex.(*idMutexImpl) for i := uint32(0); i < s.numShard; i++ { - s.Equal(0, len(impl.shards[i].mutexInfos)) + s.Empty(impl.shards[i].mutexInfos) } } diff --git a/common/locks/priority_mutex_test.go b/common/locks/priority_mutex_test.go index d31d75b9c8a..4c72492a626 100644 --- a/common/locks/priority_mutex_test.go +++ b/common/locks/priority_mutex_test.go @@ -179,7 +179,7 @@ func (s *priorityMutexSuite) TestLock_Mixed() { for result := range resultChan { results = append(results, result) } - s.Equal(2*concurrency, len(results)) + s.Len(results, 2*concurrency) zeros := float64(0) totalZeros := float64(concurrency) @@ -197,5 +197,5 @@ func (s *priorityMutexSuite) TestLock_Mixed() { overallPossibility := possibility / float64(concurrency) fmt.Printf("overall possibility: %.2f\n", overallPossibility) - s.True(overallPossibility >= 0.5) + s.GreaterOrEqual(overallPossibility, 0.5) } diff --git a/common/log/zap_logger_test.go b/common/log/zap_logger_test.go index a5746c83060..191a108c3a7 100644 --- a/common/log/zap_logger_test.go +++ b/common/log/zap_logger_test.go @@ -52,7 +52,7 @@ func (s *LogSuite) TestNewLogger() { log := BuildZapLogger(cfg) s.NotNil(log) _, err := os.Stat(dir + "/test.log") - s.Nil(err) + s.NoError(err) log.DPanic("Development default is false; should not panic here!") s.Panics(nil, func() { log.Panic("Must Panic") @@ -66,7 +66,7 @@ func (s *LogSuite) TestNewLogger() { log = BuildZapLogger(cfg) s.NotNil(log) _, err = os.Stat(dir + "/test.log") - s.Nil(err) + s.NoError(err) s.Panics(nil, func() { log.DPanic("Must panic!") }) @@ -100,12 +100,12 @@ func TestDefaultLogger(t *testing.T) { withLogger.Info("Log message with tag") // put Stdout back to normal state - require.Nil(t, w.Close()) + require.NoError(t, w.Close()) os.Stdout = old // restoring the real stdout out := <-outC sps := strings.Split(preCaller, ":") par, err := strconv.Atoi(sps[1]) - assert.Nil(t, err) + assert.NoError(t, err) lineNum := fmt.Sprintf("%v", par+1) assert.Regexp(t, `{"level":"info","msg":"test info","error":"test error","wf-action":"add-workflow-started-event","logging-call-at":".*zap_logger_test.go:`+lineNum+`"}`+"\n", out) @@ -134,12 +134,12 @@ func TestThrottleLogger(t *testing.T) { With(With(logger, tag.Error(fmt.Errorf("test error"))), tag.ComponentShardContext).Info("test info", tag.WorkflowActionWorkflowStarted) // back to normal state - require.Nil(t, w.Close()) + require.NoError(t, w.Close()) os.Stdout = old // restoring the real stdout out := <-outC sps := strings.Split(preCaller, ":") par, err := strconv.Atoi(sps[1]) - assert.Nil(t, err) + assert.NoError(t, err) lineNum := fmt.Sprintf("%v", par+1) fmt.Println(out, lineNum) assert.Regexp(t, `{"level":"info","msg":"test info","error":"test error","component":"shard-context","wf-action":"add-workflow-started-event","logging-call-at":".*zap_logger_test.go:`+lineNum+`"}`+"\n", out) @@ -163,12 +163,12 @@ func TestEmptyMsg(t *testing.T) { logger.With(tag.Error(fmt.Errorf("test error"))).Info("", tag.WorkflowActionWorkflowStarted) // back to normal state - require.Nil(t, w.Close()) + require.NoError(t, w.Close()) os.Stdout = old // restoring the real stdout out := <-outC sps := strings.Split(preCaller, ":") par, err := strconv.Atoi(sps[1]) - assert.Nil(t, err) + assert.NoError(t, err) lineNum := fmt.Sprintf("%v", par+1) fmt.Println(out, lineNum) assert.Regexp(t, `{"level":"info","msg":"`+defaultMsgForEmpty+`","error":"test error","wf-action":"add-workflow-started-event","logging-call-at":".*zap_logger_test.go:`+lineNum+`"}`+"\n", out) diff --git a/common/masker/masker_test.go b/common/masker/masker_test.go index d1962ce1433..b5adb362764 100644 --- a/common/masker/masker_test.go +++ b/common/masker/masker_test.go @@ -68,9 +68,9 @@ func TestMaskYaml(t *testing.T) { maskedYaml, err := MaskYaml(yaml, DefaultYAMLFieldNames) assert.NoError(err) - assert.True(strings.Contains(yaml, "secret")) - assert.False(strings.Contains(maskedYaml, "secret")) - assert.True(strings.Contains(maskedYaml, "******")) + assert.Contains(yaml, "secret") + assert.NotContains(maskedYaml, "secret") + assert.Contains(maskedYaml, "******") fmt.Println(maskedYaml) } diff --git a/common/membership/ringpop/factory_test.go b/common/membership/ringpop/factory_test.go index f0d7e654146..6f7a9d61662 100644 --- a/common/membership/ringpop/factory_test.go +++ b/common/membership/ringpop/factory_test.go @@ -110,7 +110,7 @@ func (s *RingpopSuite) TearDownSuite() { func (s *RingpopSuite) TestHostsMode() { var cfg config.Membership err := yaml.Unmarshal([]byte(getHostsConfig()), &cfg) - s.Nil(err) + s.NoError(err) s.Equal("1.2.3.4", cfg.BroadcastAddress) s.Equal(time.Second*30, cfg.MaxJoinDuration) @@ -120,7 +120,7 @@ func (s *RingpopSuite) TestHostsMode() { Logger: log.Logger(log.NewNoopLogger()), } f, err := newFactory(params) - s.Nil(err) + s.NoError(err) s.NotNil(f) } diff --git a/common/membership/ringpop/monitor_test.go b/common/membership/ringpop/monitor_test.go index 292fb5a607f..2a605a82ef3 100644 --- a/common/membership/ringpop/monitor_test.go +++ b/common/membership/ringpop/monitor_test.go @@ -41,10 +41,10 @@ func (s *RpoSuite) TestMonitor() { r, err := rpm.GetResolver(serviceName) s.NoError(err) err = r.AddListener("test-listener", listenCh) - s.Nil(err, "AddListener failed") + s.NoError(err, "AddListener failed") host, err := r.Lookup("key") - s.Nil(err, "Ringpop monitor failed to find host for key") + s.NoError(err, "Ringpop monitor failed to find host for key") s.NotNil(host, "Ringpop monitor returned a nil host") s.Eventually(func() bool { @@ -65,7 +65,7 @@ func (s *RpoSuite) TestMonitor() { select { case e := <-listenCh: s.T().Log("Got update") - s.Equal(1, len(e.HostsRemoved), "ringpop monitor event does not report the removed host") + s.Len(e.HostsRemoved, 1, "ringpop monitor event does not report the removed host") s.Equal(testService.hostAddrs[1], e.HostsRemoved[0].GetAddress(), "ringpop monitor reported that a wrong host was removed") s.Nil(e.HostsAdded, "Unexpected host reported to be added by ringpop monitor") s.Nil(e.HostsChanged, "Unexpected host reported to be changed by ringpop monitor") @@ -75,7 +75,7 @@ func (s *RpoSuite) TestMonitor() { for k := range 10 { host, err = r.Lookup(fmt.Sprintf("key%d", k)) - s.Nil(err, "Ringpop monitor failed to find host for key") + s.NoError(err, "Ringpop monitor failed to find host for key") s.NotEqual(testService.hostAddrs[1], host.GetAddress(), "Ringpop monitor assigned key to dead host") // check that LookupN[0] is the same as Lookup @@ -83,8 +83,8 @@ func (s *RpoSuite) TestMonitor() { s.Len(hosts, 1) s.Equal(host.GetAddress(), hosts[0].GetAddress()) } - s.Equal(2, len(r.Members())) - s.Equal(2, len(r.AvailableMembers())) + s.Len(r.Members(), 2) + s.Len(r.AvailableMembers(), 2) s.T().Log("Draining host 2") testService.DrainHost(testService.hostUUIDs[2]) @@ -94,17 +94,17 @@ func (s *RpoSuite) TestMonitor() { s.T().Log("Got update") s.Nil(e.HostsRemoved) s.Nil(e.HostsAdded) - s.Equal(1, len(e.HostsChanged)) + s.Len(e.HostsChanged, 1) s.Equal(testService.hostAddrs[2], e.HostsChanged[0].GetAddress()) case <-timer.C: s.Fail("Timed out waiting for failure to be detected by ringpop") } - s.Equal(2, len(r.Members())) - s.Equal(1, len(r.AvailableMembers())) + s.Len(r.Members(), 2) + s.Len(r.AvailableMembers(), 1) err = r.RemoveListener("test-listener") - s.Nil(err, "RemoveListener() failed") + s.NoError(err, "RemoveListener() failed") testService.Stop() } @@ -218,8 +218,8 @@ func (s *RpoSuite) TestCompareMembersWithDraining() { resolver.ringAndHosts.Store(ringAndHosts{ hosts: newMembers, }) - s.Equal(3, len(resolver.Members())) - s.Equal(2, len(resolver.AvailableMembers())) + s.Len(resolver.Members(), 3) + s.Len(resolver.AvailableMembers(), 2) } func eventToString(event *membership.ChangedEvent) []string { diff --git a/common/metrics/grpc_test.go b/common/metrics/grpc_test.go index 34724682094..3e67a2c004a 100644 --- a/common/metrics/grpc_test.go +++ b/common/metrics/grpc_test.go @@ -73,21 +73,21 @@ func (s *grpcSuite) TestMetadataMetricInjection() { }, ) - s.Nil(err) + s.NoError(err) trailers := ssts.CapturedTrailers() - s.Equal(1, len(trailers)) + s.Len(trailers, 1) propagationContextBlobs := trailers[0].Get(metricsTrailerKey) s.NotNil(propagationContextBlobs) - s.Equal(1, len(propagationContextBlobs)) + s.Len(propagationContextBlobs, 1) baggage := &metricsspb.Baggage{} err = baggage.Unmarshal(([]byte)(propagationContextBlobs[0])) - s.Nil(err) + s.NoError(err) s.Equal(int64(1234), baggage.CountersInt[anyMetricName]) return res, err }, ) - s.Nil(err) + s.NoError(err) s.Equal(10, res) s.Assert() } @@ -129,21 +129,21 @@ func (s *grpcSuite) TestMetadataMetricInjection_NoMetricPresent() { }, ) - s.Nil(err) + s.NoError(err) trailers := ssts.CapturedTrailers() - s.Equal(1, len(trailers)) + s.Len(trailers, 1) propagationContextBlobs := trailers[0].Get(metricsTrailerKey) s.NotNil(propagationContextBlobs) - s.Equal(1, len(propagationContextBlobs)) + s.Len(propagationContextBlobs, 1) baggage := &metricsspb.Baggage{} err = baggage.Unmarshal(([]byte)(propagationContextBlobs[0])) - s.Nil(err) + s.NoError(err) s.Nil(baggage.CountersInt) return res, err }, ) - s.Nil(err) + s.NoError(err) s.Equal(10, res) s.Assert() } diff --git a/common/metrics/metricstest/task_queues_test.go b/common/metrics/metricstest/task_queues_test.go index 22485551181..bc81d3bdeda 100644 --- a/common/metrics/metricstest/task_queues_test.go +++ b/common/metrics/metricstest/task_queues_test.go @@ -81,7 +81,7 @@ func verifyTags(t *testing.T, handler metrics.Handler, expectedTags map[string]s h.Counter("MyMetric").Record(1) snap := capture.Snapshot() h.StopCapture(capture) - a.Equal(1, len(snap)) - a.Equal(1, len(snap["MyMetric"])) + a.Len(snap, 1) + a.Len(snap["MyMetric"], 1) a.Equal(expectedTags, snap["MyMetric"][0].Tags) } diff --git a/common/metrics/otel_metrics_handler_test.go b/common/metrics/otel_metrics_handler_test.go index e186e79ec9f..8ced74ec7da 100644 --- a/common/metrics/otel_metrics_handler_test.go +++ b/common/metrics/otel_metrics_handler_test.go @@ -88,7 +88,7 @@ func TestMeter(t *testing.T) { var got metricdata.ResourceMetrics err = rdr.Collect(ctx, &got) - assert.Nil(t, err) + assert.NoError(t, err) want := []metricdata.Metrics{ { @@ -232,7 +232,7 @@ func TestMeter_TimerInSeconds(t *testing.T) { var got metricdata.ResourceMetrics err = rdr.Collect(ctx, &got) - assert.Nil(t, err) + assert.NoError(t, err) want := []metricdata.Metrics{ { diff --git a/common/metrics/registry_test.go b/common/metrics/registry_test.go index 586e5a210bd..30709d839e4 100644 --- a/common/metrics/registry_test.go +++ b/common/metrics/registry_test.go @@ -14,8 +14,8 @@ func TestRegistryBuildCatalog_Ok(t *testing.T) { r.register(newMetricDefinition("foo", WithDescription("foo description"))) r.register(newMetricDefinition("bar", WithDescription("bar description"))) c, err := r.buildCatalog() - require.Nil(t, err) - require.Equal(t, 2, len(c)) + require.NoError(t, err) + require.Len(t, c, 2) require.Equal(t, "foo description", c["foo"].description) require.Equal(t, "bar description", c["bar"].description) } diff --git a/common/metrics/tally/statsd/reporter_test.go b/common/metrics/tally/statsd/reporter_test.go index 029017f4103..463871000ad 100644 --- a/common/metrics/tally/statsd/reporter_test.go +++ b/common/metrics/tally/statsd/reporter_test.go @@ -63,7 +63,7 @@ func TestMetricNameWithSeparatedTags(t *testing.T) { if sep == "" { // Tags should be embedded. - assert.Equal(t, newName, "test-metric-name3.tag1.123.tag2.456.tag3.789") + assert.Equal(t, "test-metric-name3.tag1.123.tag2.456.tag3.789", newName) } else { // Tags will be appended with the separator. assert.True(t, strings.HasPrefix(newName, name)) diff --git a/common/namespace/namespace_test.go b/common/namespace/namespace_test.go index b676cf7eafd..653fc236e2d 100644 --- a/common/namespace/namespace_test.go +++ b/common/namespace/namespace_test.go @@ -120,5 +120,5 @@ func TestNamespace_GetCustomData(t *testing.T) { data := ns.GetCustomData("foo") assert.Equal(t, "bar", data) data2 := ns.GetCustomData("fake") - assert.Equal(t, "", data2) + assert.Empty(t, data2) } diff --git a/common/namespace/nsregistry/registry_test.go b/common/namespace/nsregistry/registry_test.go index da2760f576b..ad42f508ad4 100644 --- a/common/namespace/nsregistry/registry_test.go +++ b/common/namespace/nsregistry/registry_test.go @@ -186,17 +186,17 @@ func (s *registrySuite) TestListNamespace() { defer s.registry.Stop() entryByName1, err := s.registry.GetNamespace(namespace.Name(namespaceRecord1.Namespace.Info.Name)) - s.Nil(err) + s.NoError(err) s.Equal(entry1, entryByName1) entryByID1, err := s.registry.GetNamespaceByID(namespace.ID(namespaceRecord1.Namespace.Info.Id)) - s.Nil(err) + s.NoError(err) s.Equal(entry1, entryByID1) entryByName2, err := s.registry.GetNamespace(namespace.Name(namespaceRecord2.Namespace.Info.Name)) - s.Nil(err) + s.NoError(err) s.Equal(entry2, entryByName2) entryByID2, err := s.registry.GetNamespaceByID(namespace.ID(namespaceRecord2.Namespace.Info.Id)) - s.Nil(err) + s.NoError(err) s.Equal(entry2, entryByID2) } diff --git a/common/namespace/nsreplication/replication_task_executor_test.go b/common/namespace/nsreplication/replication_task_executor_test.go index 8b8cde153be..ff465514692 100644 --- a/common/namespace/nsreplication/replication_task_executor_test.go +++ b/common/namespace/nsreplication/replication_task_executor_test.go @@ -123,7 +123,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas task.Id = uuid.NewString() task.Info.Name = name err := s.namespaceReplicator.Execute(context.Background(), task) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) task.Id = id @@ -145,7 +145,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas }).Times(2) s.mockMetadataMgr.EXPECT().CreateNamespace(gomock.Any(), gomock.Any()).Return(nil, errors.New("test")) err = s.namespaceReplicator.Execute(context.Background(), task) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -254,7 +254,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas IsGlobalNamespace: true, }) err := s.namespaceReplicator.Execute(context.Background(), task) - s.Nil(err) + s.NoError(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTask_Duplicate() { @@ -299,7 +299,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas }}, nil).Times(1) s.mockMetadataMgr.EXPECT().CreateNamespace(gomock.Any(), gomock.Any()).Return(nil, errors.New("test")) err := s.namespaceReplicator.Execute(context.Background(), task) - s.Nil(err) + s.NoError(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_NamespaceNotExist() { @@ -384,7 +384,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ IsGlobalNamespace: true, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.Nil(err) + s.NoError(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_UpdateConfig_UpdateActiveCluster() { @@ -487,7 +487,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ NotificationVersion: updateFailoverVersion, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.Nil(err) + s.NoError(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_UpdateConfig_NoUpdateActiveCluster() { @@ -581,7 +581,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ NotificationVersion: updateFailoverVersion, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.Nil(err) + s.NoError(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_NoUpdateConfig_UpdateActiveCluster() { @@ -663,7 +663,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ NotificationVersion: updateFailoverVersion, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.Nil(err) + s.NoError(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_NoUpdateConfig_NoUpdateActiveCluster() { @@ -733,7 +733,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ s.mockMetadataMgr.EXPECT().UpdateNamespace(gomock.Any(), gomock.Any()).Times(0) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.Nil(err) + s.NoError(err) } // TestExecute_UpdateNamespaceTask_FailoverPropagatesNormalState verifies the diff --git a/common/payload/payload_test.go b/common/payload/payload_test.go index 00659d23d94..3aafcd59924 100644 --- a/common/payload/payload_test.go +++ b/common/payload/payload_test.go @@ -39,7 +39,7 @@ func TestToString(t *testing.T) { }) s.NoError(err) result = ToString(p) - s.Equal(`{"Int":10,"String":"str","Bytes":"MzQ1"}`, result) + s.JSONEq(`{"Int":10,"String":"str","Bytes":"MzQ1"}`, result) p, err = Encode(nil) s.NoError(err) @@ -47,7 +47,7 @@ func TestToString(t *testing.T) { s.Equal("nil", result) result = ToString(nil) - s.Equal("", result) + s.Empty(result) } func TestEncodeDecode(t *testing.T) { diff --git a/common/payloads/payloads_test.go b/common/payloads/payloads_test.go index 593c0ae04a7..be0f922c032 100644 --- a/common/payloads/payloads_test.go +++ b/common/payloads/payloads_test.go @@ -37,7 +37,7 @@ func TestToString(t *testing.T) { }, 10, "str") assert.NoError(err) result = ToString(p) - assert.Equal(`[{"Int":10,"String":"str","Bytes":"MzQ1"}, 10, "str"]`, result) + assert.JSONEq(`[{"Int":10,"String":"str","Bytes":"MzQ1"}, 10, "str"]`, result) result = ToString(nil) assert.Equal("[]", result) diff --git a/common/persistence/client/quotas_test.go b/common/persistence/client/quotas_test.go index 874fdcf4413..6063089b398 100644 --- a/common/persistence/client/quotas_test.go +++ b/common/persistence/client/quotas_test.go @@ -62,7 +62,7 @@ func (s *quotasSuite) TestBackgroundTypeAPIPriorityOverrideMapping() { func (s *quotasSuite) TestRequestPrioritiesOrdered() { for idx := range RequestPrioritiesOrdered[1:] { - s.True(RequestPrioritiesOrdered[idx] < RequestPrioritiesOrdered[idx+1]) + s.Less(RequestPrioritiesOrdered[idx], RequestPrioritiesOrdered[idx+1]) } } diff --git a/common/persistence/history_node_util_test.go b/common/persistence/history_node_util_test.go index af82a63c149..10cd187c72d 100644 --- a/common/persistence/history_node_util_test.go +++ b/common/persistence/history_node_util_test.go @@ -65,7 +65,7 @@ func (s *historyNodeMetadataSuite) TestIndexNodeIDToNode() { for nodeID := common.FirstEventID; nodeID < int64(numNodeIDs+1); nodeID++ { nodes := nodeIDToNode[int64(nodeID)] for i := 1; i < nodePerNodeID; i++ { - s.True(nodes[i-1].transactionID >= nodes[i].transactionID) + s.GreaterOrEqual(nodes[i-1].transactionID, nodes[i].transactionID) } } } diff --git a/common/persistence/history_task_queue_manager_test.go b/common/persistence/history_task_queue_manager_test.go index cb0bf24a105..2bd358b910b 100644 --- a/common/persistence/history_task_queue_manager_test.go +++ b/common/persistence/history_task_queue_manager_test.go @@ -24,7 +24,7 @@ func TestQueueKey_Determinism(t *testing.T) { SourceCluster: "a", TargetCluster: "b", }.GetQueueName() - assert.Equal(t, name, "1_a_b_5aAf7hTg") + assert.Equal(t, "1_a_b_5aAf7hTg", name) } // TestQueueKey_Conflicts tests that unique tuples of cluster names containing the delimiter character will not produce diff --git a/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go b/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go index 1a6481cd60f..44e3bcf26f5 100644 --- a/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go +++ b/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go @@ -60,5 +60,5 @@ func (s *fixedTranslatorPluginTestSuite) TestFixedAddressTranslator() { s.Equal(ipToExpect, translatedHost) s.Equal(6001, translatedPort) - s.Equal(nil, err) + s.NoError(err) } diff --git a/common/persistence/operation_mode_validator_test.go b/common/persistence/operation_mode_validator_test.go index 0f06bffa829..a6e1195f33b 100644 --- a/common/persistence/operation_mode_validator_test.go +++ b/common/persistence/operation_mode_validator_test.go @@ -54,9 +54,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestCreateMode_UpdateCurrent() for _, createMode := range creatModes { err := ValidateCreateWorkflowModeState(createMode, testSnapshot) if !expectError { - s.NoError(err, err) + s.NotErrorIs(err, err) } else { - s.Error(err, err) + s.ErrorIs(err, err) } } } @@ -75,9 +75,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestCreateMode_BypassCurrent() testSnapshot := s.newTestWorkflowSnapshot(state) err := ValidateCreateWorkflowModeState(CreateWorkflowModeBypassCurrent, testSnapshot) if !expectError { - s.NoError(err, err) + s.NotErrorIs(err, err) } else { - s.Error(err, err) + s.ErrorIs(err, err) } } } @@ -99,9 +99,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_UpdateCurrent() nil, ) if !expectError { - s.NoError(err, err) + s.NotErrorIs(err, err) } else { - s.Error(err, err) + s.ErrorIs(err, err) } } @@ -128,9 +128,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_UpdateCurrent() &testNewSnapshot, ) if currentExpectError || newExpectError { - s.Error(err, err) + s.ErrorIs(err, err) } else { - s.NoError(err, err) + s.NotErrorIs(err, err) } } } @@ -153,9 +153,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_BypassCurrent() nil, ) if !expectError { - s.NoError(err, err) + s.NotErrorIs(err, err) } else { - s.Error(err, err) + s.ErrorIs(err, err) } } @@ -182,9 +182,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_BypassCurrent() &testNewSnapshot, ) if currentExpectError || newExpectError { - s.Error(err, err) + s.ErrorIs(err, err) } else { - s.NoError(err, err) + s.NotErrorIs(err, err) } } } @@ -208,9 +208,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update nil, ) if !expectError { - s.NoError(err, err) + s.NotErrorIs(err, err) } else { - s.Error(err, err) + s.ErrorIs(err, err) } } @@ -238,9 +238,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update nil, ) if resetExpectError || newExpectError { - s.Error(err, err) + s.ErrorIs(err, err) } else { - s.NoError(err, err) + s.NotErrorIs(err, err) } } } @@ -269,9 +269,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update &testCurrentSnapshot, ) if resetExpectError || currentExpectError { - s.Error(err, err) + s.ErrorIs(err, err) } else { - s.NoError(err, err) + s.NotErrorIs(err, err) } } } @@ -308,9 +308,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update &testCurrentSnapshot, ) if resetExpectError || newExpectError || currentExpectError { - s.Error(err, err) + s.ErrorIs(err, err) } else { - s.NoError(err, err) + s.NotErrorIs(err, err) } } } @@ -335,9 +335,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Bypass nil, ) if !expectError { - s.NoError(err, err) + s.NotErrorIs(err, err) } else { - s.Error(err, err) + s.ErrorIs(err, err) } } @@ -368,9 +368,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Bypass if err == nil { fmt.Print("##") } - s.Error(err, err) + s.ErrorIs(err, err) } else { - s.NoError(err, err) + s.NotErrorIs(err, err) } } } diff --git a/common/persistence/persistence-tests/cluster_metadata_manager.go b/common/persistence/persistence-tests/cluster_metadata_manager.go index a5aba91d026..2374636b2e1 100644 --- a/common/persistence/persistence-tests/cluster_metadata_manager.go +++ b/common/persistence/persistence-tests/cluster_metadata_manager.go @@ -54,7 +54,7 @@ func (s *ClusterMetadataManagerSuite) TearDownSuite() { // TestClusterMembershipEmptyInitially verifies the GetClusterMembers() works with an initial empty table func (s *ClusterMetadataManagerSuite) TestClusterMembershipEmptyInitially() { resp, err := s.ClusterMetadataManager.GetClusterMembers(s.ctx, &p.GetClusterMembersRequest{LastHeartbeatWithin: time.Minute * 10}) - s.Nil(err) + s.NoError(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) } @@ -73,11 +73,11 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertCanReadAny() { } err = s.ClusterMetadataManager.UpsertClusterMembership(s.ctx, req) - s.Nil(err) + s.NoError(err) resp, err := s.ClusterMetadataManager.GetClusterMembers(s.ctx, &p.GetClusterMembersRequest{}) - s.Nil(err) + s.NoError(err) s.NotNil(resp) s.NotEmpty(resp.ActiveMembers) @@ -134,10 +134,10 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertCanPageRead() { } func (s *ClusterMetadataManagerSuite) validateUpsert(req *p.UpsertClusterMembershipRequest, resp *p.GetClusterMembersResponse, err error) { - s.Nil(err) + s.NoError(err) s.NotNil(resp) s.NotEmpty(resp.ActiveMembers) - s.Equal(len(resp.ActiveMembers), 1) + s.Equal(1, len(resp.ActiveMembers)) // Have to round to 1 second due to SQL implementations. Cassandra truncates at 1ms. s.Equal(resp.ActiveMembers[0].SessionStart.Round(time.Second), req.SessionStart.Round(time.Second)) s.Equal(resp.ActiveMembers[0].RPCAddress.String(), req.RPCAddress.String()) @@ -162,7 +162,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( } err = s.ClusterMetadataManager.UpsertClusterMembership(s.ctx, req) - s.Nil(err) + s.NoError(err) resp, err := s.ClusterMetadataManager.GetClusterMembers( s.ctx, @@ -177,7 +177,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( &p.GetClusterMembersRequest{LastHeartbeatWithin: time.Millisecond, HostIDEquals: req.HostID}, ) - s.Nil(err) + s.NoError(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) @@ -186,7 +186,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( &p.GetClusterMembersRequest{RoleEquals: p.Matching}, ) - s.Nil(err) + s.NoError(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) @@ -195,7 +195,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( &p.GetClusterMembersRequest{SessionStartedAfter: time.Now().UTC()}, ) - s.Nil(err) + s.NoError(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) @@ -235,7 +235,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertExpiresCorrectl s.NoError(err) s.NotNil(resp) s.NotEmpty(resp.ActiveMembers) - s.Equal(len(resp.ActiveMembers), 1) + s.Equal(1, len(resp.ActiveMembers)) // Have to round to 1 second due to SQL implementations. Cassandra truncates at 1ms. s.Equal(resp.ActiveMembers[0].SessionStart.Round(time.Second), req.SessionStart.Round(time.Second)) s.Equal(resp.ActiveMembers[0].RPCAddress.String(), req.RPCAddress.String()) @@ -252,7 +252,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertExpiresCorrectl func (s *ClusterMetadataManagerSuite) waitForPrune(waitFor time.Duration) { s.Eventually(func() bool { err := s.ClusterMetadataManager.PruneClusterMembership(s.ctx, &p.PruneClusterMembershipRequest{MaxRecordsPruned: 100}) - s.Nil(err) + s.NoError(err) resp, err := s.ClusterMetadataManager.GetClusterMembers( s.ctx, @@ -281,7 +281,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertInvalidExpiry() } err = s.ClusterMetadataManager.UpsertClusterMembership(s.ctx, req) - s.NotNil(err) + s.Error(err) s.IsType(err, p.ErrInvalidMembershipExpiry) } @@ -308,7 +308,7 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { getResp, err := s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) s.Nil(getResp) @@ -329,7 +329,7 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { IsConnectionEnabled: true, }}) - s.Nil(err) + s.NoError(err) s.True(initialResp) // request should be applied as this is first initialize // Case 3 - Get, data persisted @@ -337,8 +337,8 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.Nil(err) - s.True(getResp != nil) + s.NoError(err) + s.NotEqual(getResp, nil) s.Equal(clusterNameToPersist, getResp.ClusterName) s.Equal(historyShardsToPersist, getResp.HistoryShardCount) s.Equal(clusterIdToPersist, getResp.ClusterId) @@ -357,14 +357,14 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { HistoryShardCount: int32(77), }}) - s.Nil(err) + s.NoError(err) s.False(secondResp) // Should not have applied, and should match values from first request // Refetch persisted getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initial values - s.Nil(err) + s.NoError(err) s.NotNil(getResp) s.Equal(clusterNameToPersist, getResp.ClusterName) s.Equal(historyShardsToPersist, getResp.HistoryShardCount) @@ -386,20 +386,20 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { ClusterMetadata: getResp.ClusterMetadata, Version: getResp.Version, }) - s.Nil(err) + s.NoError(err) s.True(thirdResp) getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) - s.Nil(err) + s.NoError(err) s.NotNil(getResp) s.Equal("1.0", getResp.ClusterMetadata.VersionInfo.Current.Version) // Case 6 - Delete Cluster Metadata err = s.ClusterMetadataManager.DeleteClusterMetadata(s.ctx, &p.DeleteClusterMetadataRequest{ClusterName: clusterNameToPersist}) - s.Nil(err) + s.NoError(err) getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) s.Nil(getResp) @@ -419,7 +419,7 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { IsGlobalNamespaceEnabled: true, IsConnectionEnabled: true, }}) - s.Nil(err) + s.NoError(err) s.True(initialResp) // Case 8 - Get, data persisted @@ -427,8 +427,8 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.Nil(err) - s.True(getResp != nil) + s.NoError(err) + s.NotEqual(getResp, nil) s.Equal(clusterNameToPersist, getResp.ClusterName) s.Equal(historyShardsToPersist, getResp.HistoryShardCount) s.Equal(clusterIdToPersist, getResp.ClusterId) @@ -477,8 +477,8 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { resp, err := s.ClusterMetadataManager.ListClusterMetadata(s.ctx, &p.ListClusterMetadataRequest{PageSize: 1}) s.NoError(err) - s.Equal(1, len(resp.ClusterMetadata)) + s.Len(resp.ClusterMetadata, 1) resp, err = s.ClusterMetadataManager.ListClusterMetadata(s.ctx, &p.ListClusterMetadataRequest{PageSize: 1, NextPageToken: resp.NextPageToken}) s.NoError(err) - s.Equal(1, len(resp.ClusterMetadata)) + s.Len(resp.ClusterMetadata, 1) } diff --git a/common/persistence/persistence-tests/history_v2_persistence.go b/common/persistence/persistence-tests/history_v2_persistence.go index e306a336bab..a45cfc035d2 100644 --- a/common/persistence/persistence-tests/history_v2_persistence.go +++ b/common/persistence/persistence-tests/history_v2_persistence.go @@ -101,8 +101,8 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { resp, err := s.ExecutionManager.GetAllHistoryTreeBranches(s.ctx, &p.GetAllHistoryTreeBranchesRequest{ PageSize: 1, }) - s.Nil(err) - s.Equal(0, len(resp.Branches), "some trees were leaked in other tests") + s.NoError(err) + s.Empty(resp.Branches, "some trees were leaked in other tests") trees := map[string]bool{} totalTrees := 1002 @@ -111,11 +111,11 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { for range totalTrees { treeID := uuid.NewString() bi, err := s.newHistoryBranch(treeID) - s.Nil(err) + s.NoError(err) events := s.genRandomEvents([]int64{1, 2, 3}, 1) err = s.appendNewBranchAndFirstNode(bi, events, 1, "branchInfo") - s.Nil(err) + s.NoError(err) trees[string(treeID)] = true } @@ -125,14 +125,14 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { PageSize: pgSize, NextPageToken: pgToken, }) - s.Nil(err) + s.NoError(err) for _, br := range resp.Branches { uuidTreeId := br.BranchInfo.TreeId if trees[uuidTreeId] { delete(trees, uuidTreeId) - s.True(br.ForkTime.AsTime().UnixNano() > 0) - s.True(len(br.BranchInfo.BranchId) > 0) + s.Positive(br.ForkTime.AsTime().UnixNano()) + s.Positive(len(br.BranchInfo.BranchId)) s.Equal("branchInfo", br.Info) } else { s.Fail("treeID not found", br.BranchInfo.TreeId) @@ -145,47 +145,47 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { pgToken = resp.NextPageToken } - s.Equal(0, len(trees)) + s.Empty(trees) } // TestReadBranchByPagination test func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { treeID := uuid.NewString() bi, err := s.newHistoryBranch(treeID) - s.Nil(err) + s.NoError(err) historyW := &historypb.History{} events := s.genRandomEvents([]int64{1, 2, 3}, 0) err = s.appendNewBranchAndFirstNode(bi, events, 1, "branchInfo") - s.Nil(err) + s.NoError(err) historyW.Events = events events = s.genRandomEvents([]int64{4}, 0) err = s.appendNewNode(bi, events, 2) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{5, 6, 7, 8}, 4) err = s.appendNewNode(bi, events, 6) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) // stale event batch events = s.genRandomEvents([]int64{6, 7, 8}, 1) err = s.appendNewNode(bi, events, 3) - s.Nil(err) + s.NoError(err) // stale event batch events = s.genRandomEvents([]int64{6, 7, 8}, 2) err = s.appendNewNode(bi, events, 4) - s.Nil(err) + s.NoError(err) // stale event batch events = s.genRandomEvents([]int64{6, 7, 8}, 3) err = s.appendNewNode(bi, events, 5) - s.Nil(err) + s.NoError(err) events = s.genRandomEvents([]int64{9}, 4) err = s.appendNewNode(bi, events, 7) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) // Start to read from middle, should not return error, but the first batch should be ignored by application layer @@ -199,53 +199,53 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { } // first page resp, err := s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) - s.Equal(4, len(resp.HistoryEvents)) + s.NoError(err) + s.Len(resp.HistoryEvents, 4) s.Equal(int64(6), resp.HistoryEvents[0].GetEventId()) events = s.genRandomEvents([]int64{10}, 4) err = s.appendNewNode(bi, events, 8) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{11}, 4) err = s.appendNewNode(bi, events, 9) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{12}, 4) err = s.appendNewNode(bi, events, 10) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{13, 14, 15}, 4) err = s.appendNewNode(bi, events, 11) - s.Nil(err) + s.NoError(err) // we don't append this batch because we will fork from 13 // historyW.Events = append(historyW.Events, events...) // fork from here bi2, err := s.fork(bi, 13) - s.Nil(err) + s.NoError(err) events = s.genRandomEvents([]int64{13}, 4) err = s.appendNewNode(bi2, events, 12) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{14}, 4) err = s.appendNewNode(bi2, events, 13) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{15, 16, 17}, 4) err = s.appendNewNode(bi2, events, 14) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{18, 19, 20}, 4) err = s.appendNewNode(bi2, events, 15) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) // read branch to verify @@ -262,9 +262,9 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // first page resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) + s.NoError(err) - s.Equal(8, len(resp.HistoryEvents)) + s.Len(resp.HistoryEvents, 8) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken @@ -272,14 +272,14 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // doe to difference in Cassandra / MySQL pagination // the stale event batch may get returned resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) + s.NoError(err) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken if len(resp.HistoryEvents) == 0 { // second page resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) - s.Equal(3, len(resp.HistoryEvents)) + s.NoError(err) + s.Len(resp.HistoryEvents, 3) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken } else if len(resp.HistoryEvents) == 3 { @@ -290,15 +290,15 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // 3rd page, since we fork from nodeID=13, we can only see one batch of 12 here resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) - s.Equal(1, len(resp.HistoryEvents)) + s.NoError(err) + s.Len(resp.HistoryEvents, 1) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken // 4th page, 13~17 resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) - s.Equal(5, len(resp.HistoryEvents)) + s.NoError(err) + s.Len(resp.HistoryEvents, 5) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken @@ -309,18 +309,18 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // to get history again, no error and history events should be returned. req.PageSize = 1 resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) - s.Equal(3, len(resp.HistoryEvents)) + s.NoError(err) + s.Len(resp.HistoryEvents, 3) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken if len(resp.NextPageToken) != 0 { resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.Nil(err) - s.Equal(0, len(resp.HistoryEvents)) + s.NoError(err) + s.Empty(resp.HistoryEvents) } s.ProtoEqual(historyW, historyR) - s.Equal(0, len(resp.NextPageToken)) + s.Empty(resp.NextPageToken) // MinEventID is in the middle of the last batch and this is the first request (NextPageToken // is empty), the call should return an error. @@ -330,11 +330,11 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { s.IsType(&serviceerror.NotFound{}, err) err = s.deleteHistoryBranch(bi2) - s.Nil(err) + s.NoError(err) err = s.deleteHistoryBranch(bi) - s.Nil(err) + s.NoError(err) branches := s.descTree(treeID) - s.Equal(0, len(branches)) + s.Empty(branches) } // TestConcurrentlyCreateAndAppendBranches test @@ -350,34 +350,34 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { go func(idx int) { defer wg.Done() bi, err := s.newHistoryBranch(treeID) - s.Nil(err) + s.NoError(err) historyW := &historypb.History{} m.Store(idx, bi) events := s.genRandomEvents([]int64{1, 2, 3}, 1) err = s.appendNewBranchAndFirstNode(bi, events, 1, "branchInfo") - s.Nil(err) + s.NoError(err) historyW.Events = events events = s.genRandomEvents([]int64{4}, 1) err = s.appendNewNode(bi, events, 2) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{5, 6, 7, 8}, 1) err = s.appendNewNode(bi, events, 3) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, 1) err = s.appendNewNode(bi, events, 4000) - s.Nil(err) + s.NoError(err) historyW.Events = append(historyW.Events, events...) // read branch to verify historyR := &historypb.History{} events = s.read(bi, 1, 21) - s.Equal(20, len(events)) + s.Len(events, 20) historyR.Events = events s.ProtoEqual(historyW, historyR) @@ -386,7 +386,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { wg.Wait() branches := s.descTree(treeID) - s.Equal(concurrency, len(branches)) + s.Len(branches, concurrency) wg = sync.WaitGroup{} // test appending nodes(override and new nodes) on each branch concurrently @@ -400,48 +400,48 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { // override with smaller txn_id events := s.genRandomEvents([]int64{5}, 1) err := s.appendNewNode(branch, events, 0) - s.Nil(err) + s.NoError(err) // it shouldn't change anything events = s.read(branch, 1, 25) - s.Equal(20, len(events)) + s.Len(events, 20) // override with greatest txn_id events = s.genRandomEvents([]int64{5}, 1) err = s.appendNewNode(branch, events, 3000) - s.Nil(err) + s.NoError(err) // read to verify override success, at this point history is corrupted, missing 6/7/8, so we should only see 5 events events = s.read(branch, 1, 6) - s.Equal(5, len(events)) + s.Len(events, 5) _, err = s.readWithError(branch, 1, 25) _, ok := err.(*serviceerror.DataLoss) - s.Equal(true, ok) + s.True(ok) // override with even larger txn_id and same version events = s.genRandomEvents([]int64{5, 6}, 1) err = s.appendNewNode(branch, events, 3001) - s.Nil(err) + s.NoError(err) // read to verify override success, at this point history is corrupted, missing 7/8, so we should only see 6 events events = s.read(branch, 1, 7) - s.Equal(6, len(events)) + s.Len(events, 6) _, err = s.readWithError(branch, 1, 25) _, ok = err.(*serviceerror.DataLoss) - s.Equal(true, ok) + s.True(ok) // override more with larger txn_id, this would fix the corrupted hole so that we cna get 20 events again events = s.genRandomEvents([]int64{7, 8}, 1) err = s.appendNewNode(branch, events, 3002) - s.Nil(err) + s.NoError(err) // read to verify override events = s.read(branch, 1, 25) - s.Equal(20, len(events)) + s.Len(events, 20) events = s.genRandomEvents([]int64{9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23}, 1) err = s.appendNewNode(branch, events, 4001) - s.Nil(err) + s.NoError(err) events = s.read(branch, 1, 25) - s.Equal(23, len(events)) + s.Len(events, 23) }(i) } @@ -451,12 +451,12 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { br := v.([]byte) // delete old branches along with create new branches err := s.deleteHistoryBranch(br) - s.Nil(err) + s.NoError(err) return true }) branches = s.descTree(treeID) - s.Equal(0, len(branches)) + s.Empty(branches) } // TestConcurrentlyForkAndAppendBranches test @@ -465,9 +465,9 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { wg := sync.WaitGroup{} concurrency := 10 masterBr, err := s.newHistoryBranch(treeID) - s.Nil(err) + s.NoError(err) branches := s.descTree(treeID) - s.Equal(0, len(branches)) + s.Empty(branches) // append first batch to master branch eids := []int64{} @@ -476,14 +476,14 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } events := s.genRandomEvents(eids, 1) err = s.appendNewBranchAndFirstNode(masterBr, events[0:1], 1, "masterbr") - s.Nil(err) + s.NoError(err) readEvents := s.read(masterBr, 1, int64(concurrency)+2) - s.Nil(err) - s.Equal(1, len(readEvents)) + s.NoError(err) + s.Len(readEvents, 1) branches = s.descTree(treeID) - s.Equal(1, len(branches)) + s.Len(branches, 1) mbrID := branches[0].BranchId txn := int64(1) @@ -498,10 +498,10 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } err = s.appendOneByOne(masterBr, events[1:], reserveTxn(len(events[1:]))) - s.Nil(err) + s.NoError(err) events = s.read(masterBr, 1, int64(concurrency)+2) - s.Nil(err) - s.Equal((concurrency)+1, len(events)) + s.NoError(err) + s.Len(events, (concurrency)+1) level1ID := new(sync.Map) level1Br := new(sync.Map) @@ -515,14 +515,14 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { level1ID.Store(idx, forkNodeID) bi, err := s.fork(masterBr, forkNodeID) - s.Nil(err) + s.NoError(err) level1Br.Store(idx, bi) // cannot append to ancestors events := s.genRandomEvents([]int64{forkNodeID - 1}, 1) err = s.appendNewNode(bi, events, reserveTxn(1)) _, ok := err.(*p.InvalidPersistenceRequestError) - s.Equal(true, ok) + s.True(ok) // append second batch to first level eids := make([]int64, 0) @@ -532,18 +532,18 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { events = s.genRandomEvents(eids, 1) err = s.appendNewNode(bi, events[0:1], reserveTxn(1)) - s.Nil(err) + s.NoError(err) err = s.appendOneByOne(bi, events[1:], reserveTxn(len(events[1:]))) - s.Nil(err) + s.NoError(err) events = s.read(bi, 1, int64(concurrency)*2+2) - s.Nil(err) - s.Equal((concurrency)*2+1, len(events)) + s.NoError(err) + s.Len(events, (concurrency)*2+1) if idx == 0 { err = s.deleteHistoryBranch(bi) - s.Nil(err) + s.NoError(err) } }(i) @@ -551,7 +551,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { wg.Wait() branches = s.descTree(treeID) - s.Equal(concurrency, len(branches)) + s.Len(branches, concurrency) forkOnLevel1 := int32(0) level2Br := new(sync.Map) wg = sync.WaitGroup{} @@ -572,7 +572,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } bi, err := s.fork(forkBr, forkNodeID) - s.Nil(err) + s.NoError(err) level2Br.Store(idx, bi) // append second batch to second level @@ -582,36 +582,36 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } events := s.genRandomEvents(eids, 1) err = s.appendNewNode(bi, events[0:1], reserveTxn(1)) - s.Nil(err) + s.NoError(err) err = s.appendOneByOne(bi, events[1:], reserveTxn(len(events[1:]))) - s.Nil(err) + s.NoError(err) events = s.read(bi, 1, int64(concurrency)*3+2) - s.Nil(err) - s.Equal((concurrency)*3+1, len(events)) + s.NoError(err) + s.Len(events, (concurrency)*3+1) // try override last event events = s.genRandomEvents([]int64{int64(concurrency)*3 + 1}, 1) err = s.appendNewNode(bi, events, reserveTxn(1)) - s.Nil(err) + s.NoError(err) events = s.read(bi, 1, int64(concurrency)*3+2) - s.Nil(err) - s.Equal((concurrency)*3+1, len(events)) + s.NoError(err) + s.Len(events, (concurrency)*3+1) // test fork and newBranch concurrently bi, err = s.newHistoryBranch(treeID) - s.Nil(err) + s.NoError(err) level2Br.Store(concurrency+idx, bi) events = s.genRandomEvents([]int64{1}, 1) err = s.appendNewBranchAndFirstNode(bi, events, reserveTxn(1), "newbr") - s.Nil(err) + s.NoError(err) }(i) } wg.Wait() branches = s.descTree(treeID) - s.Equal(concurrency*3-2, len(branches)) + s.Len(branches, concurrency*3-2) actualForkOnLevel1 := int32(0) masterCnt := 0 for _, b := range branches { @@ -620,7 +620,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } else if len(b.Ancestors) == 0 { masterCnt++ } else { - s.Equal(1, len(b.Ancestors)) + s.Len(b.Ancestors, 1) s.Equal(mbrID, b.Ancestors[0].GetBranchId()) } } @@ -632,7 +632,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { br := v.([]byte) // delete old branches along with create new branches err := s.deleteHistoryBranch(br) - s.Nil(err) + s.NoError(err) return true }) @@ -640,28 +640,28 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { br := v.([]byte) // delete old branches along with create new branches err := s.deleteHistoryBranch(br) - s.Nil(err) + s.NoError(err) return true }) err = s.deleteHistoryBranch(masterBr) - s.Nil(err) + s.NoError(err) branches = s.descTree(treeID) - s.Equal(0, len(branches)) + s.Empty(branches) } func (s *HistoryV2PersistenceSuite) getBranchByKey(m *sync.Map, k int) []byte { v, ok := m.Load(k) - s.Equal(true, ok) + s.True(ok) br := v.([]byte) return br } func (s *HistoryV2PersistenceSuite) getIDByKey(m *sync.Map, k int) int64 { v, ok := m.Load(k) - s.Equal(true, ok) + s.True(ok) id := v.(int64) return id } @@ -736,7 +736,7 @@ func (s *HistoryV2PersistenceSuite) descTree(treeID string) []*persistencespb.Hi // persistence helper func (s *HistoryV2PersistenceSuite) read(branch []byte, minID, maxID int64) []*historypb.HistoryEvent { res, err := s.readWithError(branch, minID, maxID) - s.Nil(err) + s.NoError(err) return res } @@ -759,7 +759,7 @@ func (s *HistoryV2PersistenceSuite) readWithError(branch []byte, minID, maxID in return nil, err } if len(resp.HistoryEvents) > 0 { - s.True(resp.Size > 0) + s.Positive(resp.Size) } res = append(res, resp.HistoryEvents...) token = resp.NextPageToken @@ -811,7 +811,7 @@ func (s *HistoryV2PersistenceSuite) append(branch []byte, events []*historypb.Hi if err != nil { return err } - s.True(resp.Size > 0) + s.Positive(resp.Size) return err } diff --git a/common/persistence/persistence-tests/metadata_persistence_v2.go b/common/persistence/persistence-tests/metadata_persistence_v2.go index 5363298b23e..32b2af94253 100644 --- a/common/persistence/persistence-tests/metadata_persistence_v2.go +++ b/common/persistence/persistence-tests/metadata_persistence_v2.go @@ -150,31 +150,31 @@ func (m *MetadataPersistenceSuiteV2) TestCreateWithPartialNamespaceSameNameSameI ) m.NoError(err0) m.NotNil(resp0) - m.EqualValues(id, resp0.ID) + m.Equal(id, resp0.ID) // for namespace which do not have replication config set, will default to // use current cluster as active, with current cluster as all clusters resp1, err1 := m.GetNamespace(id, "") m.NoError(err1) m.NotNil(resp1) - m.EqualValues(id, resp1.Namespace.Info.Id) + m.Equal(id, resp1.Namespace.Info.Id) m.Equal(name, resp1.Namespace.Info.Name) m.Equal(state, resp1.Namespace.Info.State) m.Equal(description, resp1.Namespace.Info.Description) m.Equal(owner, resp1.Namespace.Info.Owner) m.Equal(data, resp1.Namespace.Info.Data) - m.EqualValues(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) + m.Equal(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp1.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp1.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp1.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp1.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(badBinaries, resp1.Namespace.Config.BadBinaries) m.Equal(cluster.TestCurrentClusterName, resp1.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(1, len(resp1.Namespace.ReplicationConfig.Clusters)) + m.Len(resp1.Namespace.ReplicationConfig.Clusters, 1) m.Equal(isGlobalNamespace, resp1.IsGlobalNamespace) m.Equal(configVersion, resp1.Namespace.ConfigVersion) m.Equal(failoverVersion, resp1.Namespace.FailoverVersion) - m.True(resp1.Namespace.ReplicationConfig.Clusters[0] == cluster.TestCurrentClusterName) + m.Equal(resp1.Namespace.ReplicationConfig.Clusters[0], cluster.TestCurrentClusterName) m.Equal(p.InitialFailoverNotificationVersion, resp1.Namespace.FailoverNotificationVersion) m.truncatePartialNamespace() } @@ -229,31 +229,31 @@ func (m *MetadataPersistenceSuiteV2) TestCreateWithPartialNamespaceSameNameDiffe ) m.NoError(err0) m.NotNil(resp0) - m.EqualValues(id, resp0.ID) + m.Equal(id, resp0.ID) // for namespace which do not have replication config set, will default to // use current cluster as active, with current cluster as all clusters resp1, err1 := m.GetNamespace(id, "") m.NoError(err1) m.NotNil(resp1) - m.EqualValues(id, resp1.Namespace.Info.Id) + m.Equal(id, resp1.Namespace.Info.Id) m.Equal(name, resp1.Namespace.Info.Name) m.Equal(state, resp1.Namespace.Info.State) m.Equal(description, resp1.Namespace.Info.Description) m.Equal(owner, resp1.Namespace.Info.Owner) m.Equal(data, resp1.Namespace.Info.Data) - m.EqualValues(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) + m.Equal(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp1.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp1.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp1.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp1.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(badBinaries, resp1.Namespace.Config.BadBinaries) m.Equal(cluster.TestCurrentClusterName, resp1.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(1, len(resp1.Namespace.ReplicationConfig.Clusters)) + m.Len(resp1.Namespace.ReplicationConfig.Clusters, 1) m.Equal(isGlobalNamespace, resp1.IsGlobalNamespace) m.Equal(configVersion, resp1.Namespace.ConfigVersion) m.Equal(failoverVersion, resp1.Namespace.FailoverVersion) - m.True(resp1.Namespace.ReplicationConfig.Clusters[0] == cluster.TestCurrentClusterName) + m.Equal(resp1.Namespace.ReplicationConfig.Clusters[0], cluster.TestCurrentClusterName) m.Equal(p.InitialFailoverNotificationVersion, resp1.Namespace.FailoverNotificationVersion) m.truncatePartialNamespace() } @@ -353,31 +353,31 @@ func (m *MetadataPersistenceSuiteV2) TestCreateNamespace() { ) m.NoError(err0) m.NotNil(resp0) - m.EqualValues(id, resp0.ID) + m.Equal(id, resp0.ID) // for namespace which do not have replication config set, will default to // use current cluster as active, with current cluster as all clusters resp1, err1 := m.GetNamespace(id, "") m.NoError(err1) m.NotNil(resp1) - m.EqualValues(id, resp1.Namespace.Info.Id) + m.Equal(id, resp1.Namespace.Info.Id) m.Equal(name, resp1.Namespace.Info.Name) m.Equal(state, resp1.Namespace.Info.State) m.Equal(description, resp1.Namespace.Info.Description) m.Equal(owner, resp1.Namespace.Info.Owner) m.Equal(data, resp1.Namespace.Info.Data) - m.EqualValues(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) + m.Equal(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp1.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp1.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp1.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp1.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(badBinaries, resp1.Namespace.Config.BadBinaries) m.Equal(cluster.TestCurrentClusterName, resp1.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(1, len(resp1.Namespace.ReplicationConfig.Clusters)) + m.Len(resp1.Namespace.ReplicationConfig.Clusters, 1) m.Equal(isGlobalNamespace, resp1.IsGlobalNamespace) m.Equal(configVersion, resp1.Namespace.ConfigVersion) m.Equal(failoverVersion, resp1.Namespace.FailoverVersion) - m.True(resp1.Namespace.ReplicationConfig.Clusters[0] == cluster.TestCurrentClusterName) + m.Equal(resp1.Namespace.ReplicationConfig.Clusters[0], cluster.TestCurrentClusterName) m.Equal(p.InitialFailoverNotificationVersion, resp1.Namespace.FailoverNotificationVersion) resp2, err2 := m.CreateNamespace( @@ -468,25 +468,25 @@ func (m *MetadataPersistenceSuiteV2) TestGetNamespace() { ) m.NoError(err1) m.NotNil(resp1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) m.NotNil(resp2) - m.EqualValues(id, resp2.Namespace.Info.Id) + m.Equal(id, resp2.Namespace.Info.Id) m.Equal(name, resp2.Namespace.Info.Name) m.Equal(state, resp2.Namespace.Info.State) m.Equal(description, resp2.Namespace.Info.Description) m.Equal(owner, resp2.Namespace.Info.Owner) m.Equal(data, resp2.Namespace.Info.Data) - m.EqualValues(time.Duration(retention)*time.Hour*24, resp2.Namespace.Config.Retention.AsDuration()) + m.Equal(time.Duration(retention)*time.Hour*24, resp2.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp2.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp2.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp2.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp2.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp2.Namespace.Config.BadBinaries) m.Equal(clusterActive, resp2.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(len(clusters), len(resp2.Namespace.ReplicationConfig.Clusters)) + m.Len(resp2.Namespace.ReplicationConfig.Clusters, len(clusters)) for index := range clusters { m.Equal(clusters[index], resp2.Namespace.ReplicationConfig.Clusters[index]) } @@ -498,19 +498,19 @@ func (m *MetadataPersistenceSuiteV2) TestGetNamespace() { resp3, err3 := m.GetNamespace("", name) m.NoError(err3) m.NotNil(resp3) - m.EqualValues(id, resp3.Namespace.Info.Id) + m.Equal(id, resp3.Namespace.Info.Id) m.Equal(name, resp3.Namespace.Info.Name) m.Equal(state, resp3.Namespace.Info.State) m.Equal(description, resp3.Namespace.Info.Description) m.Equal(owner, resp3.Namespace.Info.Owner) m.Equal(data, resp3.Namespace.Info.Data) - m.EqualValues(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) + m.Equal(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp3.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp3.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp3.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp3.Namespace.Config.VisibilityArchivalUri) m.Equal(clusterActive, resp3.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(len(clusters), len(resp3.Namespace.ReplicationConfig.Clusters)) + m.Len(resp3.Namespace.ReplicationConfig.Clusters, len(clusters)) for index := range clusters { m.Equal(clusters[index], resp3.Namespace.ReplicationConfig.Clusters[index]) } @@ -607,14 +607,14 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() { m.Equal(state, resp.Namespace.Info.State) m.Equal(description, resp.Namespace.Info.Description) m.Equal(owner, resp.Namespace.Info.Owner) - m.EqualValues(time.Duration(retention)*time.Hour*24, resp.Namespace.Config.Retention.AsDuration()) + m.Equal(time.Duration(retention)*time.Hour*24, resp.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp.Namespace.Config.BadBinaries) m.Equal(clusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(len(clusters), len(resp.Namespace.ReplicationConfig.Clusters)) + m.Len(resp.Namespace.ReplicationConfig.Clusters, len(clusters)) for index := range clusters { m.Equal(clusters[index], resp.Namespace.ReplicationConfig.Clusters[index]) } @@ -624,10 +624,10 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() { // check namespace data ss := strings.Split(resp.Namespace.Info.Data["k0"], "-") - m.Equal(2, len(ss)) + m.Len(ss, 2) vi, err := strconv.Atoi(ss[1]) m.NoError(err) - m.Equal(true, vi > 0 && vi <= concurrency) + m.True(vi > 0 && vi <= concurrency) } // TestConcurrentUpdateNamespace test @@ -678,7 +678,7 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -743,21 +743,21 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() { resp3, err3 := m.GetNamespace("", name) m.NoError(err3) m.NotNil(resp3) - m.EqualValues(id, resp3.Namespace.Info.Id) + m.Equal(id, resp3.Namespace.Info.Id) m.Equal(name, resp3.Namespace.Info.Name) m.Equal(state, resp3.Namespace.Info.State) m.Equal(isGlobalNamespace, resp3.IsGlobalNamespace) m.Equal(description, resp3.Namespace.Info.Description) m.Equal(owner, resp3.Namespace.Info.Owner) - m.EqualValues(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) + m.Equal(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp3.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp3.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp3.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp3.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp3.Namespace.Config.BadBinaries) m.Equal(clusterActive, resp3.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(len(clusters), len(resp3.Namespace.ReplicationConfig.Clusters)) + m.Len(resp3.Namespace.ReplicationConfig.Clusters, len(clusters)) for index := range clusters { m.Equal(clusters[index], resp3.Namespace.ReplicationConfig.Clusters[index]) } @@ -767,10 +767,10 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() { // check namespace data ss := strings.Split(resp3.Namespace.Info.Data["k0"], "-") - m.Equal(2, len(ss)) + m.Len(ss, 2) vi, err := strconv.Atoi(ss[1]) m.NoError(err) - m.Equal(true, vi > 0 && vi <= concurrency) + m.True(vi > 0 && vi <= concurrency) } // TestUpdateNamespace test @@ -820,7 +820,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -889,7 +889,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { resp4, err4 := m.GetNamespace("", name) m.NoError(err4) m.NotNil(resp4) - m.EqualValues(id, resp4.Namespace.Info.Id) + m.Equal(id, resp4.Namespace.Info.Id) m.Equal(name, resp4.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp4.IsGlobalNamespace) m.Equal(updatedState, resp4.Namespace.Info.State) @@ -903,7 +903,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { m.Equal(updatedVisibilityArchivalURI, resp4.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp4.Namespace.Config.BadBinaries) m.Equal(updateClusterActive, resp4.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(len(updateClusters), len(resp4.Namespace.ReplicationConfig.Clusters)) + m.Len(resp4.Namespace.ReplicationConfig.Clusters, len(updateClusters)) for index := range clusters { m.Equal(updateClusters[index], resp4.Namespace.ReplicationConfig.Clusters[index]) } @@ -916,7 +916,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { resp5, err5 := m.GetNamespace(id, "") m.NoError(err5) m.NotNil(resp5) - m.EqualValues(id, resp5.Namespace.Info.Id) + m.Equal(id, resp5.Namespace.Info.Id) m.Equal(name, resp5.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp5.IsGlobalNamespace) m.Equal(updatedState, resp5.Namespace.Info.State) @@ -929,7 +929,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { m.Equal(updatedVisibilityArchivalState, resp5.Namespace.Config.VisibilityArchivalState) m.Equal(updatedVisibilityArchivalURI, resp5.Namespace.Config.VisibilityArchivalUri) m.Equal(updateClusterActive, resp5.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(len(updateClusters), len(resp5.Namespace.ReplicationConfig.Clusters)) + m.Len(resp5.Namespace.ReplicationConfig.Clusters, len(updateClusters)) for index := range clusters { m.Equal(updateClusters[index], resp5.Namespace.ReplicationConfig.Clusters[index]) } @@ -973,7 +973,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { resp6, err6 := m.GetNamespace(id, "") m.NoError(err6) m.NotNil(resp6) - m.EqualValues(id, resp6.Namespace.Info.Id) + m.Equal(id, resp6.Namespace.Info.Id) m.Equal(name, resp6.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp6.IsGlobalNamespace) m.Equal(updatedState, resp6.Namespace.Info.State) @@ -987,7 +987,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { m.Equal(updatedVisibilityArchivalURI, resp6.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp6.Namespace.Config.BadBinaries) m.Equal(updateClusterActive, resp6.Namespace.ReplicationConfig.ActiveClusterName) - m.Equal(len(updateClusters), len(resp6.Namespace.ReplicationConfig.Clusters)) + m.Len(resp6.Namespace.ReplicationConfig.Clusters, len(updateClusters)) for index := range clusters { m.Equal(updateClusters[index], resp4.Namespace.ReplicationConfig.Clusters[index]) } @@ -1045,7 +1045,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespace() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) _, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -1059,14 +1059,14 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespace() { resp4, err4 := m.GetNamespace("", newName) m.NoError(err4) m.NotNil(resp4) - m.EqualValues(id, resp4.Namespace.Info.Id) + m.Equal(id, resp4.Namespace.Info.Id) m.Equal(newName, resp4.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp4.IsGlobalNamespace) resp5, err5 := m.GetNamespace(id, "") m.NoError(err5) m.NotNil(resp5) - m.EqualValues(id, resp5.Namespace.Info.Id) + m.Equal(id, resp5.Namespace.Info.Id) m.Equal(newName, resp5.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp5.IsGlobalNamespace) @@ -1079,7 +1079,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespace() { resp6, err6 := m.GetNamespace(id, "") m.NoError(err6) m.NotNil(resp6) - m.EqualValues(id, resp6.Namespace.Info.Id) + m.Equal(id, resp6.Namespace.Info.Id) m.Equal(newNewName, resp6.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp6.IsGlobalNamespace) } @@ -1130,7 +1130,7 @@ func (m *MetadataPersistenceSuiteV2) TestDeleteNamespace() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) resp2, err2 := m.GetNamespace("", name) m.NoError(err2) @@ -1184,7 +1184,7 @@ func (m *MetadataPersistenceSuiteV2) TestDeleteNamespace() { failoverVersion, ) m.NoError(err6) - m.EqualValues(id, resp6.ID) + m.Equal(id, resp6.ID) err7 := m.DeleteNamespace(id, "") m.NoError(err7) @@ -1322,8 +1322,8 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces() { } // There should be 2 non-empty pages. - m.Equal(pageCount, 2) - m.Equal(len(inputNamespaces), len(outputNamespaces)) + m.Equal(2, pageCount) + m.Len(outputNamespaces, len(inputNamespaces)) for _, namespace := range inputNamespaces { m.DeepEqual(namespace, outputNamespaces[namespace.Namespace.Info.Id]) } @@ -1409,7 +1409,7 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces_DeletedNamespace() { m.Equal(1, pageCount) m.Len(listNamespacesPageSize2, 2) for _, namespace := range listNamespacesPageSize2 { - m.NotEqual(namespace.Namespace.Info.State, enumspb.NAMESPACE_STATE_DELETED) + m.NotEqual(enumspb.NAMESPACE_STATE_DELETED, namespace.Namespace.Info.State) } pageCount = 0 @@ -1432,7 +1432,7 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces_DeletedNamespace() { m.Equal(2, pageCount) m.Len(listNamespacesPageSize1, 2) for _, namespace := range listNamespacesPageSize1 { - m.NotEqual(namespace.Namespace.Info.State, enumspb.NAMESPACE_STATE_DELETED) + m.NotEqual(enumspb.NAMESPACE_STATE_DELETED, namespace.Namespace.Info.State) } } @@ -1550,7 +1550,7 @@ func (m *MetadataPersistenceSuiteV2) TestCASFailureUpdateNamespace() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -1646,7 +1646,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceWithNameConflict() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id1, resp1.ID) + m.Equal(id1, resp1.ID) // Create second namespace resp2, err2 := m.CreateNamespace( @@ -1674,7 +1674,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceWithNameConflict() { failoverVersion, ) m.NoError(err2) - m.EqualValues(id2, resp2.ID) + m.Equal(id2, resp2.ID) // Try to rename namespace1 to the same name as namespace2 (should fail) err3 := m.MetadataManager.RenameNamespace(m.ctx, &p.RenameNamespaceRequest{ @@ -2170,7 +2170,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceCassandra() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) // Verify namespace exists with original name resp2, err2 := m.GetNamespace(id, "") @@ -2188,7 +2188,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceCassandra() { resp4, err4 := m.GetNamespace("", newName) m.NoError(err4) m.NotNil(resp4) - m.EqualValues(id, resp4.Namespace.Info.Id) + m.Equal(id, resp4.Namespace.Info.Id) m.Equal(newName, resp4.Namespace.Info.Name) m.Equal(description, resp4.Namespace.Info.Description) m.Equal(owner, resp4.Namespace.Info.Owner) @@ -2294,7 +2294,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceSQL() { failoverVersion, ) m.NoError(err1) - m.EqualValues(id, resp1.ID) + m.Equal(id, resp1.ID) // Verify namespace exists with original name resp2, err2 := m.GetNamespace(id, "") @@ -2312,7 +2312,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceSQL() { resp4, err4 := m.GetNamespace("", newName) m.NoError(err4) m.NotNil(resp4) - m.EqualValues(id, resp4.Namespace.Info.Id) + m.Equal(id, resp4.Namespace.Info.Id) m.Equal(newName, resp4.Namespace.Info.Name) m.Equal(description, resp4.Namespace.Info.Description) m.Equal(owner, resp4.Namespace.Info.Owner) diff --git a/common/persistence/persistence-tests/queue_persistence.go b/common/persistence/persistence-tests/queue_persistence.go index 64895ccdbde..1ca9bdc48fb 100644 --- a/common/persistence/persistence-tests/queue_persistence.go +++ b/common/persistence/persistence-tests/queue_persistence.go @@ -77,7 +77,7 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationQueue() { for message := range messageChan { err := s.Publish(s.ctx, message) id := message.Attributes.(*replicationspb.ReplicationTask_NamespaceTaskAttributes).NamespaceTaskAttributes.Id - s.Nil(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) + s.NoError(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) } }(i) } @@ -85,7 +85,7 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationQueue() { wg.Wait() result, lastRetrievedMessageID, err := s.GetReplicationMessages(s.ctx, persistence.EmptyQueueMessageID, numMessages) - s.Nil(err, "GetReplicationMessages failed.") + s.NoError(err, "GetReplicationMessages failed.") s.Len(result, numMessages) s.Equal(int64(numMessages-1), lastRetrievedMessageID) } @@ -94,32 +94,32 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationQueue() { func (s *QueuePersistenceSuite) TestQueueMetadataOperations() { clusterAckLevels, err := s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Assert().Len(clusterAckLevels, 0) + s.Assert().Empty(clusterAckLevels) err = s.UpdateAckLevel(s.ctx, 10, "test1") s.Require().NoError(err) clusterAckLevels, err = s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Assert().Len(clusterAckLevels, 1) - s.Assert().Equal(int64(10), clusterAckLevels["test1"]) + s.Len(clusterAckLevels, 1) + s.Equal(int64(10), clusterAckLevels["test1"]) err = s.UpdateAckLevel(s.ctx, 20, "test1") s.Require().NoError(err) clusterAckLevels, err = s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Assert().Len(clusterAckLevels, 1) - s.Assert().Equal(int64(20), clusterAckLevels["test1"]) + s.Len(clusterAckLevels, 1) + s.Equal(int64(20), clusterAckLevels["test1"]) err = s.UpdateAckLevel(s.ctx, 25, "test2") s.Require().NoError(err) clusterAckLevels, err = s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Assert().Len(clusterAckLevels, 2) - s.Assert().Equal(int64(20), clusterAckLevels["test1"]) - s.Assert().Equal(int64(25), clusterAckLevels["test2"]) + s.Len(clusterAckLevels, 2) + s.Equal(int64(20), clusterAckLevels["test1"]) + s.Equal(int64(25), clusterAckLevels["test2"]) } // TestNamespaceReplicationDLQ tests namespace DLQ operations @@ -154,7 +154,7 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationDLQ() { for message := range messageChan { err := s.PublishToNamespaceDLQ(s.ctx, message) id := message.Attributes.(*replicationspb.ReplicationTask_NamespaceTaskAttributes).NamespaceTaskAttributes.Id - s.Nil(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) + s.NoError(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) } }(i) } @@ -162,30 +162,30 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationDLQ() { wg.Wait() result1, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages/2, nil) - s.Nil(err, "GetReplicationMessages failed.") + s.NoError(err, "GetReplicationMessages failed.") s.NotNil(token) result2, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages, token) - s.Nil(err, "GetReplicationMessages failed.") - s.Equal(len(token), 0) + s.NoError(err, "GetReplicationMessages failed.") + s.Empty(token) s.Equal(len(result1)+len(result2), numMessages) _, _, err = s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, 1<<63-1, numMessages, nil) s.NoError(err, "GetReplicationMessages failed.") - s.Equal(len(token), 0) + s.Empty(token) lastMessageID := result2[len(result2)-1].SourceTaskId err = s.DeleteMessageFromNamespaceDLQ(s.ctx, lastMessageID) s.NoError(err) result3, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages, token) - s.Nil(err, "GetReplicationMessages failed.") - s.Equal(len(token), 0) + s.NoError(err, "GetReplicationMessages failed.") + s.Empty(token) s.Equal(len(result3), numMessages-1) err = s.RangeDeleteMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, lastMessageID) s.NoError(err) result4, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages, token) - s.Nil(err, "GetReplicationMessages failed.") - s.Equal(len(token), 0) - s.Equal(len(result4), 0) + s.NoError(err, "GetReplicationMessages failed.") + s.Empty(token) + s.Empty(result4) } // TestNamespaceDLQMetadataOperations tests queue metadata operations diff --git a/common/persistence/persistence_metrics_clients_test.go b/common/persistence/persistence_metrics_clients_test.go index 59b7b96bfb3..51c45b655a8 100644 --- a/common/persistence/persistence_metrics_clients_test.go +++ b/common/persistence/persistence_metrics_clients_test.go @@ -56,7 +56,7 @@ func TestExecutionPersistenceClient_DataLossMetrics_EmittedOnDataLossError(t *te // Verify error is returned require.Error(t, err) - assert.True(t, errors.Is(err, dataLossErr)) + assert.ErrorIs(t, err, dataLossErr) // Verify data loss metrics are emitted snapshot := capture.Snapshot() @@ -229,7 +229,7 @@ func TestExecutionPersistenceClient_DataLossMetrics_WithWrappedDataLossError(t * tags := recording.Tags assert.Equal(t, "_unknown_", tags[metrics.NamespaceTag("").Key]) assert.Equal(t, "test-workflow-id", tags["workflow_id"]) - assert.Equal(t, "", tags["run_id"]) // No run ID in GetCurrentExecutionRequest + assert.Empty(t, tags["run_id"]) // No run ID in GetCurrentExecutionRequest } func TestExecutionPersistenceClient_DataLossMetrics_WithEmptyWorkflowDetails(t *testing.T) { @@ -283,7 +283,7 @@ func TestExecutionPersistenceClient_DataLossMetrics_WithEmptyWorkflowDetails(t * // Verify tags are set with empty workflow details tags := recording.Tags - assert.Equal(t, "", tags["workflow_id"]) - assert.Equal(t, "", tags["run_id"]) + assert.Empty(t, tags["workflow_id"]) + assert.Empty(t, tags["run_id"]) assert.Equal(t, metrics.PersistenceListConcreteExecutionsScope, tags[metrics.OperationTag("").Key]) } diff --git a/common/persistence/query_util_test.go b/common/persistence/query_util_test.go index 0d7d0dbb845..7f17fc79801 100644 --- a/common/persistence/query_util_test.go +++ b/common/persistence/query_util_test.go @@ -61,7 +61,7 @@ func (s *queryUtilSuite) TestLoadAndSplitQueryFromReaders() { ` statements, err := LoadAndSplitQueryFromReaders([]io.Reader{bytes.NewBufferString(input)}) s.NoError(err) - s.Equal(4, len(statements)) + s.Len(statements, 4) s.Equal( `DO LANGUAGE 'plpgsql' $$ BEGIN diff --git a/common/persistence/serialization/serializer_test.go b/common/persistence/serialization/serializer_test.go index d936d285b3e..eb93de6022f 100644 --- a/common/persistence/serialization/serializer_test.go +++ b/common/persistence/serialization/serializer_test.go @@ -81,39 +81,39 @@ func (s *temporalSerializerSuite) TestSerializer() { // serialize event nilEvent, err := s.serializer.SerializeEvent(nil) - s.Nil(err) + s.NoError(err) s.Nil(nilEvent) dProto, err := s.serializer.SerializeEvent(event0) - s.Nil(err) + s.NoError(err) s.NotNil(dProto) // serialize batch events nilEvents, err := s.serializer.SerializeEvents(nil) - s.Nil(err) + s.NoError(err) s.NotNil(nilEvents) dsProto, err := s.serializer.SerializeEvents(history0.Events) - s.Nil(err) + s.NoError(err) s.NotNil(dsProto) // deserialize event dNilEvent, err := s.serializer.DeserializeEvent(nilEvent) - s.Nil(err) + s.NoError(err) s.Nil(dNilEvent) event2, err := s.serializer.DeserializeEvent(dProto) - s.Nil(err) + s.NoError(err) s.ProtoEqual(event0, event2) // deserialize events dNilEvents, err := s.serializer.DeserializeEvents(nilEvents) - s.Nil(err) + s.NoError(err) s.Nil(dNilEvents) events, err := s.serializer.DeserializeEvents(dsProto) history2 := &historypb.History{Events: events} - s.Nil(err) + s.NoError(err) s.ProtoEqual(history0, history2) }() } diff --git a/common/persistence/serialization/task_serializers_test.go b/common/persistence/serialization/task_serializers_test.go index 61014fcaae5..44d1ae034b9 100644 --- a/common/persistence/serialization/task_serializers_test.go +++ b/common/persistence/serialization/task_serializers_test.go @@ -475,8 +475,8 @@ func (s *taskSerializerSuite) TestArchiveExecutionTask() { TaskID: rand.Int63(), Version: rand.Int63(), } - s.Assert().Equal(tasks.CategoryArchival, task.GetCategory()) - s.Assert().Equal(enumsspb.TASK_TYPE_ARCHIVAL_ARCHIVE_EXECUTION, task.GetType()) + s.Equal(tasks.CategoryArchival, task.GetCategory()) + s.Equal(enumsspb.TASK_TYPE_ARCHIVAL_ARCHIVE_EXECUTION, task.GetType()) s.assertEqualTasks(task) } @@ -534,8 +534,8 @@ func (s *taskSerializerSuite) TestStateMachineOutboundTask() { Destination: "foo", } - s.Assert().Equal(tasks.CategoryOutbound, task.GetCategory()) - s.Assert().Equal(enumsspb.TASK_TYPE_STATE_MACHINE_OUTBOUND, task.GetType()) + s.Equal(tasks.CategoryOutbound, task.GetCategory()) + s.Equal(enumsspb.TASK_TYPE_STATE_MACHINE_OUTBOUND, task.GetType()) blob, err := s.serializer.SerializeTask(task) s.NoError(err) @@ -585,8 +585,8 @@ func (s *taskSerializerSuite) TestStateMachineTimerTask() { Version: rand.Int63(), } - s.Assert().Equal(tasks.CategoryTimer, task.GetCategory()) - s.Assert().Equal(enumsspb.TASK_TYPE_STATE_MACHINE_TIMER, task.GetType()) + s.Equal(tasks.CategoryTimer, task.GetCategory()) + s.Equal(enumsspb.TASK_TYPE_STATE_MACHINE_TIMER, task.GetType()) blob, err := s.serializer.SerializeTask(task) s.NoError(err) diff --git a/common/persistence/serializer_test.go b/common/persistence/serializer_test.go index 5bc8aa58dfb..5514796a4ff 100644 --- a/common/persistence/serializer_test.go +++ b/common/persistence/serializer_test.go @@ -78,42 +78,42 @@ func (s *temporalSerializerSuite) TestSerializer() { // serialize event nilEvent, err := serializer.SerializeEvent(nil) - s.Nil(err) + s.NoError(err) s.Nil(nilEvent) dProto, err := serializer.SerializeEvent(event0) - s.Nil(err) + s.NoError(err) s.NotNil(dProto) // serialize batch events nilEvents, err := serializer.SerializeEvents(nil) - s.Nil(err) + s.NoError(err) s.NotNil(nilEvents) dsProto, err := serializer.SerializeEvents(history0.Events) - s.Nil(err) + s.NoError(err) s.NotNil(dsProto) // deserialize event dNilEvent, err := serializer.DeserializeEvent(nilEvent) - s.Nil(err) + s.NoError(err) s.Nil(dNilEvent) event2, err := serializer.DeserializeEvent(dProto) - s.Nil(err) + s.NoError(err) s.ProtoEqual(event0, event2) // deserialize events dNilEvents, err := serializer.DeserializeEvents(nilEvents) - s.Nil(err) + s.NoError(err) s.Nil(dNilEvents) events, err := serializer.DeserializeEvents(dsProto) history2 := &historypb.History{Events: events} - s.Nil(err) + s.NoError(err) s.ProtoEqual(history0, history2) }() } diff --git a/common/persistence/sql/sqlplugin/mysql/session/session_test.go b/common/persistence/sql/sqlplugin/mysql/session/session_test.go index 185a2990ef9..2026b79e4b5 100644 --- a/common/persistence/sql/sqlplugin/mysql/session/session_test.go +++ b/common/persistence/sql/sqlplugin/mysql/session/session_test.go @@ -135,7 +135,7 @@ func (s *sessionTestSuite) TestBuildDSN() { } s.True(strings.HasPrefix(out, tc.outURLPath), "invalid url path") tokens := strings.Split(out, "?") - s.Equal(2, len(tokens), "invalid url") + s.Len(tokens, 2, "invalid url") qry, err := url.Parse("?" + tokens[1]) s.NoError(err) wantAttrs := buildExpectedURLParams(dbKind, tc.in.ConnectAttributes, tc.outIsolationKey, tc.outIsolationVal) diff --git a/common/persistence/sql/sqlplugin/tests/history_transfer_task.go b/common/persistence/sql/sqlplugin/tests/history_transfer_task.go index 18e638dcf56..237943b81d9 100644 --- a/common/persistence/sql/sqlplugin/tests/history_transfer_task.go +++ b/common/persistence/sql/sqlplugin/tests/history_transfer_task.go @@ -170,7 +170,7 @@ func (s *historyHistoryTransferTaskSuite) TestInsertSelect_Multiple() { rows, err := s.store.RangeSelectFromTransferTasks(newExecutionContext(), filter) s.NoError(err) s.NotEmpty(rows) - s.True(len(rows) <= filter.PageSize) + s.LessOrEqual(len(rows), filter.PageSize) for index := range rows { rows[index].ShardID = shardID } diff --git a/common/persistence/sql/sqlplugin/tests/history_visibility_task.go b/common/persistence/sql/sqlplugin/tests/history_visibility_task.go index 21ae5614e68..8d7e232db63 100644 --- a/common/persistence/sql/sqlplugin/tests/history_visibility_task.go +++ b/common/persistence/sql/sqlplugin/tests/history_visibility_task.go @@ -170,7 +170,7 @@ func (s *historyHistoryVisibilityTaskSuite) TestInsertSelect_Multiple() { rows, err := s.store.RangeSelectFromVisibilityTasks(newExecutionContext(), filter) s.NoError(err) s.NotEmpty(rows) - s.True(len(rows) <= filter.PageSize) + s.LessOrEqual(len(rows), filter.PageSize) for index := range rows { rows[index].ShardID = shardID } diff --git a/common/persistence/sql/sqlplugin/tests/queue_v2.go b/common/persistence/sql/sqlplugin/tests/queue_v2.go index 32b33ccdfb6..dd6f9865081 100644 --- a/common/persistence/sql/sqlplugin/tests/queue_v2.go +++ b/common/persistence/sql/sqlplugin/tests/queue_v2.go @@ -277,7 +277,7 @@ func testQueueInsertFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB assert.ErrorContains(t, err, "insert error") require.Len(t, logger.errMsgs, 1) assert.Contains(t, logger.errMsgs[0], "transaction rollback error") - assert.Equal(t, db.commitCalls, 0) + assert.Equal(t, 0, db.commitCalls) } func testCommitTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { @@ -297,7 +297,7 @@ func testCommitTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { _, err = persistencetest.EnqueueMessage(context.Background(), q, queueType, queueName) require.Error(t, err) assert.ErrorContains(t, err, "EnqueueMessage failed") - assert.Equal(t, db.commitCalls, 1) + assert.Equal(t, 1, db.commitCalls) } func testBeginTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { @@ -317,7 +317,7 @@ func testBeginTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { _, err = persistencetest.EnqueueMessage(context.Background(), q, queueType, queueName) require.Error(t, err) assert.ErrorContains(t, err, "txBegin error") - assert.Equal(t, db.commitCalls, 0) + assert.Equal(t, 0, db.commitCalls) } func testGetLastMessageIDFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { @@ -338,7 +338,7 @@ func testGetLastMessageIDFails(ctx context.Context, t *testing.T, baseDB sqlplug _, err = persistencetest.EnqueueMessage(context.Background(), q, queueType, queueName) require.Error(t, err) assert.ErrorContains(t, err, "failed to get last messageId") - assert.Equal(t, db.commitCalls, 0) + assert.Equal(t, 0, db.commitCalls) } func testRangeSelectFromQueueV2MessagesFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { diff --git a/common/persistence/tests/execution_mutable_state.go b/common/persistence/tests/execution_mutable_state.go index ccb415a7c0c..7ab9fb7a4a5 100644 --- a/common/persistence/tests/execution_mutable_state.go +++ b/common/persistence/tests/execution_mutable_state.go @@ -2728,7 +2728,7 @@ func (s *ExecutionMutableStateSuite) assertHEWithDB( if !assertPrefix { s.Nil(resp.NextPageToken) } - s.Equal(len(historyEvents), len(resp.HistoryEvents)) + s.Len(resp.HistoryEvents, len(historyEvents)) for i, event := range historyEvents { s.ProtoEqual(event, resp.HistoryEvents[i]) } diff --git a/common/persistence/tests/execution_mutable_state_task.go b/common/persistence/tests/execution_mutable_state_task.go index 62b7f25ba6d..9b87eb0323f 100644 --- a/common/persistence/tests/execution_mutable_state_task.go +++ b/common/persistence/tests/execution_mutable_state_task.go @@ -474,7 +474,7 @@ func (s *ExecutionMutableStateTaskSuite) TestGetTimerTasksOrdered() { 10, ) s.Len(loadedTasks, 2) - s.True(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey()) < 0) + s.Negative(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey())) } func (s *ExecutionMutableStateTaskSuite) TestGetScheduledTasksOrdered() { @@ -516,7 +516,7 @@ func (s *ExecutionMutableStateTaskSuite) TestGetScheduledTasksOrdered() { 10, ) s.Len(loadedTasks, 2) - s.True(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey()) < 0) + s.Negative(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey())) err = s.ExecutionManager.RangeCompleteHistoryTasks(s.Ctx, &p.RangeCompleteHistoryTasksRequest{ ShardID: s.ShardID, @@ -584,7 +584,7 @@ func (s *ExecutionMutableStateTaskSuite) PaginateTasks( for { response, err := s.ExecutionManager.GetHistoryTasks(s.Ctx, request) s.NoError(err) - s.True(len(response.Tasks) <= batchSize) + s.LessOrEqual(len(response.Tasks), batchSize) loadedTasks = append(loadedTasks, response.Tasks...) if len(response.NextPageToken) == 0 { break diff --git a/common/persistence/tests/nexus_endpoint_suite.go b/common/persistence/tests/nexus_endpoint_suite.go index 45e6305125e..b924a169231 100644 --- a/common/persistence/tests/nexus_endpoint_suite.go +++ b/common/persistence/tests/nexus_endpoint_suite.go @@ -57,7 +57,7 @@ func testNexusEndpointsStoreSteadyState(t *testing.T, store persistence.NexusEnd // List when table is empty resp, err := store.ListNexusEndpoints(ctx, &persistence.ListNexusEndpointsRequest{PageSize: 10}) require.NoError(t, err) - require.Len(t, resp.Endpoints, 0) + require.Empty(t, resp.Endpoints) require.Equal(t, tableVersion.Load(), resp.TableVersion) // Create an endpoint @@ -172,7 +172,7 @@ func testNexusEndpointsStoreSteadyState(t *testing.T, store persistence.NexusEnd LastKnownTableVersion: tableVersion.Load(), }) require.NoError(t, err) - require.Len(t, resp.Endpoints, 0) + require.Empty(t, resp.Endpoints) }) } diff --git a/common/persistence/tests/queue_v2_test_suite.go b/common/persistence/tests/queue_v2_test_suite.go index 24f68c11db3..5da6ebfebfb 100644 --- a/common/persistence/tests/queue_v2_test_suite.go +++ b/common/persistence/tests/queue_v2_test_suite.go @@ -146,7 +146,7 @@ func testHappyPath( NextPageToken: nil, }) require.NoError(t, err) - assert.Equal(t, 0, len(response.Messages)) + assert.Empty(t, response.Messages) encodingType := enumspb.ENCODING_TYPE_JSON _, err = persistencetest.EnqueueMessage(ctx, queue, queueType, queueName) @@ -325,7 +325,7 @@ func testRangeDeleteMessages(ctx context.Context, t *testing.T, queue persistenc }) require.NoError(t, err) require.Len(t, response.Messages, 1) - require.Equal(t, response.Messages[0].MetaData.ID, int64(3)) + require.Equal(t, int64(3), response.Messages[0].MetaData.ID) }) t.Run("DeleteSameRangeTwice", func(t *testing.T) { @@ -399,7 +399,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Equal(t, 0, len(response.Queues)) + require.Empty(t, response.Queues) // List of all created queues var queueNames []string @@ -418,7 +418,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Equal(t, 1, len(response.Queues)) + require.Len(t, response.Queues, 1) require.Equal(t, queueName, response.Queues[0].QueueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -437,7 +437,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Equal(t, 2, len(response.Queues)) + require.Len(t, response.Queues, 2) require.Contains(t, []string{response.Queues[0].QueueName, response.Queues[1].QueueName}, queueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -461,7 +461,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Equal(t, 1, len(response.Queues)) + require.Len(t, response.Queues, 1) listedQueueNames = append(listedQueueNames, response.Queues[0].QueueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -471,7 +471,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: response.NextPageToken, }) require.NoError(t, err) - require.Equal(t, 1, len(response.Queues)) + require.Len(t, response.Queues, 1) listedQueueNames = append(listedQueueNames, response.Queues[0].QueueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -481,7 +481,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: response.NextPageToken, }) require.NoError(t, err) - require.Equal(t, 3, len(response.Queues)) + require.Len(t, response.Queues, 3) for _, queue := range response.Queues { listedQueueNames = append(listedQueueNames, queue.QueueName) require.Equal(t, int64(0), queue.MessageCount) @@ -493,7 +493,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: response.NextPageToken, }) require.NoError(t, err) - require.Equal(t, 0, len(response.Queues)) + require.Empty(t, response.Queues) require.Empty(t, response.NextPageToken) for _, queueName := range queueNames { require.Contains(t, listedQueueNames, queueName) diff --git a/common/persistence/tests/visibility_persistence_suite.go b/common/persistence/tests/visibility_persistence_suite.go index 15e77be9f89..4fda1f6d026 100644 --- a/common/persistence/tests/visibility_persistence_suite.go +++ b/common/persistence/tests/visibility_persistence_suite.go @@ -137,8 +137,8 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibility() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.Nil(err1) - s.Equal(1, len(resp.Executions)) + s.NoError(err1) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(startReq, resp.Executions[0]) closeReq := s.createClosedWorkflowRecord( @@ -160,8 +160,8 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibility() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.Nil(err3) - s.Equal(0, len(resp.Executions)) + s.NoError(err3) + s.Empty(resp.Executions) // ListClosedWorkflowExecutions resp, err4 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -176,8 +176,8 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibility() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.Nil(err4) - s.Equal(1, len(resp.Executions)) + s.NoError(err4) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closeReq, resp.Executions[0]) } @@ -209,7 +209,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityTimeSkew() { ), }) s.NoError(err1) - s.Equal(1, len(resp.Executions)) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord, resp.Executions[0]) closedRecord := s.createClosedWorkflowRecord( @@ -232,7 +232,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityTimeSkew() { ), }) s.NoError(err3) - s.Equal(0, len(resp.Executions)) + s.Empty(resp.Executions) // ListClosedWorkflowExecutions resp, err4 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -248,7 +248,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityTimeSkew() { ), }) s.NoError(err4) - s.Equal(1, len(resp.Executions)) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closedRecord, resp.Executions[0]) } @@ -284,7 +284,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityShortWorkflow() { ), }) s.NoError(err3) - s.Equal(0, len(resp.Executions)) + s.Empty(resp.Executions) // ListClosedWorkflowExecutions resp, err4 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -300,7 +300,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityShortWorkflow() { ), }) s.NoError(err4) - s.Equal(1, len(resp.Executions)) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closedRecord, resp.Executions[0]) } @@ -342,8 +342,8 @@ func (s *VisibilityPersistenceSuite) TestVisibilityPagination() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.Nil(err2) - s.Equal(1, len(resp.Executions)) + s.NoError(err2) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord2, resp.Executions[0]) // Use token to get the second one @@ -360,8 +360,8 @@ func (s *VisibilityPersistenceSuite) TestVisibilityPagination() { ), NextPageToken: resp.NextPageToken, }) - s.Nil(err3) - s.Equal(1, len(resp.Executions)) + s.NoError(err3) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // It is possible to not return non empty token which is going to return empty result @@ -380,8 +380,8 @@ func (s *VisibilityPersistenceSuite) TestVisibilityPagination() { ), NextPageToken: resp.NextPageToken, }) - s.Nil(err4) - s.Equal(0, len(resp.Executions)) + s.NoError(err4) + s.Empty(resp.Executions) } } @@ -422,7 +422,7 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStartTime() { ), }) s.NoError(err) - s.Equal(1, len(resp.Executions)) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord2, resp.Executions[0]) // List with WorkflowType filter in query string @@ -432,8 +432,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStartTime() { PageSize: 2, Query: queryStr, }) - s.Nil(err) - s.Equal(1, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord2, resp.Executions[0]) queryStr = fmt.Sprintf(`StartTime BETWEEN "%v" AND "%v"`, time.Now().Add(-3*time.Hour).Format(time.RFC3339Nano), time.Now().Format(time.RFC3339Nano)) @@ -442,16 +442,16 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStartTime() { PageSize: 2, Query: queryStr, }) - s.Nil(err) - s.Equal(2, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 2) resp, err = s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ NamespaceID: testNamespaceUUID, PageSize: 2, Query: queryStr + ` AND WorkflowType = "visibility-workflow-1"`, }) - s.Nil(err) - s.Equal(1, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) } @@ -493,8 +493,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { "visibility-workflow-1", ), }) - s.Nil(err2) - s.Equal(1, len(resp.Executions)) + s.NoError(err2) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // List with WorkflowType filter in query string @@ -503,8 +503,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { PageSize: 2, Query: `WorkflowType = "visibility-workflow-1"`, }) - s.Nil(err) - s.Equal(1, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // Close both executions @@ -530,8 +530,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { "visibility-workflow-2", ), }) - s.Nil(err5) - s.Equal(1, len(resp.Executions)) + s.NoError(err5) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) // List with WorkflowType filter in query string @@ -540,8 +540,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { PageSize: 2, Query: `WorkflowType = "visibility-workflow-2"`, }) - s.Nil(err) - s.Equal(1, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) } @@ -583,8 +583,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { "visibility-filtering-test1", ), }) - s.Nil(err2) - s.Equal(1, len(resp.Executions)) + s.NoError(err2) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // List workflow with workflowID filter in query string @@ -593,8 +593,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { PageSize: 2, Query: `WorkflowId = "visibility-filtering-test1"`, }) - s.Nil(err) - s.Equal(1, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 1) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // Close both executions @@ -620,8 +620,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { "visibility-filtering-test2", ), }) - s.Nil(err5) - s.Equal(1, len(resp.Executions)) + s.NoError(err5) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) // List workflow with workflowID filter in query string @@ -630,8 +630,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { PageSize: 2, Query: `WorkflowId = "visibility-filtering-test2"`, }) - s.Nil(err) - s.Equal(1, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) } @@ -682,8 +682,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStatus() { enumspb.WORKFLOW_EXECUTION_STATUS_FAILED, ), }) - s.Nil(err4) - s.Equal(1, len(resp.Executions)) + s.NoError(err4) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closeRecord2, resp.Executions[0]) resp, err := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -691,8 +691,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStatus() { PageSize: 5, Query: `ExecutionStatus = "Failed"`, }) - s.Nil(err) - s.Equal(1, len(resp.Executions)) + s.NoError(err) + s.Len(resp.Executions, 1) s.assertClosedExecutionEquals(closeRecord2, resp.Executions[0]) } @@ -738,8 +738,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.Nil(err3) - s.Equal(closedRows, len(resp.Executions)) + s.NoError(err3) + s.Len(resp.Executions, closedRows) // Delete closed workflow for _, row := range resp.Executions { @@ -748,7 +748,7 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { WorkflowID: row.GetExecution().GetWorkflowId(), RunID: row.GetExecution().GetRunId(), }) - s.Nil(err4) + s.NoError(err4) } // ListClosedWorkflowExecutions @@ -764,8 +764,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.Nil(err5) - s.Equal(0, len(resp.Executions)) + s.NoError(err5) + s.Empty(resp.Executions) // ListOpenWorkflowExecutions resp, err6 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -780,8 +780,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { ), PageSize: 10, }) - s.Nil(err6) - s.Equal(openRows-closedRows, len(resp.Executions)) + s.NoError(err6) + s.Len(resp.Executions, openRows-closedRows) // Delete open workflow for _, row := range resp.Executions { err7 := s.VisibilityMgr.DeleteWorkflowExecution(s.ctx, &manager.VisibilityDeleteWorkflowExecutionRequest{ @@ -789,7 +789,7 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { WorkflowID: row.GetExecution().GetWorkflowId(), RunID: row.GetExecution().GetRunId(), }) - s.Nil(err7) + s.NoError(err7) } resp, err8 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ NamespaceID: testNamespaceUUID, @@ -801,8 +801,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { ), PageSize: 10, }) - s.Nil(err8) - s.Equal(0, len(resp.Executions)) + s.NoError(err8) + s.Empty(resp.Executions) } // TestUpsertWorkflowExecution test @@ -1063,7 +1063,7 @@ func (s *VisibilityPersistenceSuite) listWithPagination(namespaceID namespace.ID PageSize: pageSize, Query: "", }) - s.Nil(err) + s.NoError(err) executions = append(executions, resp.Executions...) for len(resp.NextPageToken) > 0 { @@ -1073,7 +1073,7 @@ func (s *VisibilityPersistenceSuite) listWithPagination(namespaceID namespace.ID Query: "", NextPageToken: resp.NextPageToken, }) - s.Nil(err) + s.NoError(err) executions = append(executions, resp.Executions...) } @@ -1101,7 +1101,7 @@ func (s *VisibilityPersistenceSuite) createClosedWorkflowRecord( HistoryLength: 5, } err := s.VisibilityMgr.RecordWorkflowExecutionClosed(s.ctx, closeReq) - s.Nil(err) + s.NoError(err) return closeReq } @@ -1131,7 +1131,7 @@ func (s *VisibilityPersistenceSuite) createOpenWorkflowRecord( }, } err := s.VisibilityMgr.RecordWorkflowExecutionStarted(s.ctx, startReq) - s.Nil(err) + s.NoError(err) return startReq } @@ -1154,6 +1154,6 @@ func (s *VisibilityPersistenceSuite) assertOpenExecutionEquals( s.Equal(req.WorkflowTypeName, resp.GetType().GetName()) s.Equal(persistence.UnixMilliseconds(req.StartTime), persistence.UnixMilliseconds(timestamp.TimeValue(resp.GetStartTime()))) s.Nil(resp.CloseTime) - s.Equal(resp.Status, enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING) + s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, resp.Status) s.Zero(resp.HistoryLength) } diff --git a/common/persistence/versionhistory/version_history_test.go b/common/persistence/versionhistory/version_history_test.go index 6d9378f775d..e65ebf99bf3 100644 --- a/common/persistence/versionhistory/version_history_test.go +++ b/common/persistence/versionhistory/version_history_test.go @@ -499,17 +499,17 @@ func (s *versionHistoriesSuite) TestAddGetVersionHistory() { s.Equal(int32(0), histories.CurrentVersionHistoryIndex) currentBranchChanged, newVersionHistoryIndex, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.Nil(err) + s.NoError(err) s.True(currentBranchChanged) s.Equal(int32(1), newVersionHistoryIndex) s.Equal(int32(1), histories.CurrentVersionHistoryIndex) resultVersionHistory1, err := GetVersionHistory(histories, 0) - s.Nil(err) + s.NoError(err) s.Equal(versionHistory1, resultVersionHistory1) resultVersionHistory2, err := GetVersionHistory(histories, 1) - s.Nil(err) + s.NoError(err) s.Equal(versionHistory2, resultVersionHistory2) } @@ -529,7 +529,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_LargerEven histories := NewVersionHistories(versionHistory1) _, _, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.Nil(err) + s.NoError(err) versionHistoryIncoming := NewVersionHistory([]byte("branch token incoming"), []*historyspb.VersionHistoryItem{ {EventId: 3, Version: 0}, @@ -539,7 +539,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_LargerEven }) item, index, err := FindLCAVersionHistoryItemAndIndex(histories, versionHistoryIncoming) - s.Nil(err) + s.NoError(err) s.Equal(int32(0), index) s.Equal(NewVersionHistoryItem(7, 6), item) } @@ -559,7 +559,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_SameEventI histories := NewVersionHistories(versionHistory1) _, _, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.Nil(err) + s.NoError(err) versionHistoryIncoming := NewVersionHistory([]byte("branch token incoming"), []*historyspb.VersionHistoryItem{ {EventId: 3, Version: 0}, @@ -569,7 +569,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_SameEventI }) item, index, err := FindLCAVersionHistoryItemAndIndex(histories, versionHistoryIncoming) - s.Nil(err) + s.NoError(err) s.Equal(int32(1), index) s.Equal(NewVersionHistoryItem(7, 6), item) } @@ -589,7 +589,7 @@ func (s *versionHistoriesSuite) TestFindFirstVersionHistoryIndexByItem() { histories := NewVersionHistories(versionHistory1) _, _, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.Nil(err) + s.NoError(err) index, err := FindFirstVersionHistoryIndexByVersionHistoryItem(histories, NewVersionHistoryItem(8, 10)) s.NoError(err) diff --git a/common/persistence/visibility/store/elasticsearch/converter_test.go b/common/persistence/visibility/store/elasticsearch/converter_test.go index 0549fba13e3..2b2b6977b67 100644 --- a/common/persistence/visibility/store/elasticsearch/converter_test.go +++ b/common/persistence/visibility/store/elasticsearch/converter_test.go @@ -135,7 +135,7 @@ func TestSupportedSelectWhere(t *testing.T) { actualMap, _ := queryParams.Query.Source() actualJson, _ := json.Marshal(actualMap) - assert.Equal(t, expectedJson, string(actualJson), fmt.Sprintf("sql: %s", sql)) + assert.JSONEq(t, expectedJson, string(actualJson), fmt.Sprintf("sql: %s", sql)) } } @@ -165,7 +165,7 @@ func TestSupportedSelectWhereOrder(t *testing.T) { actualQueryMap, _ := queryParams.Query.Source() actualQueryJson, _ := json.Marshal(actualQueryMap) - assert.Equal(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) + assert.JSONEq(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) var actualSorterMaps []any for _, sorter := range queryParams.Sorter { @@ -173,7 +173,7 @@ func TestSupportedSelectWhereOrder(t *testing.T) { actualSorterMaps = append(actualSorterMaps, actualSorterMap) } actualSorterJson, _ := json.Marshal(actualSorterMaps) - assert.Equal(t, expectedJson.sorter, string(actualSorterJson), fmt.Sprintf("sql: %s", sql)) + assert.JSONEq(t, expectedJson.sorter, string(actualSorterJson), fmt.Sprintf("sql: %s", sql)) } } @@ -187,7 +187,7 @@ func TestSupportedSelectWhereGroupBy(t *testing.T) { if expectedJson.query != "" { actualQueryMap, _ := queryParams.Query.Source() actualQueryJson, _ := json.Marshal(actualQueryMap) - assert.Equal(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) + assert.JSONEq(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) } else { assert.Nil(t, queryParams.Query) } diff --git a/common/persistence/visibility/store/elasticsearch/processor_test.go b/common/persistence/visibility/store/elasticsearch/processor_test.go index 119745ef4d2..b8136fbd57e 100644 --- a/common/persistence/visibility/store/elasticsearch/processor_test.go +++ b/common/persistence/visibility/store/elasticsearch/processor_test.go @@ -436,7 +436,7 @@ func (s *processorSuite) TestExtractVisibilityTaskKey() { request := elastic.NewBulkIndexRequest() s.mockMetricHandler.EXPECT().Counter(metrics.ElasticsearchBulkProcessorCorruptedData.Name()).Return(metrics.NoopCounterMetricFunc) visibilityTaskKey := s.esProcessor.extractVisibilityTaskKey(request) - s.Equal("", visibilityTaskKey) + s.Empty(visibilityTaskKey) m := map[string]any{ sadefs.VisibilityTaskKey: 1, @@ -456,7 +456,7 @@ func (s *processorSuite) TestExtractVisibilityTaskKey_Delete() { // ensure compatible with dependency source, err := request.Source() s.NoError(err) - s.Equal(1, len(source)) + s.Len(source, 1) var body map[string]map[string]any err = json.Unmarshal([]byte(source[0]), &body) s.NoError(err) @@ -465,7 +465,7 @@ func (s *processorSuite) TestExtractVisibilityTaskKey_Delete() { s.mockMetricHandler.EXPECT().Counter(metrics.ElasticsearchBulkProcessorCorruptedData.Name()).Return(metrics.NoopCounterMetricFunc) key := s.esProcessor.extractVisibilityTaskKey(request) - s.Equal("", key) + s.Empty(key) id := "id" request.Id(id) @@ -497,7 +497,7 @@ func (s *processorSuite) TestIsResponseSuccess() { func (s *processorSuite) TestErrorReasonFromResponse() { reason := "error reason" resp := &elastic.BulkResponseItem{Status: 400} - s.Equal("", extractErrorReason(resp)) + s.Empty(extractErrorReason(resp)) resp.Error = &elastic.ErrorDetails{Reason: reason} s.Equal(reason, extractErrorReason(resp)) } diff --git a/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go b/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go index f1389e30b6d..21d6b465b92 100644 --- a/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go +++ b/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go @@ -348,37 +348,37 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy() { query := `WorkflowId = 'wid'` queryParams, err := s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `WorkflowId = 'wid' or WorkflowId = 'another-wid'` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"term":{"WorkflowId":"another-wid"}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"term":{"WorkflowId":"another-wid"}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `WorkflowId = 'wid' order by StartTime desc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"StartTime":{"missing":"_last","order":"desc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `WorkflowId = 'wid' and CloseTime is null` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `WorkflowId = 'wid' or CloseTime is null` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `CloseTime is null order by CloseTime desc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"CloseTime":{"missing":"_last","order":"desc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `StartTime = "2018-06-07T15:04:05.123456789-08:00"` @@ -390,56 +390,56 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy() { query = `WorkflowId = 'wid' and StartTime > "2018-06-07T15:04:05+00:00"` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"range":{"StartTime":{"from":"2018-06-07T15:04:05+00:00","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"range":{"StartTime":{"from":"2018-06-07T15:04:05+00:00","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ExecutionTime < 1000000` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ExecutionTime between 1 and 2` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.000000001Z","include_lower":true,"include_upper":true,"to":"1970-01-01T00:00:00.000000002Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.000000001Z","include_lower":true,"include_upper":true,"to":"1970-01-01T00:00:00.000000002Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ExecutionTime < 1000000 or ExecutionTime > 2000000` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}},{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.002Z","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}},{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.002Z","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `order by ExecutionTime` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"ExecutionTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by StartTime desc, CloseTime asc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"StartTime":{"missing":"_last","order":"desc"}},{"CloseTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by CustomTextField desc` _, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) - s.Equal(err.(*serviceerror.InvalidArgument).Error(), "invalid query: unable to convert 'order by' column name: unable to sort by field of Text type, use field of type Keyword") + s.Equal("invalid query: unable to convert 'order by' column name: unable to sort by field of Text type, use field of type Keyword", err.(*serviceerror.InvalidArgument).Error()) query = `order by CustomIntField asc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"CustomIntField":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `ExecutionTime < "unable to parse"` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) - s.Equal(err.Error(), "invalid query: unable to convert filter expression: unable to convert values of comparison expression: invalid value for search attribute ExecutionTime of type Datetime: \"unable to parse\"") + s.Equal("invalid query: unable to convert filter expression: unable to convert values of comparison expression: invalid value for search attribute ExecutionTime of type Datetime: \"unable to parse\"", err.Error()) s.Nil(queryParams) // invalid union injection @@ -453,19 +453,19 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper() { query := `WorkflowId = 'wid'` queryParams, err := s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = "`AliasForCustomKeywordField` = 'pid'" queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = "`AliasWithHyphenFor-CustomKeywordField` = 'pid'" queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `CustomKeywordField = 'pid'` @@ -484,13 +484,13 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper() { query = `order by ExecutionTime` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"ExecutionTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by AliasForCustomKeywordField asc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"CustomKeywordField":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by CustomKeywordField asc` @@ -511,7 +511,7 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper_Error() { query := `WorkflowId = 'wid'` queryParams, err := s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ProductId = 'pid'` @@ -524,7 +524,7 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper_Error() { query = `order by ExecutionTime` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"ExecutionTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) s.visibilityStore.searchAttributesMapperProvider = nil @@ -653,8 +653,8 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { }} resp, err := s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, 1, nil) s.NoError(err) - s.Equal(0, len(resp.NextPageToken)) - s.Equal(0, len(resp.Executions)) + s.Empty(resp.NextPageToken) + s.Empty(resp.Executions) // test for one hits data := []byte(`{"ExecutionStatus": "Running", @@ -678,13 +678,13 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { s.NoError(err) serializedToken, _ := s.visibilityStore.serializePageToken(&visibilityPageToken{SearchAfter: []any{1547596872371234567, "e481009e-14b3-45ae-91af-dce6e2a88365"}}) s.Equal(serializedToken, resp.NextPageToken) - s.Equal(1, len(resp.Executions)) + s.Len(resp.Executions, 1) // test page size > number of results resp, err = s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, 2, nil) s.NoError(err) s.Equal(serializedToken, resp.NextPageToken) - s.Equal(1, len(resp.Executions)) + s.Len(resp.Executions, 1) // test for search after searchResult.Hits.Hits = []*elastic.SearchHit{} @@ -694,7 +694,7 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { numOfHits := len(searchResult.Hits.Hits) resp, err = s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits, nil) s.NoError(err) - s.Equal(numOfHits, len(resp.Executions)) + s.Len(resp.Executions, numOfHits) nextPageToken, err := s.visibilityStore.deserializePageToken(resp.NextPageToken) s.NoError(err) resultSortValue, err := nextPageToken.SearchAfter[0].(json.Number).Int64() @@ -705,7 +705,7 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { resp, err = s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits+1, nil) s.NoError(err) s.Equal(serializedToken, resp.NextPageToken) - s.Equal(numOfHits, len(resp.Executions)) + s.Len(resp.Executions, numOfHits) } func (s *ESVisibilitySuite) TestDeserializePageToken() { @@ -744,7 +744,7 @@ func (s *ESVisibilitySuite) TestSerializePageToken() { newToken := &visibilityPageToken{SearchAfter: []any{sortTime, tieBreaker}} data, err = s.visibilityStore.serializePageToken(newToken) s.NoError(err) - s.True(len(data) > 0) + s.Positive(len(data)) token, err = s.visibilityStore.deserializePageToken(data) s.NoError(err) resultSortValue, err := token.SearchAfter[0].(json.Number).Int64() @@ -1896,7 +1896,7 @@ func (s *ESVisibilitySuite) Test_parsePageTokenValue() { jsonToken, _ := json.Marshal(pageToken) pageToken, err := s.visibilityStore.deserializePageToken(jsonToken) s.NoError(err) - s.Equal(len(testCases), len(pageToken.SearchAfter)) + s.Len(pageToken.SearchAfter, len(testCases)) for i, tc := range testCases { s.T().Run(tc.name, func(t *testing.T) { res, err := parsePageTokenValue(tc.name, pageToken.SearchAfter[i], tc.tp) diff --git a/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go b/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go index 21e1226b219..392b30d86b2 100644 --- a/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go +++ b/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go @@ -64,7 +64,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionStarted() { s.EqualValues(request.SearchAttributes.GetIndexedFields()["CustomTextField"].Data, fmt.Sprintf("%q", CustomTextField)) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.EqualValues(request.TaskID, bulkRequest.Version) + s.Equal(request.TaskID, bulkRequest.Version) s.Equal("wid~rid", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -97,7 +97,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionStarted_EmptyRequest() { s.False(ok) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.EqualValues(request.TaskID, bulkRequest.Version) + s.Equal(request.TaskID, bulkRequest.Version) s.Equal("~", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -154,7 +154,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionClosed() { s.EqualValues(request.HistoryLength, body[sadefs.HistoryLength]) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.EqualValues(request.TaskID, bulkRequest.Version) + s.Equal(request.TaskID, bulkRequest.Version) s.Equal("wid~rid", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -187,7 +187,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionClosed_EmptyRequest() { s.False(ok) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.EqualValues(request.TaskID, bulkRequest.Version) + s.Equal(request.TaskID, bulkRequest.Version) s.Equal("~", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -214,7 +214,7 @@ func (s *ESVisibilitySuite) TestDeleteExecution() { s.Equal("wid~rid", visibilityTaskKey) s.Equal(client.BulkableRequestTypeDelete, bulkRequest.RequestType) - s.EqualValues(request.TaskID, bulkRequest.Version) + s.Equal(request.TaskID, bulkRequest.Version) s.Equal("wid~rid", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) diff --git a/common/persistence/visibility/store/sql/pagination_token_legacy_test.go b/common/persistence/visibility/store/sql/pagination_token_legacy_test.go index e71623785c1..5eb03aca143 100644 --- a/common/persistence/visibility/store/sql/pagination_token_legacy_test.go +++ b/common/persistence/visibility/store/sql/pagination_token_legacy_test.go @@ -17,9 +17,9 @@ func TestSerializePageToken(t *testing.T) { } data, err := serializePageTokenLegacy(&token) s.NoError(err) - s.Equal( - []byte(`{"CloseTime":"2023-03-21T14:20:32Z","StartTime":"2023-03-21T14:10:32Z","RunID":"test-run-id"}`), - data, + s.JSONEq( + `{"CloseTime":"2023-03-21T14:20:32Z","StartTime":"2023-03-21T14:10:32Z","RunID":"test-run-id"}`, + string(data), ) } diff --git a/common/persistence/workflow_state_status_validator_test.go b/common/persistence/workflow_state_status_validator_test.go index bfb49d0b441..eeaf285a8d0 100644 --- a/common/persistence/workflow_state_status_validator_test.go +++ b/common/persistence/workflow_state_status_validator_test.go @@ -55,7 +55,7 @@ func (s *workflowStateStatusSuite) TestCreateWorkflowStateStatus_WorkflowStateCr s.Error(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, enumspb.WORKFLOW_EXECUTION_STATUS_PAUSED)) for _, status := range statuses { - s.NotNil(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_CREATED, status)) + s.Error(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_CREATED, status)) } } @@ -72,7 +72,7 @@ func (s *workflowStateStatusSuite) TestCreateWorkflowStateStatus_WorkflowStateRu s.NoError(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING)) for _, status := range statuses { - s.NotNil(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, status)) + s.Error(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, status)) } } diff --git a/common/retrypolicy/retry_policy_test.go b/common/retrypolicy/retry_policy_test.go index 27ec1493f85..9ade5b95c0a 100644 --- a/common/retrypolicy/retry_policy_test.go +++ b/common/retrypolicy/retry_policy_test.go @@ -224,10 +224,10 @@ func TestValidateRetryPolicy(t *testing.T) { t.Run(tt.name, func(t *testing.T) { err := Validate(tt.input) if tt.wantErr { - assert.NotNil(t, err, "expected error - did not get one") - assert.Equal(t, err.Error(), tt.wantErrString, "unexpected error message") + assert.Error(t, err, "expected error - did not get one") + assert.Equal(t, tt.wantErrString, err.Error(), "unexpected error message") } else { - assert.Nil(t, err, "unexpected error") + assert.NoError(t, err, "unexpected error") } }) } diff --git a/common/rpc/context_test.go b/common/rpc/context_test.go index 1fd38ec8154..d17e0b73d80 100644 --- a/common/rpc/context_test.go +++ b/common/rpc/context_test.go @@ -59,8 +59,8 @@ func (s *contextSuite) TestCopyContextValue_DeadlineSeparated() { newContext = CopyContextValues(newContext, ctx) cancel() - s.NotNil(ctx.Err()) - s.Nil(newContext.Err()) + s.Error(ctx.Err()) + s.NoError(newContext.Err()) } func (s *contextSuite) TestCopyContextValue_ValueNotOverWritten() { diff --git a/common/rpc/dial_tracer_test.go b/common/rpc/dial_tracer_test.go index 60cc4890c75..568a297beef 100644 --- a/common/rpc/dial_tracer_test.go +++ b/common/rpc/dial_tracer_test.go @@ -32,7 +32,7 @@ func TestDialTracer_DialSuccess(t *testing.T) { assert.Positive(t, ndt.connectDuration) assert.Equal(t, addr, ndt.connectAddr) - assert.Nil(t, ndt.connectErr) + assert.NoError(t, ndt.connectErr) } func TestDialTracer_DialError(t *testing.T) { @@ -77,7 +77,7 @@ func TestDialTracer_NoConnectStart(t *testing.T) { assert.Zero(t, ndt.connectDuration) assert.Equal(t, addr, ndt.connectAddr) - assert.Nil(t, ndt.connectErr) + assert.NoError(t, ndt.connectErr) } // rewind moves a timestamp back by 1 millisecond to ensure positive durations in tests diff --git a/common/rpc/encryption/tls_config_test.go b/common/rpc/encryption/tls_config_test.go index feb2f6b5bd5..74fde7d19a1 100644 --- a/common/rpc/encryption/tls_config_test.go +++ b/common/rpc/encryption/tls_config_test.go @@ -108,11 +108,11 @@ func (s *tlsConfigTest) testGroupTLS(f func(*config.RootTLS, *config.GroupTLS)) func (s *tlsConfigTest) testCertFileAndData(cfg *config.RootTLS, group *config.GroupTLS) { group.Server = config.ServerTLS{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{CertFile: "foo"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{CertData: "bar"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{CertFile: "foo", CertData: "bar"} s.Error(validateRootTLS(cfg)) } @@ -120,11 +120,11 @@ func (s *tlsConfigTest) testCertFileAndData(cfg *config.RootTLS, group *config.G func (s *tlsConfigTest) testKeyFileAndData(cfg *config.RootTLS, group *config.GroupTLS) { group.Server = config.ServerTLS{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{KeyFile: "foo"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{KeyData: "bar"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{KeyFile: "foo", KeyData: "bar"} s.Error(validateRootTLS(cfg)) } @@ -132,13 +132,13 @@ func (s *tlsConfigTest) testKeyFileAndData(cfg *config.RootTLS, group *config.Gr func (s *tlsConfigTest) testClientCAData(cfg *config.RootTLS, group *config.GroupTLS) { group.Server = config.ServerTLS{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAData: []string{}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAData: []string{"foo"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAData: []string{"foo", "bar"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAData: []string{"foo", " "}} s.Error(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAData: []string{""}} @@ -148,13 +148,13 @@ func (s *tlsConfigTest) testClientCAData(cfg *config.RootTLS, group *config.Grou func (s *tlsConfigTest) testClientCAFiles(cfg *config.RootTLS, group *config.GroupTLS) { group.Server = config.ServerTLS{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAFiles: []string{}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAFiles: []string{"foo"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAFiles: []string{"foo", "bar"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAFiles: []string{"foo", " "}} s.Error(validateRootTLS(cfg)) group.Server = config.ServerTLS{ClientCAFiles: []string{""}} @@ -164,13 +164,13 @@ func (s *tlsConfigTest) testClientCAFiles(cfg *config.RootTLS, group *config.Gro func (s *tlsConfigTest) testRootCAData(cfg *config.RootTLS, group *config.GroupTLS) { group.Client = config.ClientTLS{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAData: []string{}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAData: []string{"foo"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAData: []string{"foo", "bar"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAData: []string{"foo", " "}} s.Error(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAData: []string{""}} @@ -180,13 +180,13 @@ func (s *tlsConfigTest) testRootCAData(cfg *config.RootTLS, group *config.GroupT func (s *tlsConfigTest) testRootCAFiles(cfg *config.RootTLS, group *config.GroupTLS) { group.Client = config.ClientTLS{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAFiles: []string{}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAFiles: []string{"foo"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAFiles: []string{"foo", "bar"}} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAFiles: []string{"foo", " "}} s.Error(validateRootTLS(cfg)) group.Client = config.ClientTLS{RootCAFiles: []string{""}} @@ -196,28 +196,28 @@ func (s *tlsConfigTest) testRootCAFiles(cfg *config.RootTLS, group *config.Group func (s *tlsConfigTest) TestSystemWorkerTLSConfig() { cfg := &config.RootTLS{} cfg.SystemWorker = config.WorkerTLS{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) cfg.SystemWorker = config.WorkerTLS{CertFile: "foo"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) cfg.SystemWorker = config.WorkerTLS{CertData: "bar"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) cfg.SystemWorker = config.WorkerTLS{CertFile: "foo", CertData: "bar"} s.Error(validateRootTLS(cfg)) cfg.SystemWorker = config.WorkerTLS{KeyFile: "foo"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) cfg.SystemWorker = config.WorkerTLS{KeyData: "bar"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) cfg.SystemWorker = config.WorkerTLS{KeyFile: "foo", KeyData: "bar"} s.Error(validateRootTLS(cfg)) cfg.SystemWorker = config.WorkerTLS{Client: config.ClientTLS{}} client := &cfg.SystemWorker.Client client.RootCAData = []string{} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) client.RootCAData = []string{"foo"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) client.RootCAData = []string{"foo", "bar"} - s.Nil(validateRootTLS(cfg)) + s.NoError(validateRootTLS(cfg)) client.RootCAData = []string{"foo", " "} s.Error(validateRootTLS(cfg)) client.RootCAData = []string{""} diff --git a/common/rpc/interceptor/dc_redirection_policy_test.go b/common/rpc/interceptor/dc_redirection_policy_test.go index 9491d9f1685..41a43e9a43e 100644 --- a/common/rpc/interceptor/dc_redirection_policy_test.go +++ b/common/rpc/interceptor/dc_redirection_policy_test.go @@ -78,10 +78,10 @@ func (s *noopDCRedirectionPolicySuite) TestWithNamespaceRedirect() { } err := s.policy.WithNamespaceIDRedirect(context.Background(), namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), namespaceName, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) s.Equal(2, callCount) } @@ -135,10 +135,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestWithNamespaceRedirect } err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) s.Equal(2, callCount) } @@ -155,10 +155,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestWithNamespaceRedirect } err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) s.Equal(2, callCount) } @@ -175,10 +175,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestWithNamespaceRedirect } err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) s.Equal(2, callCount) } @@ -195,10 +195,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestWithNamespaceRedirect for apiName := range selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs { err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) } s.Equal(2*len(selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs), callCount) @@ -216,10 +216,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestGetTargetDataCenter_G for apiName := range selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs { err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) } s.Equal(2*len(selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs), callCount) @@ -237,10 +237,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestGetTargetDataCenter_G for apiName := range selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs { err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) } s.Equal(2*len(selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs), callCount) @@ -299,10 +299,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestGetTargetDataCenter_G api = api + "_notwhitelisted" } err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, api, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, api, nil, callFn) - s.Nil(err) + s.NoError(err) } s.Equal(tc.expectedCallCount, callCountByCluster) @@ -330,10 +330,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestGetTargetDataCenter_G for apiName := range selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs { err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) } s.Equal(2*len(selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs), currentClustercallCount) @@ -360,10 +360,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestGetTargetDataCenter_G for apiName := range selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs { err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) } s.Equal(2*len(selectedAPIsForwardingRedirectionPolicyWhitelistedAPIs), currentClustercallCount) @@ -391,10 +391,10 @@ func (s *selectedAPIsForwardingRedirectionPolicySuite) TestGetTargetDataCenter_G apiName := "NotExistRandomAPI" err := s.policy.WithNamespaceIDRedirect(context.Background(), s.namespaceID, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) err = s.policy.WithNamespaceRedirect(context.Background(), s.namespace, apiName, nil, callFn) - s.Nil(err) + s.NoError(err) s.Equal(2, currentClustercallCount) s.Equal(2, alternativeClustercallCount) diff --git a/common/rpc/interceptor/mask_internal_error_test.go b/common/rpc/interceptor/mask_internal_error_test.go index 6f0bfd47677..6a8b4d55219 100644 --- a/common/rpc/interceptor/mask_internal_error_test.go +++ b/common/rpc/interceptor/mask_internal_error_test.go @@ -48,7 +48,7 @@ func testMaskUnknownOrInternalErrors(t *testing.T, st *status.Status, expectRelp assert.Equal(t, expectedMessage, errorMessage.Error()) } else { if err == nil { - assert.Equal(t, errorMessage, nil) + assert.NoError(t, errorMessage) } else { assert.Equal(t, errorMessage.Error(), st.Message()) } diff --git a/common/rpc/interceptor/sdk_version_test.go b/common/rpc/interceptor/sdk_version_test.go index 25ed973100e..e8bacf6c0de 100644 --- a/common/rpc/interceptor/sdk_version_test.go +++ b/common/rpc/interceptor/sdk_version_test.go @@ -58,7 +58,7 @@ func TestSDKVersionRecorder(t *testing.T) { sort.SliceStable(info, func(i, j int) bool { return info[i].Name < info[j].Name }) - assert.Equal(t, 2, len(info)) + assert.Len(t, info, 2) assert.Equal(t, headers.ClientNameGoSDK, info[0].Name) assert.Equal(t, sdkVersion, info[0].Version) assert.Equal(t, headers.ClientNameTypeScriptSDK, info[1].Name) diff --git a/common/rpc/interceptor/stream_error_test.go b/common/rpc/interceptor/stream_error_test.go index 718265a4d30..8ad5bbe61a4 100644 --- a/common/rpc/interceptor/stream_error_test.go +++ b/common/rpc/interceptor/stream_error_test.go @@ -37,10 +37,10 @@ func (s *streamErrorSuite) TearDownTest() { } func (s *streamErrorSuite) TestErrorConversion() { - s.Equal(nil, errorConvert(nil)) + s.NoError(errorConvert(nil)) s.Equal(io.EOF, errorConvert(io.EOF)) - s.IsType(nil, errorConvert(status.Error(codes.OK, ""))) + s.NoError(errorConvert(status.Error(codes.OK, ""))) s.IsType(&serviceerror.DeadlineExceeded{}, errorConvert(status.Error(codes.DeadlineExceeded, ""))) s.IsType(&serviceerror.Canceled{}, errorConvert(status.Error(codes.Canceled, ""))) s.IsType(&serviceerror.InvalidArgument{}, errorConvert(status.Error(codes.InvalidArgument, ""))) diff --git a/common/rpc/test/rpc_common_test.go b/common/rpc/test/rpc_common_test.go index 6ae5f479629..b8af377cfa1 100644 --- a/common/rpc/test/rpc_common_test.go +++ b/common/rpc/test/rpc_common_test.go @@ -170,7 +170,7 @@ func dialTestServiceAndGetTLSInfo( if err == nil { s.NotNil(reply) - s.True(strings.Contains(reply.Message, request.Name)) + s.Contains(reply.Message, request.Name) } _ = clientConn.Close() diff --git a/common/rpc/test/rpc_localstore_tls_test.go b/common/rpc/test/rpc_localstore_tls_test.go index ca1245a7db7..360da89d602 100644 --- a/common/rpc/test/rpc_localstore_tls_test.go +++ b/common/rpc/test/rpc_localstore_tls_test.go @@ -563,7 +563,7 @@ func (s *localStoreRPCSuite) testCertExpiration(factory *TestFactory, timeWindow s.NotNil(expiring) s.Empty(expired) s.NoError(err) - s.Equal(nExpiring, len(expiring)) + s.Len(expiring, nExpiring) } func (s *localStoreRPCSuite) testDynamicRootCA(host string, frontend bool) { diff --git a/common/searchattribute/manager_test.go b/common/searchattribute/manager_test.go index 3d2df087526..203b109ae81 100644 --- a/common/searchattribute/manager_test.go +++ b/common/searchattribute/manager_test.go @@ -131,7 +131,7 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_Error() { s.logger.Expect(testlogger.Error, "failed to refresh search attributes") searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.Error(err) - s.Len(searchAttributes.Custom(), 0) + s.Empty(searchAttributes.Custom()) } func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_NotFoundError() { @@ -140,12 +140,12 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_NotFoundErro s.mockClusterMetadataManager.EXPECT().GetCurrentClusterMetadata(gomock.Any()).Return(nil, serviceerror.NewNotFound("not found")) searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Len(searchAttributes.Custom(), 0) + s.Empty(searchAttributes.Custom()) // GetClusterMetadata() shouldn't be called, because results are cached. searchAttributes, err = s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Len(searchAttributes.Custom(), 0) + s.Empty(searchAttributes.Custom()) } func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_UnavailableError() { @@ -156,7 +156,7 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_UnavailableE s.logger.Expect(testlogger.Error, "failed to refresh search attributes") searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.Error(err) - s.Len(searchAttributes.Custom(), 0) + s.Empty(searchAttributes.Custom()) // Move time forward s.timeSource.Update(time.Date(2020, 8, 22, 1, 1, 0, 0, time.UTC)) @@ -231,13 +231,13 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_RefreshIfAbs searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Len(searchAttributes.Custom(), 0) + s.Empty(searchAttributes.Custom()) s.timeSource.Update(time.Date(2020, 8, 22, 1, 0, 1, 0, time.UTC)) searchAttributes, err = s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Len(searchAttributes.Custom(), 0) + s.Empty(searchAttributes.Custom()) s.forceCacheRefresh = true searchAttributes, err = s.manager.GetSearchAttributes("index-name", false) diff --git a/common/searchattribute/sadefs/encode_value_test.go b/common/searchattribute/sadefs/encode_value_test.go index e4b7a53786d..cdae137a127 100644 --- a/common/searchattribute/sadefs/encode_value_test.go +++ b/common/searchattribute/sadefs/encode_value_test.go @@ -402,7 +402,7 @@ func Test_ValidateStrings(t *testing.T) { assert.Contains(t, err.Error(), "is not a valid UTF-8 string") value, err := validateStrings("anything here", nil) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "anything here", value) _, err = validateStrings([]string{"abc", "\x87\x01"}, nil) diff --git a/common/searchattribute/stringify_test.go b/common/searchattribute/stringify_test.go index e4ac2b5f2ec..02399da5f09 100644 --- a/common/searchattribute/stringify_test.go +++ b/common/searchattribute/stringify_test.go @@ -405,7 +405,7 @@ func (s *StringifySuite) Test_parseJSONArray() { } for _, testCase := range testCases2 { res, err := parseJSONArray(testCase.input, testCase.indexedValueType) - s.NotNil(err) + s.Error(err) s.Nil(res) } } diff --git a/common/searchattribute/validator_test.go b/common/searchattribute/validator_test.go index 2ccbc9cb0dc..9e6c3745bf8 100644 --- a/common/searchattribute/validator_test.go +++ b/common/searchattribute/validator_test.go @@ -210,7 +210,7 @@ func (s *searchAttributesValidatorSuite) TestSearchAttributesValidate_Mapper() { var attr *commonpb.SearchAttributes err := saValidator.Validate(attr, namespace) - s.Nil(err) + s.NoError(err) intPayload, err := payload.Encode(1) s.NoError(err) diff --git a/common/serviceerror/service_error_with_dpanic_test.go b/common/serviceerror/service_error_with_dpanic_test.go index 473aa8c398b..8d4a7bb29d3 100644 --- a/common/serviceerror/service_error_with_dpanic_test.go +++ b/common/serviceerror/service_error_with_dpanic_test.go @@ -31,7 +31,7 @@ func (s *serviceErrorWithDPanicSuite) TestNewDPanicInProd() { s.NotNil(logger) err := NewInternalErrorWithDPanic(logger, "Must not panic!") - s.NotNil(err) + s.Error(err) _, ok := err.(*serviceerror.Internal) s.True(ok) } @@ -47,6 +47,6 @@ func (s *serviceErrorWithDPanicSuite) TestNewDPanicInDev() { s.Panics(nil, func() { err := NewInternalErrorWithDPanic(logger, "Must panic!") - s.Nil(err) + s.NoError(err) }) } diff --git a/common/stream_batcher/batcher_test.go b/common/stream_batcher/batcher_test.go index 021673c3823..9051c070037 100644 --- a/common/stream_batcher/batcher_test.go +++ b/common/stream_batcher/batcher_test.go @@ -267,7 +267,7 @@ func TestStreamBatcher_AddTimeout(t *testing.T) { defer cancel() r, err := sb.Add(ctx, 123) assert.NoError(t, err) - assert.Equal(t, r, 123) + assert.Equal(t, 123, r) }) time.Sleep(time.Millisecond) // wait for it to block in Add clk.AdvanceNext() diff --git a/common/tasks/group_by_scheduler_test.go b/common/tasks/group_by_scheduler_test.go index 84f5dece2fb..7932173ce9e 100644 --- a/common/tasks/group_by_scheduler_test.go +++ b/common/tasks/group_by_scheduler_test.go @@ -71,10 +71,10 @@ func TestSchedulerLogic(t *testing.T) { task4b.EXPECT().Abort().Times(1) require.True(t, sched.TrySubmit(task4b)) - require.Equal(t, 2, len(scheds)) - require.Equal(t, 1, len(scheds["a"].buffer)) + require.Len(t, scheds, 2) + require.Len(t, scheds["a"].buffer, 1) require.Equal(t, "a", scheds["a"].buffer[0].(RunnableTask).Task.(taskWithID).ID) - require.Equal(t, 1, len(scheds["b"].buffer)) + require.Len(t, scheds["b"].buffer, 1) require.Equal(t, "b", scheds["b"].buffer[0].(RunnableTask).Task.(taskWithID).ID) // Stop shuts down all groups. require.True(t, scheds["a"].stopped && scheds["b"].stopped) diff --git a/common/telemetry/config_test.go b/common/telemetry/config_test.go index 8254f49ed4e..13ec80f688d 100644 --- a/common/telemetry/config_test.go +++ b/common/telemetry/config_test.go @@ -58,7 +58,7 @@ func TestEmptyConfig(t *testing.T) { cfg := telemetry.ExportConfig{} exporters, err := cfg.SpanExporters() require.NoError(t, err) - require.Len(t, exporters, 0) + require.Empty(t, exporters) } func TestExportersWithSharedConn(t *testing.T) { @@ -85,18 +85,18 @@ func TestSharedConn(t *testing.T) { require.Len(t, cfg.Exporters, 2) exp := cfg.Exporters[0] - require.Equal(t, exp.Kind.Signal, "traces") - require.Equal(t, exp.Kind.Model, "otlp") - require.Equal(t, exp.Kind.Protocol, "grpc") + require.Equal(t, "traces", exp.Kind.Signal) + require.Equal(t, "otlp", exp.Kind.Model) + require.Equal(t, "grpc", exp.Kind.Protocol) require.NotNil(t, exp.Spec) sspec, ok := exp.Spec.(*telemetry.OTLPGRPCSpanExporter) require.True(t, ok) require.Equal(t, "conn1", sspec.ConnectionName) exp = cfg.Exporters[1] - require.Equal(t, exp.Kind.Signal, "metrics") - require.Equal(t, exp.Kind.Model, "otlp") - require.Equal(t, exp.Kind.Protocol, "grpc") + require.Equal(t, "metrics", exp.Kind.Signal) + require.Equal(t, "otlp", exp.Kind.Model) + require.Equal(t, "grpc", exp.Kind.Protocol) require.NotNil(t, exp.Spec) mspec, ok := exp.Spec.(*telemetry.OTLPGRPCMetricExporter) require.True(t, ok) @@ -107,13 +107,13 @@ func TestOTLPTraceGRPC(t *testing.T) { cfg := telemetry.PrivateExportConfig{} err := yaml.Unmarshal([]byte(basicOTLPTraceOnlyConfig), &cfg) require.NoError(t, err) - require.Len(t, cfg.Connections, 0) + require.Empty(t, cfg.Connections) require.Len(t, cfg.Exporters, 1) exp := cfg.Exporters[0] - require.Equal(t, exp.Kind.Signal, "traces") - require.Equal(t, exp.Kind.Model, "otlp") - require.Equal(t, exp.Kind.Protocol, "grpc") + require.Equal(t, "traces", exp.Kind.Signal) + require.Equal(t, "otlp", exp.Kind.Model) + require.Equal(t, "grpc", exp.Kind.Protocol) require.NotNil(t, exp.Spec) spec, ok := exp.Spec.(*telemetry.OTLPGRPCSpanExporter) diff --git a/common/telemetry/grpc_test.go b/common/telemetry/grpc_test.go index 1163fdd2aa9..b85f68a093e 100644 --- a/common/telemetry/grpc_test.go +++ b/common/telemetry/grpc_test.go @@ -76,7 +76,7 @@ func Test_ServerStatsHandler(t *testing.T) { spanAttrsByKey := makeRequest(nil) - require.Equal(t, + require.JSONEq(t, `{"workflowExecution":{"workflowId":"WF-ID","runId":"RUN-ID"}}`, toStr(t, spanAttrsByKey["rpc.request.payload"].Value)) require.Equal(t, "{}", spanAttrsByKey["rpc.response.payload"].Value.AsString()) @@ -88,7 +88,7 @@ func Test_ServerStatsHandler(t *testing.T) { spanAttrsByKey := makeRequest(status.Errorf(codes.Internal, "Something went wrong")) - require.Equal(t, + require.JSONEq(t, `{"code":13,"message":"Something went wrong"}`, toStr(t, spanAttrsByKey["rpc.response.error"].Value)) }) diff --git a/common/testing/historyrequire/history_require.go b/common/testing/historyrequire/history_require.go index 35365a66dbf..82a44852821 100644 --- a/common/testing/historyrequire/history_require.go +++ b/common/testing/historyrequire/history_require.go @@ -90,7 +90,7 @@ func (h HistoryRequire) EqualHistoryEvents(expectedHistory string, actualHistory expectedHistoryEvents, expectedEventsAttributes := h.parseHistory(expectedHistory) - require.Equalf(h.t, len(expectedHistoryEvents), len(actualHistoryEvents), + require.Lenf(h.t, actualHistoryEvents, len(expectedHistoryEvents), "Length of expected(%d) and actual(%d) histories is not equal - actual history: \n%v", len(expectedHistoryEvents), len(actualHistoryEvents), h.formatHistoryEvents(actualHistoryEvents, true)) @@ -151,7 +151,7 @@ func (h HistoryRequire) WaitForHistoryEvents(expectedHistory string, actualHisto var actualHistoryEvents []*historypb.HistoryEvent require.EventuallyWithT(h.t, func(t *assert.CollectT) { actualHistoryEvents = actualHistoryEventsReader() - require.Equalf(t, len(expectedHistoryEvents), len(actualHistoryEvents), + require.Lenf(t, actualHistoryEvents, len(expectedHistoryEvents), "Length of expected(%d) and actual(%d) histories is not equal - actual history: \n%v", len(expectedHistoryEvents), len(actualHistoryEvents), h.formatHistoryEvents(actualHistoryEvents, true)) }, waitFor, tick) @@ -293,7 +293,7 @@ func (h HistoryRequire) containsHistoryEvents( actualCompactHistory := h.formatHistoryEvents(actualHistoryEvents, true) startPos := strings.Index(actualCompactHistory, expectedCompactHistory) - require.True(h.t, startPos >= 0, "Expected history is not found in actual history. Expected:\n%s\nActual:\n%s", expectedCompactHistory, actualCompactHistory) + require.GreaterOrEqual(h.t, startPos, 0, "Expected history is not found in actual history. Expected:\n%s\nActual:\n%s", expectedCompactHistory, actualCompactHistory) actualHistoryEventsFirstIndex := strings.Count(actualCompactHistory[:startPos], "\n") h.equalHistoryEventsAttributes(expectedEventsAttributes, actualHistoryEvents[actualHistoryEventsFirstIndex:]) diff --git a/common/util/strings_test.go b/common/util/strings_test.go index b7d90442cb4..87f18797825 100644 --- a/common/util/strings_test.go +++ b/common/util/strings_test.go @@ -8,7 +8,7 @@ import ( func TestTruncateUTF8(t *testing.T) { s := "hello \u2603!!!" - assert.Equal(t, 12, len(s)) + assert.Len(t, s, 12) assert.Equal(t, "hello \u2603!!!", TruncateUTF8(s, 20)) assert.Equal(t, "hello \u2603!!!", TruncateUTF8(s, 12)) assert.Equal(t, "hello \u2603!!", TruncateUTF8(s, 11)) @@ -18,6 +18,6 @@ func TestTruncateUTF8(t *testing.T) { assert.Equal(t, "hello ", TruncateUTF8(s, 7)) assert.Equal(t, "hello ", TruncateUTF8(s, 6)) assert.Equal(t, "hello", TruncateUTF8(s, 5)) - assert.Equal(t, "", TruncateUTF8(s, 0)) - assert.Equal(t, "", TruncateUTF8(s, -3)) + assert.Empty(t, TruncateUTF8(s, 0)) + assert.Empty(t, TruncateUTF8(s, -3)) } diff --git a/common/util/util_test.go b/common/util/util_test.go index 8e2ff68f63b..0df2b134727 100644 --- a/common/util/util_test.go +++ b/common/util/util_test.go @@ -14,17 +14,17 @@ func TestRepeatSlice(t *testing.T) { t.Run("when input slice is empty should return empty", func(t *testing.T) { empty := []int{} got := RepeatSlice(empty, 5) - require.Len(t, got, 0, "RepeatSlice filled empty slice") + require.Empty(t, got, "RepeatSlice filled empty slice") }) t.Run("when requested repeat number equal 0 should return empty slice", func(t *testing.T) { xs := []int{1, 2, 3, 4, 5} got := RepeatSlice(xs, 0) - require.Len(t, got, 0, "RepeatSlice with repeat count 0 returned non-empty slice") + require.Empty(t, got, "RepeatSlice with repeat count 0 returned non-empty slice") }) t.Run("when requested repeat number is less than 0 should return empty slice", func(t *testing.T) { xs := []int{1, 2, 3, 4, 5} got := RepeatSlice(xs, -1) - require.Len(t, got, 0, "RepeatSlice with repeat count -1 returned non-empty slice") + require.Empty(t, got, "RepeatSlice with repeat count -1 returned non-empty slice") }) t.Run("when requested repeat number is 3 should return slice three times the input", func(t *testing.T) { xs := []int{1, 2, 3, 4, 5} @@ -147,7 +147,7 @@ func TestMapSlice(t *testing.T) { xs := []int{} var ys []uint32 ys = MapSlice(xs, func(x int) uint32 { return uint32(x) }) - require.Len(t, ys, 0, "mapping over empty slice produced non empty slice got %v", ys) + require.Empty(t, ys, "mapping over empty slice produced non empty slice got %v", ys) }) t.Run("when given a slice and a function should apply function to every element of the original slice", func(t *testing.T) { xs := []int{1, 2, 3, 4, 5} diff --git a/common/worker_versioning/worker_versioning_test.go b/common/worker_versioning/worker_versioning_test.go index dc47f3223b8..7197e9fe901 100644 --- a/common/worker_versioning/worker_versioning_test.go +++ b/common/worker_versioning/worker_versioning_test.go @@ -1009,10 +1009,10 @@ func TestWorkerDeploymentVersionFromStringV32(t *testing.T) { t.Run(tt.name, func(t *testing.T) { result, err := WorkerDeploymentVersionFromStringV32(tt.input) if tt.expectedErr != "" { - assert.NotNil(t, err) + assert.Error(t, err) assert.EqualError(t, err, tt.expectedErr) } else { - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, tt.expected, result) } }) diff --git a/schema/embed_test.go b/schema/embed_test.go index 6f07a6345bf..ae7ac7eee9a 100644 --- a/schema/embed_test.go +++ b/schema/embed_test.go @@ -34,7 +34,7 @@ func TestElasticsearchIndexTemplateIsLatest(t *testing.T) { symlinkPath := "elasticsearch/visibility/index_template_v7.json" symlinkInfo, err := os.Lstat(symlinkPath) require.NoError(t, err, "Failed to get symlink info") - require.True(t, symlinkInfo.Mode()&os.ModeSymlink != 0, "File is not a symlink") + require.NotEqual(t, symlinkInfo.Mode()&os.ModeSymlink, 0, "File is not a symlink") targetPath, err := os.Readlink(symlinkPath) require.NoError(t, err, "Failed to read symlink target") diff --git a/service/frontend/admin_handler_test.go b/service/frontend/admin_handler_test.go index 27bef7d9510..2344fca5627 100644 --- a/service/frontend/admin_handler_test.go +++ b/service/frontend/admin_handler_test.go @@ -1066,9 +1066,9 @@ func (s *adminHandlerSuite) Test_DescribeCluster_CurrentCluster_Success() { s.NoError(err) s.Equal(resp.GetClusterName(), clusterName) s.Equal(resp.GetClusterId(), clusterID) - s.Equal(resp.GetHistoryShardCount(), int32(0)) - s.Equal(resp.GetFailoverVersionIncrement(), int64(0)) - s.Equal(resp.GetInitialFailoverVersion(), int64(0)) + s.Equal(int32(0), resp.GetHistoryShardCount()) + s.Equal(int64(0), resp.GetFailoverVersionIncrement()) + s.Equal(int64(0), resp.GetInitialFailoverVersion()) s.True(resp.GetIsGlobalNamespaceEnabled()) } @@ -1104,9 +1104,9 @@ func (s *adminHandlerSuite) Test_DescribeCluster_NonCurrentCluster_Success() { s.NoError(err) s.Equal(resp.GetClusterName(), clusterName) s.Equal(resp.GetClusterId(), clusterID) - s.Equal(resp.GetHistoryShardCount(), int32(0)) - s.Equal(resp.GetFailoverVersionIncrement(), int64(0)) - s.Equal(resp.GetInitialFailoverVersion(), int64(0)) + s.Equal(int32(0), resp.GetHistoryShardCount()) + s.Equal(int64(0), resp.GetFailoverVersionIncrement()) + s.Equal(int64(0), resp.GetInitialFailoverVersion()) s.True(resp.GetIsGlobalNamespaceEnabled()) } @@ -1127,8 +1127,8 @@ func (s *adminHandlerSuite) Test_ListClusters_Success() { PageSize: pageSize, }) s.NoError(err) - s.Equal(1, len(resp.Clusters)) - s.Equal(0, len(resp.GetNextPageToken())) + s.Len(resp.Clusters, 1) + s.Empty(resp.GetNextPageToken()) } func (s *adminHandlerSuite) TestStreamWorkflowReplicationMessages_ClientToServerBroken() { @@ -1614,7 +1614,7 @@ func (s *adminHandlerSuite) TestDescribeDLQJob() { } s.NoError(err) s.NotNil(response) - s.EqualValues(tc.expectedResponse, *response) + s.Equal(tc.expectedResponse, *response) }) } } @@ -1969,7 +1969,7 @@ func (s *adminHandlerSuite) TestDescribeTaskQueuePartition() { }) s.NoError(err) s.NotNil(resp) - s.Equal(2, len(resp.VersionsInfoInternal)) + s.Len(resp.VersionsInfoInternal, 2) s.validatePhysicalTaskQueueInfo(unversionedPhysicalTaskQueueInfo, resp.VersionsInfoInternal[unversioned].GetPhysicalTaskQueueInfo()) s.validatePhysicalTaskQueueInfo(versionedPhysicalTaskQueueInfo, resp.VersionsInfoInternal[buildID].GetPhysicalTaskQueueInfo()) diff --git a/service/frontend/configs/quotas_test.go b/service/frontend/configs/quotas_test.go index 60d697b1271..5ce6dfb232d 100644 --- a/service/frontend/configs/quotas_test.go +++ b/service/frontend/configs/quotas_test.go @@ -69,19 +69,19 @@ func (s *quotasSuite) TestNamespaceReplicationInducingAPIToPriorityMapping() { func (s *quotasSuite) TestExecutionAPIPrioritiesOrdered() { for idx := range ExecutionAPIPrioritiesOrdered[1:] { - s.True(ExecutionAPIPrioritiesOrdered[idx] < ExecutionAPIPrioritiesOrdered[idx+1]) + s.Less(ExecutionAPIPrioritiesOrdered[idx], ExecutionAPIPrioritiesOrdered[idx+1]) } } func (s *quotasSuite) TestVisibilityAPIPrioritiesOrdered() { for idx := range VisibilityAPIPrioritiesOrdered[1:] { - s.True(VisibilityAPIPrioritiesOrdered[idx] < VisibilityAPIPrioritiesOrdered[idx+1]) + s.Less(VisibilityAPIPrioritiesOrdered[idx], VisibilityAPIPrioritiesOrdered[idx+1]) } } func (s *quotasSuite) TestNamespaceReplicationInducingAPIPrioritiesOrdered() { for idx := range NamespaceReplicationInducingAPIPrioritiesOrdered[1:] { - s.True(NamespaceReplicationInducingAPIPrioritiesOrdered[idx] < NamespaceReplicationInducingAPIPrioritiesOrdered[idx+1]) + s.Less(NamespaceReplicationInducingAPIPrioritiesOrdered[idx], NamespaceReplicationInducingAPIPrioritiesOrdered[idx+1]) } } diff --git a/service/frontend/namespace_handler_test.go b/service/frontend/namespace_handler_test.go index c245c858fd6..8def8e9eb36 100644 --- a/service/frontend/namespace_handler_test.go +++ b/service/frontend/namespace_handler_test.go @@ -112,7 +112,7 @@ func (s *namespaceHandlerCommonSuite) TestMergeNamespaceData_Overriding() { }, ) - assert.Equal(s.T(), map[string]string{ + s.Equal(map[string]string{ "k0": "v2", }, out) } @@ -127,7 +127,7 @@ func (s *namespaceHandlerCommonSuite) TestMergeNamespaceData_Adding() { }, ) - assert.Equal(s.T(), map[string]string{ + s.Equal(map[string]string{ "k0": "v0", "k1": "v2", }, out) @@ -144,7 +144,7 @@ func (s *namespaceHandlerCommonSuite) TestMergeNamespaceData_Merging() { }, ) - assert.Equal(s.T(), map[string]string{ + s.Equal(map[string]string{ "k0": "v1", "k1": "v2", }, out) @@ -159,7 +159,7 @@ func (s *namespaceHandlerCommonSuite) TestMergeNamespaceData_Nil() { }, ) - assert.Equal(s.T(), map[string]string{ + s.Equal(map[string]string{ "k0": "v1", "k1": "v2", }, out) @@ -199,7 +199,7 @@ func (s *namespaceHandlerCommonSuite) TestMergeBadBinaries_Adding() { "k1": {Reason: "reason2", CreateTime: timestamppb.New(now)}, }, } - assert.Equal(s.T(), out.String(), expected.String()) + s.Equal(out.String(), expected.String()) } func (s *namespaceHandlerCommonSuite) TestMergeBadBinaries_Merging() { @@ -331,7 +331,7 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() { }) s.NoError(err) token = resp.NextPageToken - s.True(len(resp.Namespaces) <= int(pagesize)) + s.LessOrEqual(len(resp.Namespaces), int(pagesize)) if len(resp.Namespaces) > 0 { namespaces[resp.Namespaces[0].NamespaceInfo.GetName()] = resp.Namespaces[0] } @@ -1004,7 +1004,7 @@ func (s *namespaceHandlerCommonSuite) TestRegisterLocalNamespace_AllDefault() { s.NotEmpty(request.Namespace.GetInfo().GetId()) s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, request.Namespace.Info.GetState()) s.Equal(namespace, request.Namespace.GetInfo().GetName()) - s.Equal(false, request.IsGlobalNamespace) + s.False(request.IsGlobalNamespace) s.Equal(retention, request.Namespace.GetConfig().GetRetention()) s.Equal(cluster.TestCurrentClusterName, request.Namespace.GetReplicationConfig().ActiveClusterName) s.Equal([]string{cluster.TestCurrentClusterName}, request.Namespace.GetReplicationConfig().GetClusters()) @@ -1054,7 +1054,7 @@ func (s *namespaceHandlerCommonSuite) TestRegisterLocalNamespace_NoDefault() { s.Equal(description, request.Namespace.GetInfo().GetDescription()) s.Equal(email, request.Namespace.GetInfo().GetOwner()) s.Equal(data, request.Namespace.GetInfo().GetData()) - s.Equal(false, request.IsGlobalNamespace) + s.False(request.IsGlobalNamespace) s.Equal(retention, request.Namespace.GetConfig().GetRetention()) s.Equal(activeClusterName, request.Namespace.GetReplicationConfig().ActiveClusterName) s.Equal([]string{activeClusterName}, request.Namespace.GetReplicationConfig().GetClusters()) @@ -1231,7 +1231,7 @@ func (s *namespaceHandlerCommonSuite) TestRegisterGlobalNamespace_AllDefault() { s.NotEmpty(request.Namespace.GetInfo().GetId()) s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, request.Namespace.Info.GetState()) s.Equal(namespace, request.Namespace.GetInfo().GetName()) - s.Equal(true, request.IsGlobalNamespace) + s.True(request.IsGlobalNamespace) s.Equal(retention, request.Namespace.GetConfig().GetRetention()) s.Equal(cluster.TestCurrentClusterName, request.Namespace.GetReplicationConfig().ActiveClusterName) s.Equal([]string{cluster.TestCurrentClusterName}, request.Namespace.GetReplicationConfig().GetClusters()) @@ -1285,7 +1285,7 @@ func (s *namespaceHandlerCommonSuite) TestRegisterGlobalNamespace_NoDefault() { s.NotEmpty(request.Namespace.GetInfo().GetId()) s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, request.Namespace.Info.GetState()) s.Equal(namespace, request.Namespace.GetInfo().GetName()) - s.Equal(true, request.IsGlobalNamespace) + s.True(request.IsGlobalNamespace) s.Equal(retention, request.Namespace.GetConfig().GetRetention()) s.Equal(cluster.TestCurrentClusterName, request.Namespace.GetReplicationConfig().ActiveClusterName) s.Equal([]string{cluster.TestCurrentClusterName, cluster.TestAlternativeClusterName}, request.Namespace.GetReplicationConfig().GetClusters()) @@ -1457,7 +1457,7 @@ func (s *namespaceHandlerCommonSuite) TestRegisterLocalNamespace_NotMaster() { s.NotEmpty(request.Namespace.GetInfo().GetId()) s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, request.Namespace.Info.GetState()) s.Equal(namespace, request.Namespace.GetInfo().GetName()) - s.Equal(false, request.IsGlobalNamespace) + s.False(request.IsGlobalNamespace) s.Equal(retention, request.Namespace.GetConfig().GetRetention()) s.Equal(cluster.TestCurrentClusterName, request.Namespace.GetReplicationConfig().ActiveClusterName) s.Equal([]string{cluster.TestCurrentClusterName}, request.Namespace.GetReplicationConfig().GetClusters()) @@ -1910,14 +1910,14 @@ func (s *namespaceHandlerCommonSuite) TestListWorkflowRules() { rules, err := s.handler.ListWorkflowRules(context.Background(), namespaceName) s.NoError(err) s.NotNil(rules) - s.Equal(2, len(rules)) + s.Len(rules, 2) // config is nil nsConfig.WorkflowRules = nil rules, err = s.handler.ListWorkflowRules(context.Background(), namespaceName) s.NoError(err) s.NotNil(rules) - s.Equal(0, len(rules)) + s.Empty(rules) } func (s *namespaceHandlerCommonSuite) TestWorkflowRuleEviction() { @@ -1955,7 +1955,7 @@ func (s *namespaceHandlerCommonSuite) TestWorkflowRuleEviction() { oldLens := len(tt.rules) s.handler.removeOldestExpiredWorkflowRule("", tt.rules) if len(tt.deletedRule) == 0 { - s.Equal(oldLens, len(tt.rules)) + s.Len(tt.rules, oldLens) } else { if _, exists := tt.rules[tt.deletedRule]; exists { s.True(false, "Rule was not deleted") diff --git a/service/frontend/nexus_handler_test.go b/service/frontend/nexus_handler_test.go index d27c363fab5..0f4d13565c0 100644 --- a/service/frontend/nexus_handler_test.go +++ b/service/frontend/nexus_handler_test.go @@ -201,7 +201,7 @@ func TestNexusInterceptRequest_InvalidNamespaceState_ResultsInBadRequest(t *test oc.metricsHandler.Counter("test").Record(1) mh.StopCapture(capture) snap := capture.Snapshot() - require.Equal(t, 1, len(snap["test"])) + require.Len(t, snap["test"], 1) require.Equal(t, map[string]string{"outcome": "invalid_namespace_state"}, snap["test"][0].Tags) } @@ -225,7 +225,7 @@ func TestNexusInterceptRequest_NamespaceConcurrencyLimited_ResultsInResourceExha oc.metricsHandler.Counter("test").Record(1) mh.StopCapture(capture) snap := capture.Snapshot() - require.Equal(t, 1, len(snap["test"])) + require.Len(t, snap["test"], 1) require.Equal(t, map[string]string{"outcome": "namespace_concurrency_limited"}, snap["test"][0].Tags) } @@ -249,7 +249,7 @@ func TestNexusInterceptRequest_NamespaceRateLimited_ResultsInResourceExhausted(t oc.metricsHandler.Counter("test").Record(1) mh.StopCapture(capture) snap := capture.Snapshot() - require.Equal(t, 1, len(snap["test"])) + require.Len(t, snap["test"], 1) require.Equal(t, map[string]string{"outcome": "namespace_rate_limited"}, snap["test"][0].Tags) } @@ -273,7 +273,7 @@ func TestNexusInterceptRequest_GlobalRateLimited_ResultsInResourceExhausted(t *t oc.metricsHandler.Counter("test").Record(1) mh.StopCapture(capture) snap := capture.Snapshot() - require.Equal(t, 1, len(snap["test"])) + require.Len(t, snap["test"], 1) require.Equal(t, map[string]string{"outcome": "global_rate_limited"}, snap["test"][0].Tags) } @@ -298,7 +298,7 @@ func TestNexusInterceptRequest_ForwardingDisabled_ResultsInUnavailable(t *testin oc.metricsHandler.Counter("test").Record(1) mh.StopCapture(capture) snap := capture.Snapshot() - require.Equal(t, 1, len(snap["test"])) + require.Len(t, snap["test"], 1) require.Equal(t, map[string]string{"outcome": "namespace_inactive_forwarding_disabled"}, snap["test"][0].Tags) } @@ -322,7 +322,7 @@ func TestNexusInterceptRequest_ForwardingEnabled_ResultsInNotActiveError(t *test oc.metricsHandler.Counter("test").Record(1) mh.StopCapture(capture) snap := capture.Snapshot() - require.Equal(t, 1, len(snap["test"])) + require.Len(t, snap["test"], 1) require.Equal(t, map[string]string{"outcome": "request_forwarded"}, snap["test"][0].Tags) } @@ -349,7 +349,7 @@ func TestNexusInterceptRequest_InvalidSDKVersion_ResultsInBadRequest(t *testing. oc.metricsHandler.Counter("test").Record(1) mh.StopCapture(capture) snap := capture.Snapshot() - require.Equal(t, 1, len(snap["test"])) + require.Len(t, snap["test"], 1) require.Equal(t, map[string]string{"outcome": "unsupported_client"}, snap["test"][0].Tags) } diff --git a/service/frontend/workflow_handler_test.go b/service/frontend/workflow_handler_test.go index 8023a71aa61..346ddca294a 100644 --- a/service/frontend/workflow_handler_test.go +++ b/service/frontend/workflow_handler_test.go @@ -1670,9 +1670,9 @@ func (s *WorkflowHandlerSuite) TestDescribeNamespace_Success_ArchivalDisabled() s.NotNil(result) s.NotNil(result.Config) s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetHistoryArchivalState()) - s.Equal("", result.Config.GetHistoryArchivalUri()) + s.Empty(result.Config.GetHistoryArchivalUri()) s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetVisibilityArchivalState()) - s.Equal("", result.Config.GetVisibilityArchivalUri()) + s.Empty(result.Config.GetVisibilityArchivalUri()) } func (s *WorkflowHandlerSuite) TestDescribeNamespace_Success_ArchivalEnabled() { @@ -2916,7 +2916,7 @@ func (s *WorkflowHandlerSuite) TestStartBatchOperation_WorkflowExecutions_Reset_ var batchParams batchspb.BatchOperationInput err := payloads.Decode(request.StartRequest.Input, &batchParams) s.NoError(err) - s.Len(batchParams.Request.Operation.(*workflowservice.StartBatchOperationRequest_ResetOperation).ResetOperation.PostResetOperations, 0) + s.Empty(batchParams.Request.Operation.(*workflowservice.StartBatchOperationRequest_ResetOperation).ResetOperation.PostResetOperations) return &historyservice.StartWorkflowExecutionResponse{}, nil }, @@ -3040,7 +3040,7 @@ func (s *WorkflowHandlerSuite) TestStopBatchOperation() { ) (*historyservice.TerminateWorkflowExecutionResponse, error) { s.Equal(namespaceID.String(), request.NamespaceId) s.Equal(jobID, request.TerminateRequest.WorkflowExecution.GetWorkflowId()) - s.Equal("", request.TerminateRequest.WorkflowExecution.GetRunId()) + s.Empty(request.TerminateRequest.WorkflowExecution.GetRunId()) return &historyservice.TerminateWorkflowExecutionResponse{}, nil }, ) @@ -3228,9 +3228,9 @@ func (s *WorkflowHandlerSuite) TestDescribeBatchOperation_RunningStatus() { s.Equal(now, resp.GetCloseTime()) s.Equal(enumspb.BATCH_OPERATION_TYPE_TERMINATE, resp.GetOperationType()) s.Equal(enumspb.BATCH_OPERATION_STATE_RUNNING, resp.GetState()) - s.Assert().Equal(int64(5), resp.TotalOperationCount) - s.Assert().Equal(int64(3), resp.CompleteOperationCount) - s.Assert().Equal(int64(1), resp.FailureOperationCount) + s.Equal(int64(5), resp.TotalOperationCount) + s.Equal(int64(3), resp.CompleteOperationCount) + s.Equal(int64(1), resp.FailureOperationCount) } func (s *WorkflowHandlerSuite) TestDescribeBatchOperation_FailedStatus() { @@ -3338,7 +3338,7 @@ func (s *WorkflowHandlerSuite) TestListBatchOperations() { resp, err := wh.ListBatchOperations(context.Background(), request) s.NoError(err) - s.Equal(1, len(resp.OperationInfo)) + s.Len(resp.OperationInfo, 1) s.Equal(jobID, resp.OperationInfo[0].GetJobId()) s.Equal(now, resp.OperationInfo[0].GetStartTime()) s.Equal(now, resp.OperationInfo[0].GetCloseTime()) @@ -3887,7 +3887,7 @@ func TestContextNearDeadline(t *testing.T) { func TestValidateRequestId(t *testing.T) { req := workflowservice.StartWorkflowExecutionRequest{RequestId: ""} err := validateRequestId(&req.RequestId, 100) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, req.RequestId, 36) // new UUID length } @@ -4204,7 +4204,7 @@ func (s *WorkflowHandlerSuite) TestExecuteMultiOperation() { assertMultiOpsErr := func(expectedErrs []error, actual error) { s.Equal("Update-with-Start could not be executed.", actual.Error()) - s.EqualValues(expectedErrs, actual.(*serviceerror.MultiOperationExecution).OperationErrors()) + s.Equal(expectedErrs, actual.(*serviceerror.MultiOperationExecution).OperationErrors()) } s.Run("operation with different workflow ID as previous operation is invalid", func() { diff --git a/service/history/api/command_attr_validator_test.go b/service/history/api/command_attr_validator_test.go index 16871f735af..2c6d5af06ac 100644 --- a/service/history/api/command_attr_validator_test.go +++ b/service/history/api/command_attr_validator_test.go @@ -353,7 +353,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToLocal( s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.Nil(err) + s.NoError(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToEffectiveLocal_SameCluster() { @@ -376,7 +376,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToEffect s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.Nil(err) + s.NoError(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToEffectiveLocal_DiffCluster() { @@ -448,7 +448,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLoca s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.Nil(err) + s.NoError(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLocalToLocal_DiffCluster() { @@ -498,7 +498,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLoca s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.Nil(err) + s.NoError(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLocalToEffectiveLocal_DiffCluster() { @@ -655,7 +655,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_GlobalToGloba targetNamespaceID := s.testNamespaceID err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", targetNamespaceID, "test-target-workflow-id") - s.Nil(err) + s.NoError(err) } func (s *commandAttrValidatorSuite) TestValidateActivityRetryPolicy() { @@ -741,8 +741,8 @@ func (s *commandAttrValidatorSuite) TestValidateActivityRetryPolicy() { } err := s.validator.validateActivityRetryPolicy(s.testNamespaceID, attr.GetRetryPolicy()) - assert.Nil(s.T(), err, "expected no error") - assert.Equal(s.T(), tt.want, attr.RetryPolicy, "unexpected retry policy") + assert.NoError(s.T(), err, "expected no error") + s.Equal(tt.want, attr.RetryPolicy, "unexpected retry policy") }) } } diff --git a/service/history/api/getdlqtasks/getdlqtaskstest/apitest.go b/service/history/api/getdlqtasks/getdlqtaskstest/apitest.go index 0d8fb542d3b..5230edd1f1e 100644 --- a/service/history/api/getdlqtasks/getdlqtaskstest/apitest.go +++ b/service/history/api/getdlqtasks/getdlqtaskstest/apitest.go @@ -55,7 +55,7 @@ func TestInvoke(t *testing.T, manager persistence.HistoryTaskQueueManager) { }, ) require.NoError(t, err) - require.Equal(t, 1, len(res.DlqTasks)) + require.Len(t, res.DlqTasks, 1) assert.Equal(t, int64(persistence.FirstQueueMessageID), res.DlqTasks[0].Metadata.MessageId) assert.Equal(t, 1, int(res.DlqTasks[0].Payload.ShardId)) serializer := serialization.NewSerializer() diff --git a/service/history/api/pollupdate/api_test.go b/service/history/api/pollupdate/api_test.go index 55c37e01b64..e330333dbc0 100644 --- a/service/history/api/pollupdate/api_test.go +++ b/service/history/api/pollupdate/api_test.go @@ -190,7 +190,7 @@ func TestPollOutcome(t *testing.T) { } resp, err := pollupdate.Invoke(context.Background(), req, shardContext, wfcc) require.NoError(t, err) - require.True(t, len(resp.GetResponse().UpdateRef.GetWorkflowExecution().RunId) > 0) + require.Positive(t, len(resp.GetResponse().UpdateRef.GetWorkflowExecution().RunId)) require.Nil(t, resp.GetResponse().Outcome) require.Equal(t, enumspb.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ADMITTED, resp.Response.GetStage()) } diff --git a/service/history/api/respondactivitytaskfailed/api_test.go b/service/history/api/respondactivitytaskfailed/api_test.go index 6f5dea10047..8b889c15b45 100644 --- a/service/history/api/respondactivitytaskfailed/api_test.go +++ b/service/history/api/respondactivitytaskfailed/api_test.go @@ -166,7 +166,7 @@ func (s *workflowSuite) Test_WorkflowExecutionIsNotRunning_ReturnWorkflowNotRunn s.workflowConsistencyChecker, ) s.Error(err) - s.EqualValues(consts.ErrWorkflowCompleted, err) + s.Equal(consts.ErrWorkflowCompleted, err) } func (s *workflowSuite) Test_CacheRefreshRequired_ReturnCacheStaleError() { @@ -210,7 +210,7 @@ func (s *workflowSuite) Test_ActivityTaskDoesNotExist_ActivityNotRunning() { s.workflowConsistencyChecker, ) s.Error(err) - s.EqualValues(consts.ErrActivityTaskNotFound, err) + s.Equal(consts.ErrActivityTaskNotFound, err) } func (s *workflowSuite) Test_ActivityTaskDoesNotExist_TokenVersionDoesNotMatchActivityVersion() { @@ -232,7 +232,7 @@ func (s *workflowSuite) Test_ActivityTaskDoesNotExist_TokenVersionDoesNotMatchAc s.workflowConsistencyChecker, ) s.Error(err) - s.EqualValues(consts.ErrActivityTaskNotFound, err) + s.Equal(consts.ErrActivityTaskNotFound, err) } func (s *workflowSuite) Test_ActivityTaskDoesNotExist_TokenVersionNonZeroAndAttemptDoesNotMatchActivityAttempt() { @@ -255,7 +255,7 @@ func (s *workflowSuite) Test_ActivityTaskDoesNotExist_TokenVersionNonZeroAndAtte s.workflowConsistencyChecker, ) s.Error(err) - s.EqualValues(consts.ErrActivityTaskNotFound, err) + s.Equal(consts.ErrActivityTaskNotFound, err) } func (s *workflowSuite) Test_LastHeartBeatDetailsExist_UpdatesMutableState() { diff --git a/service/history/api/signalwithstartworkflow/signal_with_start_workflow_test.go b/service/history/api/signalwithstartworkflow/signal_with_start_workflow_test.go index 91b89a497f6..36a6309f24d 100644 --- a/service/history/api/signalwithstartworkflow/signal_with_start_workflow_test.go +++ b/service/history/api/signalwithstartworkflow/signal_with_start_workflow_test.go @@ -99,7 +99,7 @@ func (s *signalWithStartWorkflowSuite) TestSignalWorkflow_WorkflowCloseAttempted currentWorkflowLease, request, ) - s.Error(consts.ErrWorkflowClosing, err) + s.ErrorIs(consts.ErrWorkflowClosing, err) } func (s *signalWithStartWorkflowSuite) TestSignalWorkflow_Dedup() { diff --git a/service/history/api/signalworkflow/api_test.go b/service/history/api/signalworkflow/api_test.go index 9ec94a110fd..174d834e99b 100644 --- a/service/history/api/signalworkflow/api_test.go +++ b/service/history/api/signalworkflow/api_test.go @@ -119,5 +119,5 @@ func (s *signalWorkflowSuite) TestSignalWorkflow_WorkflowCloseAttempted() { s.workflowConsistencyChecker, ) s.Nil(resp) - s.Error(consts.ErrWorkflowClosing, err) + s.ErrorIs(consts.ErrWorkflowClosing, err) } diff --git a/service/history/archival_queue_task_executor_test.go b/service/history/archival_queue_task_executor_test.go index 416b417bb07..3afc2ab1ffd 100644 --- a/service/history/archival_queue_task_executor_test.go +++ b/service/history/archival_queue_task_executor_test.go @@ -530,7 +530,7 @@ func TestArchivalQueueTaskExecutor(t *testing.T) { assert.ErrorContains(t, err, s) } } else { - assert.Nil(t, err) + assert.NoError(t, err) } }) } diff --git a/service/history/configs/quotas_test.go b/service/history/configs/quotas_test.go index fec8d229af4..f6ad7f78c74 100644 --- a/service/history/configs/quotas_test.go +++ b/service/history/configs/quotas_test.go @@ -45,7 +45,7 @@ func (s *quotasSuite) TestCallerTypeToPriorityMapping() { func (s *quotasSuite) TestAPIPrioritiesOrdered() { for idx := range APIPrioritiesOrdered[1:] { - s.True(APIPrioritiesOrdered[idx] < APIPrioritiesOrdered[idx+1]) + s.Less(APIPrioritiesOrdered[idx], APIPrioritiesOrdered[idx+1]) } } diff --git a/service/history/events/cache_test.go b/service/history/events/cache_test.go index 95b0dbc58d7..9cc5638c45c 100644 --- a/service/history/events/cache_test.go +++ b/service/history/events/cache_test.go @@ -89,7 +89,7 @@ func (s *eventsCacheSuite) TestEventsCacheHitSuccess() { shardID, EventKey{namespaceID, workflowID, runID, eventID, common.EmptyVersion}, eventID, nil) - s.Nil(err) + s.NoError(err) s.Equal(event, actualEvent) } @@ -149,7 +149,7 @@ func (s *eventsCacheSuite) TestEventsCacheMissMultiEventsBatchV2Success() { shardID, EventKey{namespaceID, workflowID, runID, event6.GetEventId(), common.EmptyVersion}, event1.GetEventId(), []byte("store_token")) - s.Nil(err) + s.NoError(err) s.Equal(event6, actualEvent) } @@ -218,7 +218,7 @@ func (s *eventsCacheSuite) TestEventsCacheDisableSuccess() { shardID, EventKey{namespaceID, workflowID, runID, event2.GetEventId(), common.EmptyVersion}, event2.GetEventId(), []byte("store_token")) - s.Nil(err) + s.NoError(err) s.Equal(event2, actualEvent) } diff --git a/service/history/events/notifier_test.go b/service/history/events/notifier_test.go index 61ae3d2471d..f4418d94929 100644 --- a/service/history/events/notifier_test.go +++ b/service/history/events/notifier_test.go @@ -83,7 +83,7 @@ func (s *notifierSuite) TestSingleSubscriberWatchingEvents() { timerChan := time.NewTimer(time.Second * 2).C subscriberID, channel, err := s.notifier.WatchHistoryEvent(definition.NewWorkflowKey(namespaceID, execution.GetWorkflowId(), execution.GetRunId())) - s.Nil(err) + s.NoError(err) go func() { <-timerChan @@ -94,7 +94,7 @@ func (s *notifierSuite) TestSingleSubscriberWatchingEvents() { s.Equal(historyEvent, msg) err = s.notifier.UnwatchHistoryEvent(definition.NewWorkflowKey(namespaceID, execution.GetWorkflowId(), execution.GetRunId()), subscriberID) - s.Nil(err) + s.NoError(err) } func (s *notifierSuite) TestMultipleSubscriberWatchingEvents() { @@ -127,7 +127,7 @@ func (s *notifierSuite) TestMultipleSubscriberWatchingEvents() { watchFunc := func() { subscriberID, channel, err := s.notifier.WatchHistoryEvent(definition.NewWorkflowKey(namespaceID, execution.GetWorkflowId(), execution.GetRunId())) - s.Nil(err) + s.NoError(err) timeourChan := time.NewTimer(time.Second * 10).C @@ -138,7 +138,7 @@ func (s *notifierSuite) TestMultipleSubscriberWatchingEvents() { s.Fail("subscribe to new events timeout") } err = s.notifier.UnwatchHistoryEvent(definition.NewWorkflowKey(namespaceID, execution.GetWorkflowId(), execution.GetRunId()), subscriberID) - s.Nil(err) + s.NoError(err) waitGroup.Done() } diff --git a/service/history/handler_test.go b/service/history/handler_test.go index 9b8852d9b0d..22149954941 100644 --- a/service/history/handler_test.go +++ b/service/history/handler_test.go @@ -51,7 +51,7 @@ func TestDescribeHistoryHost(t *testing.T) { }) assert.Error(t, err) var sol *serviceerror.ShardOwnershipLost - assert.True(t, errors.As(err, &sol)) + assert.ErrorAs(t, err, &sol) mockShard2 := shard.NewTestContext( ctrl, diff --git a/service/history/history_engine2_test.go b/service/history/history_engine2_test.go index bbfdb2e98d6..568725e15cd 100644 --- a/service/history/history_engine2_test.go +++ b/service/history/history_engine2_test.go @@ -345,7 +345,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccessStickyEnabled() { expectedResponse.NextPageToken = nil response, err := s.historyEngine.RecordWorkflowTaskStarted(metrics.AddMetricsContext(context.Background()), &request) - s.Nil(err) + s.NoError(err) s.NotNil(response) s.True(response.StartedTime.AsTime().After(expectedResponse.ScheduledTime.AsTime())) expectedResponse.StartedTime = response.StartedTime @@ -455,7 +455,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccessStickyEnabled_WithInt expectedResponse.NextPageToken = nil response, err := s.historyEngine.RecordWorkflowTaskStarted(metrics.AddMetricsContext(context.Background()), &request) - s.Nil(err) + s.NoError(err) s.NotNil(response) s.True(response.StartedTime.AsTime().After(expectedResponse.ScheduledTime.AsTime())) expectedResponse.StartedTime = response.StartedTime @@ -487,7 +487,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfNoExecution() { }, }) s.Nil(response) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -564,7 +564,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfGetExecutionFailed() { }, }) s.Nil(response) - s.NotNil(err) + s.Error(err) s.EqualError(err, "FAILED") } @@ -596,7 +596,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfTaskAlreadyStarted() { }, }) s.Nil(response) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerrors.TaskAlreadyStarted{}, err) s.logger.Error("RecordWorkflowTaskStarted failed with", tag.Error(err)) } @@ -632,7 +632,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfTaskAlreadyCompleted() { }, }) s.Nil(response) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) s.logger.Error("RecordWorkflowTaskStarted failed with", tag.Error(err)) } @@ -667,7 +667,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedConflictOnUpdate() { }, }) - s.NotNil(err) + s.Error(err) s.Nil(response) s.Equal(&persistence.ConditionFailedError{}, err) } @@ -754,10 +754,10 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccess() { }, }) - s.Nil(err) + s.NoError(err) s.NotNil(response) s.Equal("wType", response.WorkflowType.Name) - s.True(response.PreviousStartedEventId == 0) + s.Equal(response.PreviousStartedEventId, 0) s.Equal(int64(3), response.StartedEventId) expectedQueryMap := map[string]*querypb.WorkflowQuery{ id1: {}, @@ -856,10 +856,10 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccessWithInternalRawHistor }, }) - s.Nil(err) + s.NoError(err) s.NotNil(response) s.Equal("wType", response.WorkflowType.Name) - s.True(response.PreviousStartedEventId == 0) + s.Equal(response.PreviousStartedEventId, 0) s.Equal(int64(3), response.StartedEventId) expectedQueryMap := map[string]*querypb.WorkflowQuery{ id1: {}, @@ -900,7 +900,7 @@ func (s *engine2Suite) TestRecordActivityTaskStartedIfNoExecution() { s.logger.Error("Unexpected Error", tag.Error(err)) } s.Nil(response) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -953,7 +953,7 @@ func (s *engine2Suite) TestRecordActivityTaskStartedSuccess() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) s.NotNil(response) s.Equal(scheduledEvent, response.ScheduledEvent) s.NotNil(response.Clock, "Clock must be set for shard staleness check") @@ -1054,7 +1054,7 @@ func (s *engine2Suite) TestRequestCancelWorkflowExecution_Running() { Identity: "identity", }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(namespaceID, workflowExecution) s.Equal(int64(4), ms2.GetNextEventID()) @@ -1087,7 +1087,7 @@ func (s *engine2Suite) TestRequestCancelWorkflowExecution_Finished() { Identity: "identity", }, }) - s.Nil(err) + s.NoError(err) } func (s *engine2Suite) TestRequestCancelWorkflowExecution_NotFound() { @@ -1109,7 +1109,7 @@ func (s *engine2Suite) TestRequestCancelWorkflowExecution_NotFound() { Identity: "identity", }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1281,7 +1281,7 @@ func (s *engine2Suite) TestRespondWorkflowTaskCompletedRecordMarkerCommand() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(namespaceID, we) s.Equal(int64(6), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -1360,7 +1360,7 @@ func (s *engine2Suite) TestRespondWorkflowTaskCompleted_StartChildWithSearchAttr Identity: identity, }, }) - s.Nil(err) + s.NoError(err) } func (s *engine2Suite) TestRespondWorkflowTaskCompleted_StartChildWorkflow_ExceedsLimit() { @@ -1480,7 +1480,7 @@ func (s *engine2Suite) TestStartWorkflowExecution_BrandNew() { RequestId: requestID, }, }) - s.Nil(err) + s.NoError(err) s.NotNil(resp.RunId) s.True(resp.Started) s.Nil(resp.EagerWorkflowTask) @@ -1523,7 +1523,7 @@ func (s *engine2Suite) TestStartWorkflowExecution_BrandNew_SearchAttributes() { "Keyword01": sadefs.MustEncodeValue("test", enumspb.INDEXED_VALUE_TYPE_KEYWORD), }}}, }) - s.Nil(err) + s.NoError(err) s.NotNil(resp.RunId) s.True(resp.Started) s.Nil(resp.EagerWorkflowTask) @@ -1994,7 +1994,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_JustSignal() { s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.UpdateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) - s.Nil(err) + s.NoError(err) s.Equal(runID, resp.GetRunId()) } @@ -2039,7 +2039,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_WorkflowNotExist() { s.mockExecutionMgr.EXPECT().CreateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.CreateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) - s.Nil(err) + s.NoError(err) s.NotNil(resp.GetRunId()) } @@ -2106,7 +2106,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_WorkflowNotRunning() s.mockExecutionMgr.EXPECT().CreateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.CreateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) - s.Nil(err) + s.NoError(err) s.NotNil(resp.GetRunId()) s.NotEqual(runID, resp.GetRunId()) } @@ -2255,7 +2255,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_Start_WorkflowAlread resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) s.Nil(resp) - s.NotNil(err) + s.Error(err) } func (s *engine2Suite) TestRecordChildExecutionCompleted() { diff --git a/service/history/history_engine3_eventsv2_test.go b/service/history/history_engine3_eventsv2_test.go index d0a3391cdad..191fdceb2b7 100644 --- a/service/history/history_engine3_eventsv2_test.go +++ b/service/history/history_engine3_eventsv2_test.go @@ -263,7 +263,7 @@ func (s *engine3Suite) TestRecordWorkflowTaskStartedSuccessStickyEnabled() { expectedResponse.NextPageToken = nil response, err := s.historyEngine.RecordWorkflowTaskStarted(context.Background(), &request) - s.Nil(err) + s.NoError(err) s.NotNil(response) s.True(response.StartedTime.AsTime().After(expectedResponse.ScheduledTime.AsTime())) expectedResponse.StartedTime = response.StartedTime @@ -377,7 +377,7 @@ func (s *engine3Suite) TestRecordWorkflowTaskStartedSuccessStickyEnabled_WithInt expectedResponse.NextPageToken = nil response, err := s.historyEngine.RecordWorkflowTaskStarted(context.Background(), &request) - s.Nil(err) + s.NoError(err) s.NotNil(response) s.True(response.StartedTime.AsTime().After(expectedResponse.ScheduledTime.AsTime())) expectedResponse.StartedTime = response.StartedTime @@ -414,7 +414,7 @@ func (s *engine3Suite) TestStartWorkflowExecution_BrandNew() { RequestId: requestID, }, }) - s.Nil(err) + s.NoError(err) s.NotNil(resp.RunId) } @@ -472,7 +472,7 @@ func (s *engine3Suite) TestSignalWithStartWorkflowExecution_JustSignal() { s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.UpdateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(context.Background(), sRequest) - s.Nil(err) + s.NoError(err) s.Equal(runID, resp.GetRunId()) } @@ -521,6 +521,6 @@ func (s *engine3Suite) TestSignalWithStartWorkflowExecution_WorkflowNotExist() { s.mockExecutionMgr.EXPECT().CreateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.CreateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(context.Background(), sRequest) - s.Nil(err) + s.NoError(err) s.NotNil(resp.GetRunId()) } diff --git a/service/history/history_engine_test.go b/service/history/history_engine_test.go index 8095f54f681..eb766b318c2 100644 --- a/service/history/history_engine_test.go +++ b/service/history/history_engine_test.go @@ -271,7 +271,7 @@ func (s *engineSuite) TestGetMutableStateSync() { NamespaceId: tests.NamespaceID.String(), Execution: &execution, }) - s.Nil(err) + s.NoError(err) s.Equal(int64(4), response.GetNextEventId()) s.Equal(tests.RunID, response.GetFirstExecutionRunId()) } @@ -352,7 +352,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) waitGroup.Done() // right now the next event ID is 5 } @@ -363,7 +363,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll() { Execution: &execution, ExpectedNextEventId: 3, }) - s.Nil(err) + s.NoError(err) s.Equal(int64(4), response.NextEventId) // long poll, new event happen before long poll timeout @@ -375,7 +375,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll() { ExpectedNextEventId: 4, }) s.True(time.Now().UTC().After(start.Add(time.Second))) - s.Nil(err) + s.NoError(err) s.Equal(int64(5), pollResponse.GetNextEventId()) waitGroup.Wait() } @@ -430,7 +430,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll_CurrentBranchChanged() { Execution: execution, ExpectedNextEventId: 3, }) - s.Nil(err) + s.NoError(err) s.Equal(int64(4), response0.GetNextEventId()) // long poll, new event happen before long poll timeout @@ -442,7 +442,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll_CurrentBranchChanged() { ExpectedNextEventId: 10, }) s.True(time.Now().UTC().After(start.Add(time.Second))) - s.Nil(err) + s.NoError(err) s.Equal(response0.GetCurrentBranchToken(), response1.GetCurrentBranchToken()) } @@ -474,7 +474,7 @@ func (s *engineSuite) TestGetMutableStateLongPollTimeout() { Execution: &execution, ExpectedNextEventId: 4, }) - s.Nil(err) + s.NoError(err) s.Equal(int64(4), response.GetNextEventId()) } @@ -775,7 +775,7 @@ func (s *engineSuite) TestQueryWorkflow_ConsistentQueryBufferFull() { // verify that after last query error, the previous pending query is still in the buffer pendingBufferedQueries := qr.GetBufferedIDs() - s.Equal(1, len(pendingBufferedQueries)) + s.Len(pendingBufferedQueries, 1) s.Equal(queryId, pendingBufferedQueries[0]) } @@ -950,7 +950,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedInvalidToken() { }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -975,7 +975,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedIfNoExecution() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1041,7 +1041,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedUpdateExecutionFailed() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.EqualError(err, "FAILED") } @@ -1081,7 +1081,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedIfTaskCompleted() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1118,7 +1118,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedIfTaskNotStarted() { TaskToken: taskToken, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1651,7 +1651,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedSingleActivityScheduledAtt s.Equal(int64(5), updatedWorkflowMutation.NextEventID, iVar) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId, iVar) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State, iVar) - s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID, iVar) + s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID, iVar) } s.TearDownTest() s.SetupTest() @@ -1718,7 +1718,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedBadBinary() { s.Equal(int64(5), updatedWorkflowMutation.NextEventID) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State) - s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID) + s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID) } func (s *engineSuite) TestRespondWorkflowTaskCompletedSingleActivityScheduledWorkflowTask() { @@ -2051,7 +2051,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_ActivityEagerExecution_Ca _, ok := ms2.GetActivityByActivityID("activity1") s.False(ok) - s.Len(resp.ActivityTasks, 0) + s.Empty(resp.ActivityTasks) s.NotNil(resp.StartedResponse) s.Equal(int64(10), resp.StartedResponse.NextEventId) s.Equal(int64(3), resp.StartedResponse.PreviousStartedEventId) @@ -2135,7 +2135,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_ActivityEagerExecution_Wo s.Equal(int64(5), activityInfo.ScheduledEventId) // activity scheduled s.Equal(common.EmptyEventID, activityInfo.StartedEventId) // activity not started - s.Len(resp.ActivityTasks, 0) + s.Empty(resp.ActivityTasks) s.Nil(resp.StartedResponse) } @@ -2224,7 +2224,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_WorkflowTaskHeartbeatNotT Identity: identity, }, }) - s.Nil(err) + s.NoError(err) } func (s *engineSuite) TestRespondWorkflowTaskCompleted_WorkflowTaskHeartbeatNotTimeout_ZeroOrignalScheduledTime() { @@ -2268,7 +2268,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_WorkflowTaskHeartbeatNotT Identity: identity, }, }) - s.Nil(err) + s.NoError(err) } func (s *engineSuite) TestRespondWorkflowTaskCompletedCompleteWorkflowSuccess() { @@ -2490,7 +2490,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedStartChildWorkflowWithAban ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(6), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) - s.Equal(1, len(ms2.GetPendingChildExecutionInfos())) + s.Len(ms2.GetPendingChildExecutionInfos(), 1) var childID int64 for c := range ms2.GetPendingChildExecutionInfos() { childID = c @@ -2557,7 +2557,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedStartChildWorkflowWithTerm ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(6), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) - s.Equal(1, len(ms2.GetPendingChildExecutionInfos())) + s.Len(ms2.GetPendingChildExecutionInfos(), 1) var childID int64 for c := range ms2.GetPendingChildExecutionInfos() { childID = c @@ -2621,7 +2621,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedSignalExternalWorkflowFail }, }) - s.NotNil(err) + s.Error(err) } func (s *engineSuite) TestRespondActivityTaskCompletedInvalidToken() { @@ -2638,7 +2638,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedInvalidToken() { }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -2663,7 +2663,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfNoExecution() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -2687,7 +2687,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfNoRunID() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -2884,7 +2884,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfTaskCompleted() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -2930,7 +2930,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfTaskNotStarted() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3113,7 +3113,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedInvalidToken() { }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -3139,7 +3139,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfNoExecution() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3164,7 +3164,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfNoRunID() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3359,7 +3359,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfTaskCompleted() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3403,7 +3403,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfTaskNotStarted() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3496,7 +3496,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedSuccess() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(9), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3560,7 +3560,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedWithHeartbeatSuccess() { LastHeartbeatDetails: details, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(9), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3623,7 +3623,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedByIdSuccess() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(9), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3682,7 +3682,7 @@ func (s *engineSuite) TestRecordActivityTaskHeartBeatSuccess_NoTimer() { Details: detais, }, }) - s.Nil(err) + s.NoError(err) } func (s *engineSuite) TestRecordActivityTaskHeartBeatSuccess_TimerRunning() { @@ -3731,7 +3731,7 @@ func (s *engineSuite) TestRecordActivityTaskHeartBeatSuccess_TimerRunning() { Details: detais, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(7), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3785,7 +3785,7 @@ func (s *engineSuite) TestRecordActivityTaskHeartBeatByIDSuccess() { Details: detais, }, }) - s.Nil(err) + s.NoError(err) } func (s *engineSuite) TestRespondActivityTaskCanceled_Scheduled() { @@ -3829,7 +3829,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceled_Scheduled() { Details: payloads.EncodeString("details"), }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3862,7 +3862,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceled_Started() { activityScheduledEvent, _ := addActivityTaskScheduledEvent(ms, workflowTaskCompletedEvent.EventId, activityID, activityType, tl, activityInput, 100*time.Second, 10*time.Second, 1*time.Second, 1*time.Second) addActivityTaskStartedEvent(ms, activityScheduledEvent.EventId, identity) _, _, err := ms.AddActivityTaskCancelRequestedEvent(workflowTaskCompletedEvent.EventId, activityScheduledEvent.EventId, identity) - s.Nil(err) + s.NoError(err) wfMs := workflow.TestCloneToProto(context.Background(), ms) gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs} @@ -3878,7 +3878,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceled_Started() { Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3921,7 +3921,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceledById_Started() { activityScheduledEvent, _ := addActivityTaskScheduledEvent(ms, workflowTaskCompletedEvent.EventId, activityID, activityType, tl, activityInput, 100*time.Second, 10*time.Second, 1*time.Second, 1*time.Second) addActivityTaskStartedEvent(ms, activityScheduledEvent.EventId, identity) _, _, err := ms.AddActivityTaskCancelRequestedEvent(workflowTaskCompletedEvent.EventId, activityScheduledEvent.EventId, identity) - s.Nil(err) + s.NoError(err) wfMs := workflow.TestCloneToProto(context.Background(), ms) gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs} @@ -3939,7 +3939,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceledById_Started() { Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3973,7 +3973,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceledIfNoRunID() { Identity: identity, }, }) - s.NotNil(err) + s.Error(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -4113,7 +4113,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NotSchedule s.Equal(int64(5), updatedWorkflowMutation.NextEventID) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State) - s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID) + s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID) } func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Scheduled() { @@ -4167,7 +4167,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Scheduled() Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(12), ms2.GetNextEventID()) @@ -4232,7 +4232,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Started() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4300,7 +4300,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Completed() Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4361,7 +4361,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NoHeartBeat Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4389,7 +4389,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NoHeartBeat Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) s.NotNil(hbResponse) s.True(hbResponse.CancelRequested) @@ -4404,7 +4404,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NoHeartBeat Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) ms2 = s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(13), ms2.GetNextEventID()) @@ -4465,7 +4465,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Success() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4493,7 +4493,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Success() { Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) s.NotNil(hbResponse) s.True(hbResponse.CancelRequested) @@ -4508,7 +4508,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Success() { Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) ms2 = s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(13), ms2.GetNextEventID()) @@ -4600,7 +4600,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith QueryResults: queryResults, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4610,14 +4610,14 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith s.Len(qr.GetCompletedIDs(), 2) succeeded1, err := qr.GetCompletionState(id1) s.NoError(err) - s.EqualValues(succeeded1.Result, result1) + s.Equal(succeeded1.Result, result1) s.Equal(workflow.QueryCompletionTypeSucceeded, succeeded1.Type) succeeded2, err := qr.GetCompletionState(id2) s.NoError(err) - s.EqualValues(succeeded2.Result, result2) + s.Equal(succeeded2.Result, result2) s.Equal(workflow.QueryCompletionTypeSucceeded, succeeded2.Type) - s.Len(qr.GetBufferedIDs(), 0) - s.Len(qr.GetFailedIDs(), 0) + s.Empty(qr.GetBufferedIDs()) + s.Empty(qr.GetFailedIDs()) s.Len(qr.GetUnblockedIDs(), 1) unblocked1, err := qr.GetCompletionState(id3) s.NoError(err) @@ -4644,7 +4644,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) s.NotNil(hbResponse) s.True(hbResponse.CancelRequested) @@ -4659,7 +4659,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith Details: payloads.EncodeString("details"), }, }) - s.Nil(err) + s.NoError(err) ms2 = s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(13), ms2.GetNextEventID()) @@ -4715,7 +4715,7 @@ func (s *engineSuite) TestStarTimer_DuplicateTimerID() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, ms2.GetExecutionState().State) @@ -4820,7 +4820,7 @@ func (s *engineSuite) TestUserTimer_RespondWorkflowTaskCompleted() { Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) @@ -4891,7 +4891,7 @@ func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_NoStartTimer( s.Equal(int64(5), updatedWorkflowMutation.NextEventID) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State) - s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID) + s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID) } func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_TimerFired() { @@ -4924,11 +4924,11 @@ func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_TimerFired() addWorkflowTaskStartedEvent(ms, wt2.ScheduledEventID, tl, identity) addTimerFiredEvent(ms, timerID) _, _, err := ms.CloseTransactionAsMutation(context.Background(), historyi.TransactionPolicyActive) - s.Nil(err) + s.NoError(err) wfMs := workflow.TestCloneToProto(context.Background(), ms) gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs} - s.True(len(gwmsResponse.State.BufferedEvents) > 0) + s.Positive(len(gwmsResponse.State.BufferedEvents)) commands := []*commandpb.Command{{ CommandType: enumspb.COMMAND_TYPE_CANCEL_TIMER, @@ -4952,7 +4952,7 @@ func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_TimerFired() Identity: identity, }, }) - s.Nil(err) + s.NoError(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) @@ -5002,7 +5002,7 @@ func (s *engineSuite) TestSignalWorkflowExecution() { s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.UpdateWorkflowExecutionResponse, nil) _, err = s.historyEngine.SignalWorkflowExecution(context.Background(), signalRequest) - s.Nil(err) + s.NoError(err) } // Test signal workflow task by adding request ID @@ -5281,7 +5281,7 @@ func (s *engineSuite) TestSignalWorkflowExecution_WorkflowTaskBackoff() { }) _, err = s.historyEngine.SignalWorkflowExecution(context.Background(), signalRequest) - s.Nil(err) + s.NoError(err) } func (s *engineSuite) TestRemoveSignalMutableState() { @@ -5316,7 +5316,7 @@ func (s *engineSuite) TestRemoveSignalMutableState() { s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.UpdateWorkflowExecutionResponse, nil) _, err = s.historyEngine.RemoveSignalMutableState(context.Background(), removeRequest) - s.Nil(err) + s.NoError(err) } func (s *engineSuite) TestReapplyEvents_ReturnSuccess() { @@ -5575,7 +5575,7 @@ func (s *engineSuite) TestEagerWorkflowStart_FromCron_SkipsEager() { }) s.NoError(err) s.Nil(response.(*historyservice.StartWorkflowExecutionResponse).EagerWorkflowTask) - s.Equal(len(recordedTasks), 0) + s.Empty(recordedTasks) } func (s *engineSuite) TestEagerWorkflowStart_WithSearchAttributes() { diff --git a/service/history/historybuilder/history_builder_test.go b/service/history/historybuilder/history_builder_test.go index 8248c176519..065ac2f0ebe 100644 --- a/service/history/historybuilder/history_builder_test.go +++ b/service/history/historybuilder/history_builder_test.go @@ -2320,9 +2320,8 @@ func (s *historyBuilderSuite) TestBufferEvent() { } commandsWithEventsCount++ } - s.Equal( - commandsWithEventsCount, - len(commandEvents), + s.Len( + commandEvents, commandsWithEventsCount, "This assertion is broken when a new command is added and no corresponding logic for corresponding command event is added to HistoryBuilder.bufferEvent", ) } @@ -2370,8 +2369,8 @@ func (s *historyBuilderSuite) TestReorder() { } func (s *historyBuilderSuite) TestBufferSize_Memory() { - s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) - s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Zero(s.historyBuilder.NumBufferedEvents()) + s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) s.historyBuilder.AddWorkflowExecutionSignaledEvent( "signal-name", &commonpb.Payloads{}, @@ -2381,30 +2380,30 @@ func (s *historyBuilderSuite) TestBufferSize_Memory() { "", nil, ) - s.Assert().Equal(1, s.historyBuilder.NumBufferedEvents()) + s.Equal(1, s.historyBuilder.NumBufferedEvents()) // the size of the proto is non-deterministic, so just assert that it's non-zero, and it isn't really high - s.Assert().Greater(s.historyBuilder.SizeInBytesOfBufferedEvents(), 0) - s.Assert().Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) + s.Assert().Positive(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) s.flush() - s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) - s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Zero(s.historyBuilder.NumBufferedEvents()) + s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) } func (s *historyBuilderSuite) TestBufferSize_DB() { - s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) - s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Zero(s.historyBuilder.NumBufferedEvents()) + s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) s.historyBuilder.dbBufferBatch = []*historypb.HistoryEvent{{ EventType: enumspb.EVENT_TYPE_TIMER_FIRED, EventId: common.BufferedEventID, TaskId: common.EmptyEventTaskID, }} - s.Assert().Equal(1, s.historyBuilder.NumBufferedEvents()) + s.Equal(1, s.historyBuilder.NumBufferedEvents()) // the size of the proto is non-deterministic, so just assert that it's non-zero, and it isn't really high - s.Assert().Greater(s.historyBuilder.SizeInBytesOfBufferedEvents(), 0) - s.Assert().Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) + s.Assert().Positive(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) s.flush() - s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) - s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Zero(s.historyBuilder.NumBufferedEvents()) + s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) } func (s *historyBuilderSuite) TestLastEventVersion() { @@ -2660,13 +2659,13 @@ func (s *historyBuilderSuite) flush() *historypb.HistoryEvent { s.Equal(make(map[int64]int64), historyMutation.ScheduledIDToStartedID) if !hasBufferEvents { - s.Equal(1, len(historyMutation.DBEventsBatches)) - s.Equal(1, len(historyMutation.DBEventsBatches[0])) + s.Len(historyMutation.DBEventsBatches, 1) + s.Len(historyMutation.DBEventsBatches[0], 1) return historyMutation.DBEventsBatches[0][0] } if len(historyMutation.MemBufferBatch) > 0 { - s.Equal(1, len(historyMutation.MemBufferBatch)) + s.Len(historyMutation.MemBufferBatch, 1) return historyMutation.MemBufferBatch[0] } diff --git a/service/history/hsm/tree_test.go b/service/history/hsm/tree_test.go index 766e1fe8f48..8bdc9162c4b 100644 --- a/service/history/hsm/tree_test.go +++ b/service/history/hsm/tree_test.go @@ -61,7 +61,7 @@ func TestNode_MaintainsCachedData(t *testing.T) { require.False(t, root.Dirty()) opLog, err := root.OpLog() require.NoError(t, err) - require.Equal(t, 0, len(opLog)) + require.Empty(t, opLog) err = hsm.MachineTransition(root, func(d *hsmtest.Data) (hsm.TransitionOutput, error) { d.SetState(hsmtest.State2) @@ -75,7 +75,7 @@ func TestNode_MaintainsCachedData(t *testing.T) { require.True(t, root.Dirty()) opLog, err = root.OpLog() require.NoError(t, err) - require.Equal(t, 1, len(opLog)) + require.Len(t, opLog, 1) transOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) @@ -131,7 +131,7 @@ func TestNode_MaintainsChildCache(t *testing.T) { opLog, err := root.OpLog() require.NoError(t, err) - require.Equal(t, 1, len(opLog)) + require.Len(t, opLog, 1) transOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) require.Equal(t, int64(1), transOp.Output.TransitionCount) @@ -675,7 +675,7 @@ func TestNode_DeleteDeepHierarchy(t *testing.T) { case hsm.TransitionOperation: transitionCount++ pathLen := len(o.Path()) - require.True(t, pathLen <= 3, "should not see transitions for deleted nodes") + require.LessOrEqual(t, pathLen, 3, "should not see transitions for deleted nodes") case hsm.DeleteOperation: deletionCount++ } diff --git a/service/history/queues/queue_base_test.go b/service/history/queues/queue_base_test.go index 56da45d2b0e..fed4784cecf 100644 --- a/service/history/queues/queue_base_test.go +++ b/service/history/queues/queue_base_test.go @@ -111,7 +111,7 @@ func (s *queueBaseSuite) TestNewProcessBase_NoPreviousState() { base := s.newQueueBase(mockShard, tasks.CategoryTransfer, nil) - s.Len(base.readerGroup.Readers(), 0) + s.Empty(base.readerGroup.Readers()) s.Equal(int64(1), base.nonReadableScope.Range.InclusiveMin.TaskID) } @@ -266,9 +266,9 @@ func (s *queueBaseSuite) TestProcessNewRange() { s.True(ok) scopes := defaultReader.Scopes() s.Len(scopes, 1) - s.True(scopes[0].Range.InclusiveMin.CompareTo(tasks.MinimumKey) == 0) + s.Equal(scopes[0].Range.InclusiveMin.CompareTo(tasks.MinimumKey), 0) s.True(scopes[0].Predicate.Equals(predicates.Universal[tasks.Task]())) - s.True(time.Since(scopes[0].Range.ExclusiveMax.FireTime) <= time.Second) + s.LessOrEqual(time.Since(scopes[0].Range.ExclusiveMax.FireTime), time.Second) s.True(base.nonReadableScope.Range.Equals(NewRange(scopes[0].Range.ExclusiveMax, tasks.MaximumKey))) } @@ -306,7 +306,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_PerformRangeCompletion( base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) // set to a smaller value so that delete will be triggered currentLowWatermark := tasks.MinimumKey @@ -321,8 +321,8 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_PerformRangeCompletion( s.True(request.InclusiveMinTaskKey.FireTime.Equal(currentLowWatermark.FireTime)) s.True(request.ExclusiveMaxTaskKey.FireTime.Equal(scopeMinKey.FireTime)) } else { - s.True(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark) == 0) - s.True(request.ExclusiveMaxTaskKey.CompareTo(scopeMinKey) == 0) + s.Equal(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark), 0) + s.Equal(request.ExclusiveMaxTaskKey.CompareTo(scopeMinKey), 0) } return nil @@ -338,7 +338,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_PerformRangeCompletion( base.checkpoint() - s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) } func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_SkipRangeCompletion() { @@ -375,7 +375,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_SkipRangeCompletion() { base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) // set to a smaller value so that delete will be triggered currentLowWatermark := tasks.MinimumKey @@ -390,7 +390,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_SkipRangeCompletion() { base.checkpoint() - s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) } func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { @@ -418,7 +418,7 @@ func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.True(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark), 0) // set to a smaller value so that delete will be triggered currentLowWatermark := tasks.MinimumKey @@ -429,13 +429,13 @@ func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { func(ctx context.Context, request *persistence.RangeCompleteHistoryTasksRequest) error { s.Equal(mockShard.GetShardID(), request.ShardID) s.Equal(base.category, request.TaskCategory) - s.True(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark) == 0) + s.Equal(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark), 0) if base.category.Type() == tasks.CategoryTypeScheduled { s.True(request.InclusiveMinTaskKey.FireTime.Equal(currentLowWatermark.FireTime)) s.True(request.ExclusiveMaxTaskKey.FireTime.Equal(exclusiveReaderHighWatermark.FireTime)) } else { - s.True(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark) == 0) - s.True(request.ExclusiveMaxTaskKey.CompareTo(exclusiveReaderHighWatermark) == 0) + s.Equal(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark), 0) + s.Equal(request.ExclusiveMaxTaskKey.CompareTo(exclusiveReaderHighWatermark), 0) } return nil @@ -451,7 +451,7 @@ func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { base.checkpoint() - s.True(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark), 0) } func (s *queueBaseSuite) TestCheckPoint_SlicePredicateAction() { @@ -492,7 +492,7 @@ func (s *queueBaseSuite) TestCheckPoint_SlicePredicateAction() { base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.True(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark), 0) // set to a smaller value so that delete will be triggered base.exclusiveDeletionHighWatermark = tasks.MinimumKey @@ -512,7 +512,7 @@ func (s *queueBaseSuite) TestCheckPoint_SlicePredicateAction() { base.checkpoint() - s.True(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark) == 0) + s.Equal(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark), 0) } func (s *queueBaseSuite) TestCheckPoint_MoveTaskGroupAction() { diff --git a/service/history/queues/reader_group_test.go b/service/history/queues/reader_group_test.go index 5a60cda928f..525d1867d20 100644 --- a/service/history/queues/reader_group_test.go +++ b/service/history/queues/reader_group_test.go @@ -98,7 +98,7 @@ func (s *readerGroupSuite) TestRemoveReader() { s.readerGroup.RemoveReader(readerID) s.Equal(common.DaemonStatusStopped, r.(*testReader).status) - s.Len(s.readerGroup.Readers(), 0) + s.Empty(s.readerGroup.Readers()) } func (s *readerGroupSuite) TestForEach() { diff --git a/service/history/queues/reader_test.go b/service/history/queues/reader_test.go index 1b0e4fde814..43508bfeab4 100644 --- a/service/history/queues/reader_test.go +++ b/service/history/queues/reader_test.go @@ -500,7 +500,7 @@ func (s *readerSuite) validateSlicesOrdered( } for idx := range scopes[:len(scopes)-1] { - s.True(scopes[idx].Range.ExclusiveMax.CompareTo(scopes[idx+1].Range.InclusiveMin) <= 0) + s.LessOrEqual(scopes[idx].Range.ExclusiveMax.CompareTo(scopes[idx+1].Range.InclusiveMin), 0) } } diff --git a/service/history/queues/slice_test.go b/service/history/queues/slice_test.go index 3277fff5237..5df414b4842 100644 --- a/service/history/queues/slice_test.go +++ b/service/history/queues/slice_test.go @@ -417,7 +417,7 @@ func (s *sliceSuite) TestShrinkScope_ShrinkPredicate() { }) pendingNamespaceID := []string{uuid.NewString(), uuid.NewString()} - s.True(len(pendingNamespaceID) <= shrinkPredicateMaxPendingKeys) + s.LessOrEqual(len(pendingNamespaceID), shrinkPredicateMaxPendingKeys) for _, executable := range executables { mockExecutable := executable.(*MockExecutable) @@ -441,7 +441,7 @@ func (s *sliceSuite) TestShrinkScope_ShrinkPredicate() { namespacePredicate, ok := slice.Scope().Predicate.(*tasks.NamespacePredicate) s.True(ok) for namespaceID := range namespacePredicate.NamespaceIDs { - s.True(slices.Index(pendingNamespaceID, namespaceID) != -1) + s.NotEqual(slices.Index(pendingNamespaceID, namespaceID), -1) } } @@ -705,7 +705,7 @@ func (s *sliceSuite) validateSliceState( currentRange := iterator.Range() previousRange := slice.iterators[idx-1].Range() s.False(currentRange.CanMerge(previousRange)) - s.True(previousRange.ExclusiveMax.CompareTo(currentRange.InclusiveMin) < 0) + s.Negative(previousRange.ExclusiveMax.CompareTo(currentRange.InclusiveMin)) } } diff --git a/service/history/replication/executable_history_task_test.go b/service/history/replication/executable_history_task_test.go index 398962a1413..b9c5aa102a0 100644 --- a/service/history/replication/executable_history_task_test.go +++ b/service/history/replication/executable_history_task_test.go @@ -319,11 +319,11 @@ func (s *executableHistoryTaskSuite) TestHandleErr_Other() { s.Equal(err, s.task.HandleErr(err)) err = serviceerror.NewNotFound("") - s.Equal(nil, s.task.HandleErr(err)) + s.NoError(s.task.HandleErr(err)) err = consts.ErrDuplicate s.executableTask.EXPECT().MarkTaskDuplicated().Times(1) - s.Equal(nil, s.task.HandleErr(err)) + s.NoError(s.task.HandleErr(err)) err = serviceerror.NewUnavailable("") s.Equal(err, s.task.HandleErr(err)) @@ -473,7 +473,7 @@ func (s *executableHistoryTaskSuite) TestNewExecutableHistoryTask() { if s.processToolBox.Config.ReplicationMultipleBatches() { s.Equal(s.eventsBlobs, s.task.eventsBlobs) } else { - s.Equal(len(s.task.eventsBlobs), 1) + s.Equal(1, len(s.task.eventsBlobs)) s.Equal(s.eventsBlob, s.task.eventsBlobs[0]) } } @@ -840,7 +840,7 @@ func (s *executableHistoryTaskSuite) generateTwoBatchableTasks() (*ExecutableHis s.Equal(incomingVersionHistoryItems, resultHistoryTask.versionHistoryItems) expectedBatchedEvents := append(currentEvent, incomingEvent...) - s.Equal(len(resultHistoryTask.eventsDesResponse.events), len(expectedBatchedEvents)) + s.Equal(len(expectedBatchedEvents), len(resultHistoryTask.eventsDesResponse.events)) for i := range expectedBatchedEvents { protorequire.ProtoSliceEqual(s.T(), expectedBatchedEvents[i], resultHistoryTask.eventsDesResponse.events[i]) } diff --git a/service/history/replication/stream_sender_flow_controller_test.go b/service/history/replication/stream_sender_flow_controller_test.go index ff42b345860..4c215da9e81 100644 --- a/service/history/replication/stream_sender_flow_controller_test.go +++ b/service/history/replication/stream_sender_flow_controller_test.go @@ -144,7 +144,7 @@ func (s *senderFlowControllerSuite) TestPauseToResume() { }) // Ensure the goroutine has time to start and block - assert.Eventually(s.T(), func() bool { + s.Eventually(func() bool { state.mu.Lock() defer state.mu.Unlock() return state.waiters == 1 diff --git a/service/history/shard/context_test.go b/service/history/shard/context_test.go index 37719f8f282..6ba381aae1d 100644 --- a/service/history/shard/context_test.go +++ b/service/history/shard/context_test.go @@ -468,7 +468,7 @@ func (s *contextSuite) TestAcquireShardOwnershipLostErrorIsNotRetried() { s.mockShard.acquireShard() - s.Assert().Equal(contextStateStopping, s.mockShard.state) + s.Equal(contextStateStopping, s.mockShard.state) } func (s *contextSuite) TestAcquireShardNonOwnershipLostErrorIsRetried() { @@ -480,7 +480,7 @@ func (s *contextSuite) TestAcquireShardNonOwnershipLostErrorIsRetried() { s.mockShard.acquireShard() - s.Assert().Equal(contextStateStopping, s.mockShard.state) + s.Equal(contextStateStopping, s.mockShard.state) } func (s *contextSuite) TestAcquireShardEventuallySucceeds() { @@ -495,7 +495,7 @@ func (s *contextSuite) TestAcquireShardEventuallySucceeds() { s.mockShard.acquireShard() - s.Assert().Equal(contextStateAcquired, s.mockShard.state) + s.Equal(contextStateAcquired, s.mockShard.state) } func (s *contextSuite) TestAcquireShardNoError() { @@ -508,7 +508,7 @@ func (s *contextSuite) TestAcquireShardNoError() { s.mockShard.acquireShard() - s.Assert().Equal(contextStateAcquired, s.mockShard.state) + s.Equal(contextStateAcquired, s.mockShard.state) } func (s *contextSuite) TestHandoverNamespace() { @@ -775,7 +775,7 @@ func (s *contextSuite) TestShardStopReasonAcquireShard() { s.mockShard.acquireShard() - s.Assert().Equal(contextStateStopping, s.mockShard.state) + s.Equal(contextStateStopping, s.mockShard.state) s.False(s.mockShard.IsValid()) s.True(s.mockShard.stoppedForOwnershipLost()) } @@ -785,7 +785,7 @@ func (s *contextSuite) TestShardStopReasonUnload() { s.mockShard.UnloadForOwnershipLost() - s.Assert().Equal(contextStateStopping, s.mockShard.state) + s.Equal(contextStateStopping, s.mockShard.state) s.False(s.mockShard.IsValid()) s.True(s.mockShard.stoppedForOwnershipLost()) } @@ -951,7 +951,7 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 2) + s.Equal(2, s.mockShard.tasksCompletedSinceLastUpdate) // update after ShardFirstUpdateInterval s.mockShard.initLastUpdatesTime() @@ -962,7 +962,7 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 0) + s.Equal(0, s.mockShard.tasksCompletedSinceLastUpdate) // update again. This time update will not work since shard lastUpdate time was set during previous update s.timeSource.Update(time.Now().Add(s.mockShard.config.ShardFirstUpdateInterval() + 15*time.Second)) @@ -972,7 +972,7 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 1) + s.Equal(1, s.mockShard.tasksCompletedSinceLastUpdate) // now move past last updated interval. This time hard info should be updated/persisted s.timeSource.Update(s.mockShard.lastUpdated.Add(s.mockShard.config.ShardUpdateMinInterval() + 10*time.Second)) @@ -982,5 +982,5 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 0) + s.Equal(0, s.mockShard.tasksCompletedSinceLastUpdate) } diff --git a/service/history/shard/controller_test.go b/service/history/shard/controller_test.go index a8ed689d40f..b79baf18522 100644 --- a/service/history/shard/controller_test.go +++ b/service/history/shard/controller_test.go @@ -457,7 +457,7 @@ func (s *controllerSuite) TestShardExplicitUnload() { shard, err := s.shardController.getOrCreateShardContext(1) s.NoError(err) - s.Equal(1, len(s.shardController.ShardIDs())) + s.Len(s.shardController.ShardIDs(), 1) shard.UnloadForOwnershipLost() @@ -465,7 +465,7 @@ func (s *controllerSuite) TestShardExplicitUnload() { // removal from map happens asynchronously time.Sleep(1 * time.Millisecond) } - s.Equal(0, len(s.shardController.ShardIDs())) + s.Empty(s.shardController.ShardIDs()) s.False(shard.IsValid()) } @@ -742,7 +742,7 @@ func (s *controllerSuite) TestShardLingerTimeout() { // By now the timeout should have occurred. time.Sleep(timeLimit/2 + 100*time.Millisecond) - s.Len(s.shardController.ShardIDs(), 0) + s.Empty(s.shardController.ShardIDs()) s.False(shard.IsValid()) s.Equal(float64(1), s.readMetricsCounter( @@ -823,7 +823,7 @@ func (s *controllerSuite) TestShardLingerSuccess() { expectedWait := time.Second / time.Duration(checkQPS) * 2 time.Sleep(expectedWait + 100*time.Millisecond) - s.Len(s.shardController.ShardIDs(), 0) + s.Empty(s.shardController.ShardIDs()) } // TestShardCounter verifies that we can subscribe to shard count updates, receive them when shards are acquired, and diff --git a/service/history/shard/ownership_test.go b/service/history/shard/ownership_test.go index 306a09b9032..53814e5e356 100644 --- a/service/history/shard/ownership_test.go +++ b/service/history/shard/ownership_test.go @@ -83,7 +83,7 @@ func (s *ownershipSuite) TestAcquireViaMembershipUpdate() { shardController := s.newController(cf) shardController.Start() - s.Zero(len(shardController.ShardIDs())) + s.Empty(shardController.ShardIDs()) shardController.ownership.membershipUpdateCh <- &membership.ChangedEvent{} diff --git a/service/history/shard/task_key_generator_test.go b/service/history/shard/task_key_generator_test.go index fbcec6ff13d..79c45e2ad27 100644 --- a/service/history/shard/task_key_generator_test.go +++ b/service/history/shard/task_key_generator_test.go @@ -120,7 +120,7 @@ func (s *taskKeyGeneratorSuite) TestSetTaskKeys_RenewRange() { initialRangeID := s.rangeID numTask := 10 - s.True(numTask > (1 << s.rangeSizeBits)) + s.Greater(numTask, (1 << s.rangeSizeBits)) transferTasks := make([]tasks.Task, 0, numTask) for range numTask { diff --git a/service/history/tasks/key_test.go b/service/history/tasks/key_test.go index 993a521a276..a29241741d4 100644 --- a/service/history/tasks/key_test.go +++ b/service/history/tasks/key_test.go @@ -70,12 +70,12 @@ func (s *taskKeySuite) TestMinMaxKey() { thatKey := NewKey(time.Unix(0, rand.Int63()), rand.Int63()) minKey := MinKey(thisKey, thatKey) - s.True(minKey.CompareTo(thisKey) <= 0) - s.True(minKey.CompareTo(thatKey) <= 0) + s.LessOrEqual(minKey.CompareTo(thisKey), 0) + s.LessOrEqual(minKey.CompareTo(thatKey), 0) maxKey := MaxKey(thisKey, thatKey) - s.True(maxKey.CompareTo(thisKey) >= 0) - s.True(maxKey.CompareTo(thisKey) >= 0) + s.GreaterOrEqual(maxKey.CompareTo(thisKey), 0) + s.GreaterOrEqual(maxKey.CompareTo(thisKey), 0) } func (s *taskKeySuite) TestSort() { @@ -98,7 +98,7 @@ func (s *taskKeySuite) TestSort() { if prev.FireTime.Before(next.FireTime) { // noop } else if prev.FireTime.Equal(next.FireTime) { - s.True(prev.TaskID <= next.TaskID) + s.LessOrEqual(prev.TaskID, next.TaskID) } else { s.Fail("task keys are not sorted prev: %v, next: %v", prev, next) } diff --git a/service/history/timer_queue_active_task_executor_test.go b/service/history/timer_queue_active_task_executor_test.go index 9fe23ca39d6..0f34a332e95 100644 --- a/service/history/timer_queue_active_task_executor_test.go +++ b/service/history/timer_queue_active_task_executor_test.go @@ -1137,7 +1137,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowTaskTimeout_Fire() { workflowTask := s.getMutableStateFromCache(workflowKey).GetPendingWorkflowTask() s.NotNil(workflowTask) - s.True(workflowTask.ScheduledEventID != common.EmptyEventID) + s.NotEqual(workflowTask.ScheduledEventID, common.EmptyEventID) s.Equal(common.EmptyEventID, workflowTask.StartedEventID) s.Equal(int32(2), workflowTask.Attempt) } @@ -1289,7 +1289,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowBackoffTimer_Fire() { workflowTask := s.getMutableStateFromCache(workflowKey).GetPendingWorkflowTask() s.NotNil(workflowTask) - s.True(workflowTask.ScheduledEventID != common.EmptyEventID) + s.NotEqual(workflowTask.ScheduledEventID, common.EmptyEventID) s.Equal(common.EmptyEventID, workflowTask.StartedEventID) s.Equal(int32(1), workflowTask.Attempt) } @@ -1640,7 +1640,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_Retry() { state, status := s.getMutableStateFromCache(workflowKey).GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) } func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_Cron() { @@ -1701,7 +1701,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_Cron() { state, status := s.getMutableStateFromCache(workflowKey).GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) } func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_WorkflowExpired() { @@ -1756,7 +1756,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_WorkflowExpir state, status := s.getMutableStateFromCache(workflowKey).GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) } func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowExecutionTimeout_Fire() { @@ -1833,7 +1833,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowExecutionTimeout_Fire() s.False(mutableState.IsWorkflowExecutionRunning()) state, status := mutableState.GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) s.clearMutableStateFromCache(workflowKey) } @@ -2034,7 +2034,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestExecuteChasmSideEffectTimerTask_ // Execution should succeed. resp := timerQueueActiveTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) s.NotNil(resp) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueActiveTaskExecutorSuite) TestExecuteChasmPureTimerTask_ExecutesAllPureTimers() { @@ -2107,7 +2107,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestExecuteChasmPureTimerTask_Execut // Execution should succeed. resp := timerQueueActiveTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) s.NotNil(resp) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } // TestExecuteChasmPureTimerTask_ClosesTransactionWhenInvalid verifies that the @@ -2309,7 +2309,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestExecuteStateMachineTimerTask_Exe err = timerQueueActiveTaskExecutor.executeStateMachineTimerTask(context.Background(), task) s.NoError(err) s.Equal(2, numInvocations) // two valid tasks within the deadline. - s.Equal(1, len(info.StateMachineTimers)) + s.Len(info.StateMachineTimers, 1) s.Equal(futureDeadline, info.StateMachineTimers[0].Deadline.AsTime()) } diff --git a/service/history/timer_queue_standby_task_executor_test.go b/service/history/timer_queue_standby_task_executor_test.go index 408cb438d12..e1325e39008 100644 --- a/service/history/timer_queue_standby_task_executor_test.go +++ b/service/history/timer_queue_standby_task_executor_test.go @@ -353,7 +353,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessUserTimerTimeout_Success s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessUserTimerTimeout_Multiple() { @@ -420,7 +420,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessUserTimerTimeout_Multipl s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Pending() { @@ -570,7 +570,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Success( s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Heartbeat_Noop() { @@ -640,7 +640,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Heartbea s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Multiple_CanUpdate() { @@ -718,8 +718,8 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Multiple s.mockExecutionMgr.EXPECT().GetWorkflowExecution(gomock.Any(), gomock.Any()).Return(&persistence.GetWorkflowExecutionResponse{State: persistenceMutableState}, nil) s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).DoAndReturn( func(_ context.Context, input *persistence.UpdateWorkflowExecutionRequest) (*persistence.UpdateWorkflowExecutionResponse, error) { - s.Equal(1, len(input.UpdateWorkflowMutation.Tasks[tasks.CategoryTimer])) - s.Equal(1, len(input.UpdateWorkflowMutation.UpsertActivityInfos)) + s.Len(input.UpdateWorkflowMutation.Tasks[tasks.CategoryTimer], 1) + s.Len(input.UpdateWorkflowMutation.UpsertActivityInfos, 1) mutableState.GetExecutionInfo().LastUpdateTime = input.UpdateWorkflowMutation.ExecutionInfo.LastUpdateTime input.RangeID = 0 input.UpdateWorkflowMutation.ExecutionInfo.LastRunningClock = 0 @@ -761,7 +761,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Multiple s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } // TestProcessUserTimerTimeout_StandbyFiresUnderSkip: without virtual time, the @@ -1067,7 +1067,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowTaskTimeout_Sche s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Equal(nil, resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowTaskTimeout_Success() { @@ -1120,7 +1120,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowTaskTimeout_Succ s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowTaskTimeout_AttemptMismatch() { @@ -1355,7 +1355,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowBackoffTimer_Suc s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowRunTimeout_Pending() { @@ -1475,7 +1475,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowRunTimeout_Succe s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowExecutionTimeout_Pending() { @@ -1607,7 +1607,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowExecutionTimeout s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessRetryTimeout() { @@ -1650,7 +1650,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessRetryTimeout() { s.mockShard.SetCurrentTime(s.clusterName, s.now) resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityRetryTimer_Noop() { @@ -1718,7 +1718,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityRetryTimer_Noop( EventID: scheduledEvent.GetEventId(), } resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) timerTask = &tasks.ActivityRetryTimerTask{ WorkflowKey: definition.NewWorkflowKey( @@ -1748,7 +1748,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityRetryTimer_Noop( EventID: scheduledEvent.GetEventId(), } resp = s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityRetryTimer_ActivityCompleted() { @@ -1817,7 +1817,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityRetryTimer_Activ EventID: scheduledEvent.GetEventId(), } resp := s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityRetryTimer_Pending() { @@ -1912,7 +1912,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityRetryTimer_Pendi ).Return(&matchingservice.AddActivityTaskResponse{}, nil) resp = s.timerQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *timerQueueStandbyTaskExecutorSuite) TestExecuteStateMachineTimerTask_ExecutesAllAvailableTimers() { @@ -2036,7 +2036,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestExecuteStateMachineTimerTask_Ex err = timerQueueStandbyTaskExecutor.executeStateMachineTimerTask(context.Background(), task) s.NoError(err) - s.Equal(1, len(info.StateMachineTimers)) + s.Len(info.StateMachineTimers, 1) s.Equal(futureDeadline, info.StateMachineTimers[0].Deadline.AsTime()) } @@ -2146,7 +2146,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestExecuteStateMachineTimerTask_Va err = timerQueueStandbyTaskExecutor.executeStateMachineTimerTask(context.Background(), task) s.ErrorIs(err, consts.ErrTaskRetry) - s.Equal(1, len(info.StateMachineTimers)) + s.Len(info.StateMachineTimers, 1) } func (s *timerQueueStandbyTaskExecutorSuite) TestExecuteStateMachineTimerTask_StaleStateMachine() { @@ -2251,7 +2251,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestExecuteStateMachineTimerTask_St err = timerQueueStandbyTaskExecutor.executeStateMachineTimerTask(context.Background(), task) s.ErrorIs(err, consts.ErrTaskRetry) - s.Equal(2, len(info.StateMachineTimers)) + s.Len(info.StateMachineTimers, 2) } func (s *timerQueueStandbyTaskExecutorSuite) TestExecuteStateMachineTimerTask_ZombieWorkflow() { diff --git a/service/history/transfer_queue_active_task_executor_test.go b/service/history/transfer_queue_active_task_executor_test.go index 0a7f0eb824c..7016b2308b9 100644 --- a/service/history/transfer_queue_active_task_executor_test.go +++ b/service/history/transfer_queue_active_task_executor_test.go @@ -2159,7 +2159,7 @@ func (s *transferQueueActiveTaskExecutorSuite) TestProcessStartChildExecution_Su return nil, err } s.NoError(err) - s.True(cmpResult <= 0) + s.LessOrEqual(cmpResult, 0) return &historyservice.ScheduleWorkflowTaskResponse{}, nil }, ) @@ -2398,7 +2398,7 @@ func (s *transferQueueActiveTaskExecutorSuite) TestProcessStartChildExecution_Re return nil, err } s.NoError(err) - s.True(cmpResult <= 0) + s.LessOrEqual(cmpResult, 0) return &historyservice.ScheduleWorkflowTaskResponse{}, nil }, ) @@ -2657,7 +2657,7 @@ func (s *transferQueueActiveTaskExecutorSuite) TestProcessStartChildExecution_Su return nil, err } s.NoError(err) - s.True(cmpResult <= 0) + s.LessOrEqual(cmpResult, 0) return &historyservice.ScheduleWorkflowTaskResponse{}, nil }, ) @@ -2844,7 +2844,7 @@ func (s *transferQueueActiveTaskExecutorSuite) TestProcessorStartChildExecution_ return nil, err } s.NoError(err) - s.True(cmpResult <= 0) + s.LessOrEqual(cmpResult, 0) return &historyservice.ScheduleWorkflowTaskResponse{}, nil }, ) @@ -3004,7 +3004,7 @@ func (s *transferQueueActiveTaskExecutorSuite) TestPendingCloseExecutionTasks() s.NoError(resp.ExecutionErr) } else { s.Error(resp.ExecutionErr) - s.Assert().ErrorIs(resp.ExecutionErr, consts.ErrDependencyTaskNotCompleted) + s.ErrorIs(resp.ExecutionErr, consts.ErrDependencyTaskNotCompleted) } }) } diff --git a/service/history/transfer_queue_standby_task_executor_test.go b/service/history/transfer_queue_standby_task_executor_test.go index 1f0e20a852e..69936f90832 100644 --- a/service/history/transfer_queue_standby_task_executor_test.go +++ b/service/history/transfer_queue_standby_task_executor_test.go @@ -282,7 +282,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessActivityTask_Pending( s.mockShard.SetCurrentTime(s.clusterName, now.Add(s.discardDuration)) s.mockMatchingClient.EXPECT().AddActivityTask(gomock.Any(), gomock.Any(), gomock.Any()).Return(&matchingservice.AddActivityTaskResponse{}, nil) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestExecuteChasmSideEffectTransferTask_ExecutesTask() { @@ -435,7 +435,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessActivityTask_Success( s.mockShard.SetCurrentTime(s.clusterName, now) resp := s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestProcessActivityTask_Paused() { @@ -558,7 +558,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessWorkflowTask_Pending( s.mockShard.SetCurrentTime(s.clusterName, now.Add(s.discardDuration)) s.mockMatchingClient.EXPECT().AddWorkflowTask(gomock.Any(), gomock.Any(), gomock.Any()).Return(&matchingservice.AddWorkflowTaskResponse{}, nil) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestProcessWorkflowTask_Success_FirstWorkflowTask() { @@ -610,7 +610,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessWorkflowTask_Success_ s.mockShard.SetCurrentTime(s.clusterName, now) resp := s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestProcessWorkflowTask_Success_NonFirstWorkflowTask() { @@ -667,7 +667,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessWorkflowTask_Success_ s.mockShard.SetCurrentTime(s.clusterName, now) resp := s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestProcessWorkflowTask_StampMismatch() { @@ -819,7 +819,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessCloseExecution() { s.mockShard.SetCurrentTime(s.clusterName, now) s.mockHistoryClient.EXPECT().VerifyChildExecutionCompletionRecorded(gomock.Any(), expectedVerificationRequest).Return(nil, nil) resp := s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) s.mockHistoryClient.EXPECT().VerifyChildExecutionCompletionRecorded(gomock.Any(), expectedVerificationRequest).Return(nil, consts.ErrWorkflowExecutionNotFound) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) @@ -831,14 +831,14 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessCloseExecution() { s.mockHistoryClient.EXPECT().VerifyChildExecutionCompletionRecorded(gomock.Any(), expectedVerificationRequest).Return(nil, serviceerror.NewUnimplemented("not implemented")) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) s.mockHistoryClient.EXPECT().VerifyChildExecutionCompletionRecorded(gomock.Any(), expectedVerificationRequest).Return(nil, consts.ErrResourceExhaustedBusyWorkflow) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) var verificationErr *verificationErr - s.True(errors.As(resp.ExecutionErr, &verificationErr)) + s.ErrorAs(resp.ExecutionErr, &verificationErr) var resourceExhaustedErr *serviceerror.ResourceExhausted - s.True(errors.As(resp.ExecutionErr, &resourceExhaustedErr)) + s.ErrorAs(resp.ExecutionErr, &resourceExhaustedErr) s.mockShard.SetCurrentTime(s.clusterName, now.Add(s.localVerificationDuration)) s.mockHistoryClient.EXPECT().VerifyChildExecutionCompletionRecorded(gomock.Any(), expectedVerificationWithResendParentRequest).Return(nil, consts.ErrWorkflowNotReady) @@ -987,7 +987,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessCancelExecution_Succe s.mockShard.SetCurrentTime(s.clusterName, now) resp := s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestProcessSignalExecution_Pending() { @@ -1119,7 +1119,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessSignalExecution_Succe s.mockShard.SetCurrentTime(s.clusterName, now) resp := s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_Pending() { @@ -1193,7 +1193,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_P s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, nil) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, consts.ErrWorkflowNotReady) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) @@ -1205,14 +1205,14 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_P s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, &serviceerror.Unimplemented{}) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, consts.ErrResourceExhaustedBusyWorkflow) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) var verificationErr *verificationErr - s.True(errors.As(resp.ExecutionErr, &verificationErr)) + s.ErrorAs(resp.ExecutionErr, &verificationErr) var resourceExhaustedErr *serviceerror.ResourceExhausted - s.True(errors.As(resp.ExecutionErr, &resourceExhaustedErr)) + s.ErrorAs(resp.ExecutionErr, &resourceExhaustedErr) s.mockShard.SetCurrentTime(s.clusterName, now.Add(s.discardDuration)) s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, &serviceerror.WorkflowNotReady{}) @@ -1227,7 +1227,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_P s.mockHistoryClient.EXPECT().VerifyFirstWorkflowTaskScheduled(gomock.Any(), gomock.Any()).Return(nil, nil) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_Success() { @@ -1291,7 +1291,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_S s.mockShard.SetCurrentTime(s.clusterName, now) resp := s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) // workflow closed && child started && parent close policy is abandon event, err = mutableState.AddTimeoutWorkflowEvent( @@ -1307,7 +1307,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_S s.mockShard.SetCurrentTime(s.clusterName, now) resp = s.transferQueueStandbyTaskExecutor.Execute(context.Background(), s.newTaskExecutable(transferTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *transferQueueStandbyTaskExecutorSuite) createPersistenceMutableState( diff --git a/service/history/visibility_queue_task_executor_test.go b/service/history/visibility_queue_task_executor_test.go index 36427b50df3..ac60c0069ea 100644 --- a/service/history/visibility_queue_task_executor_test.go +++ b/service/history/visibility_queue_task_executor_test.go @@ -235,7 +235,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecution() { }, }, ) - s.Nil(err) + s.NoError(err) wt := addWorkflowTaskScheduledEvent(mutableState) event := addWorkflowTaskStartedEvent(mutableState, wt.ScheduledEventID, taskQueueName, uuid.NewString()) @@ -274,7 +274,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecution() { ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecutionWithWorkflowClosedCleanup() { @@ -321,7 +321,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecutionWithWorkflow }, }, ) - s.Nil(err) + s.NoError(err) wt := addWorkflowTaskScheduledEvent(mutableState) event := addWorkflowTaskStartedEvent(mutableState, wt.ScheduledEventID, taskQueueName, uuid.NewString()) @@ -361,7 +361,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecutionWithWorkflow ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessRecordWorkflowStartedTask() { @@ -391,7 +391,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessRecordWorkflowStartedTask( FirstWorkflowTaskBackoff: durationpb.New(backoff), }, ) - s.Nil(err) + s.NoError(err) taskID := int64(59) wt := addWorkflowTaskScheduledEvent(mutableState) @@ -415,7 +415,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessRecordWorkflowStartedTask( ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessUpsertWorkflowSearchAttributes() { @@ -463,7 +463,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessUpsertWorkflowSearchAttrib ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessModifyWorkflowProperties() { @@ -531,7 +531,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessModifyWorkflowProperties() context.Background(), s.newTaskExecutable(visibilityTask), ) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessDeleteExecution() { @@ -545,7 +545,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessDeleteExecution() { WorkflowKey: workflowKey, CloseExecutionVisibilityTaskID: 0, }) - s.Assert().NoError(err) + s.NoError(err) }) s.Run("WorkflowCloseTime=1970-01-01T00:00:00Z", func() { s.mockVisibilityMgr.EXPECT().DeleteWorkflowExecution(gomock.Any(), gomock.Any()) @@ -553,7 +553,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessDeleteExecution() { WorkflowKey: workflowKey, CloseTime: time.Unix(0, 0).UTC(), }) - s.Assert().NoError(err) + s.NoError(err) }) s.Run("MultiCursorQueue", func() { const highWatermark int64 = 5 @@ -596,7 +596,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_InvalidTask() { s.mockExecutionMgr.EXPECT().GetWorkflowExecution(gomock.Any(), gomock.Any()).Return(&persistence.GetWorkflowExecutionResponse{State: mutableState}, nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) // Case 2: invalid task with a different initial versioned transition componentInitVT := mutableState.ChasmNodes["Visibility"].Metadata.InitialVersionedTransition @@ -607,7 +607,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_InvalidTask() { } resp = s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_RunningExecution() { @@ -658,7 +658,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_RunningExecution ) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_ClosedExecution() { @@ -691,7 +691,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_ClosedExecution( ) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.Nil(resp.ExecutionErr) + s.NoError(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) buildChasmMutableState( diff --git a/service/history/workflow/activity_test.go b/service/history/workflow/activity_test.go index bd32194a10a..a6d0ddf4735 100644 --- a/service/history/workflow/activity_test.go +++ b/service/history/workflow/activity_test.go @@ -215,7 +215,7 @@ func (s *activitySuite) TestGetPendingActivityInfo_ActivityState() { s.NoError(err) s.NotNil(pi) - s.Equal(tc.expectedState, pi.State, fmt.Sprintf("failed for paused: %v, cancelRequested: %v, startedEventId: %v", tc.paused, tc.cancelRequested, tc.startedEventId)) + s.Equal(tc.expectedState, pi.State, "failed for paused: %v, cancelRequested: %v, startedEventId: %v", tc.paused, tc.cancelRequested, tc.startedEventId) } } @@ -339,8 +339,8 @@ func (s *activitySuite) TestResetPausedActivityAcceptance() { s.NoError(err) s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") s.NotNil(ai.PauseInfo) - s.Equal(ai.PauseInfo.GetManual().Identity, "test_identity") - s.Equal(ai.PauseInfo.GetManual().Reason, "test_reason") + s.Equal("test_identity", ai.PauseInfo.GetManual().Identity) + s.Equal("test_reason", ai.PauseInfo.GetManual().Reason) prevStamp = ai.Stamp err = ResetActivity(context.Background(), s.mockShard, s.mutableState, ai.ActivityId, @@ -369,8 +369,8 @@ func (s *activitySuite) TestResetAndUnPauseActivityAcceptance() { s.NoError(err) s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") s.NotNil(ai.PauseInfo) - s.Equal(ai.PauseInfo.GetManual().Identity, "test_identity") - s.Equal(ai.PauseInfo.GetManual().Reason, "test_reason") + s.Equal("test_identity", ai.PauseInfo.GetManual().Identity) + s.Equal("test_reason", ai.PauseInfo.GetManual().Reason) prevStamp = ai.Stamp err = ResetActivity(context.Background(), s.mockShard, s.mutableState, ai.ActivityId, @@ -391,14 +391,14 @@ func (s *activitySuite) TestUnpauseActivityWithResumeAcceptance() { s.Equal(int32(1), ai.Attempt, "ActivityInfo.Attempt is shouldn't change") s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") - s.Equal(true, ai.Paused, "ActivityInfo.Paused was not unpaused") + s.True(ai.Paused, "ActivityInfo.Paused was not unpaused") prevStamp = ai.Stamp _, err = UnpauseActivityWithResume(s.mockShard, s.mutableState, ai, false, 0) s.NoError(err) s.Equal(int32(1), ai.Attempt, "ActivityInfo.Attempt is shouldn't change") s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") - s.Equal(false, ai.Paused, "ActivityInfo.Paused was not unpaused") + s.False(ai.Paused, "ActivityInfo.Paused was not unpaused") } func (s *activitySuite) TestUnpauseActivityWithNewRun() { @@ -410,7 +410,7 @@ func (s *activitySuite) TestUnpauseActivityWithNewRun() { s.Equal(int32(1), ai.Attempt, "ActivityInfo.Attempt is shouldn't change") s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") - s.Equal(true, ai.Paused, "ActivityInfo.Paused was not unpaused") + s.True(ai.Paused, "ActivityInfo.Paused was not unpaused") prevStamp = ai.Stamp fakeScheduledTime := time.Now().UTC().Add(5 * time.Minute) ai.ScheduledTime = timestamppb.New(fakeScheduledTime) @@ -421,7 +421,7 @@ func (s *activitySuite) TestUnpauseActivityWithNewRun() { s.NotEqual(fakeScheduledTime, ai.ScheduledTime.AsTime()) s.Equal(int32(1), ai.Attempt, "ActivityInfo.Attempt is shouldn't change") s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") - s.Equal(false, ai.Paused, "ActivityInfo.Paused was not unpaused") + s.False(ai.Paused, "ActivityInfo.Paused was not unpaused") } func (s *activitySuite) TestUnpauseActivityWithResetAcceptance() { @@ -438,17 +438,17 @@ func (s *activitySuite) TestUnpauseActivityWithResetAcceptance() { err := PauseActivity(s.mutableState, ai.ActivityId, pauseInfo) s.NoError(err) s.NotNil(ai.PauseInfo) - s.Equal(ai.PauseInfo.GetRuleId(), "rule_id") + s.Equal("rule_id", ai.PauseInfo.GetRuleId()) s.Equal(int32(1), ai.Attempt, "ActivityInfo.Attempt is shouldn't change") s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") - s.Equal(true, ai.Paused, "ActivityInfo.Paused was not unpaused") + s.True(ai.Paused, "ActivityInfo.Paused was not unpaused") prevStamp = ai.Stamp _, err = UnpauseActivityWithReset(s.mockShard, s.mutableState, ai, false, true, 0) s.NoError(err) s.Equal(int32(1), ai.Attempt, "ActivityInfo.Attempt is shouldn't change") - s.Equal(false, ai.Paused, "ActivityInfo.Paused was not unpaused") + s.False(ai.Paused, "ActivityInfo.Paused was not unpaused") s.NotEqual(prevStamp, ai.Stamp, "ActivityInfo.Stamp should change") s.Nil(ai.LastHeartbeatUpdateTime) s.Nil(ai.LastHeartbeatDetails) diff --git a/service/history/workflow/cache/cache_test.go b/service/history/workflow/cache/cache_test.go index c940b2715a4..dbd9937888d 100644 --- a/service/history/workflow/cache/cache_test.go +++ b/service/history/workflow/cache/cache_test.go @@ -221,7 +221,7 @@ func (s *workflowCacheSuite) TestHistoryCachePinning() { locks.PriorityHigh, ) s.NoError(err4) - s.False(ctx == newContext) + s.NotEqual(ctx, newContext) release(err4) } diff --git a/service/history/workflow/mutable_state_impl_test.go b/service/history/workflow/mutable_state_impl_test.go index 6f5b9be7b79..8ae8df20184 100644 --- a/service/history/workflow/mutable_state_impl_test.go +++ b/service/history/workflow/mutable_state_impl_test.go @@ -437,8 +437,8 @@ func (s *mutableStateSuite) TestRedirectInfoValidation_Sticky() { 0, ) s.NoError(err) - s.Equal("", wft.BuildId) - s.Equal("", e.GetWorkflowTaskStartedEventAttributes().GetWorkerVersion().GetBuildId()) + s.Empty(wft.BuildId) + s.Empty(e.GetWorkflowTaskStartedEventAttributes().GetWorkerVersion().GetBuildId()) s.Equal("b1", s.mutableState.GetAssignedBuildId()) s.Equal(int64(0), wft.BuildIdRedirectCounter) s.Equal(int64(0), s.mutableState.GetExecutionInfo().GetBuildIdRedirectCounter()) @@ -571,7 +571,7 @@ func (s *mutableStateSuite) TestPopulateDeleteTasks_WithWorkflowTaskTimeouts() { // Verify that BestEffortDeleteTasks contains the timeout task keys del := s.mutableState.BestEffortDeleteTasks s.Contains(del, tasks.CategoryTimer) - s.Equal(2, len(del[tasks.CategoryTimer]), "Should have both ScheduleToStart and StartToClose timeout tasks") + s.Len(del[tasks.CategoryTimer], 2, "Should have both ScheduleToStart and StartToClose timeout tasks") s.Contains(del[tasks.CategoryTimer], mockScheduleToStartTask.GetKey()) s.Contains(del[tasks.CategoryTimer], mockStartToCloseTask.GetKey()) } @@ -645,7 +645,7 @@ func (s *mutableStateSuite) TestPopulateDeleteTasks_LongTimeout_NotIncluded() { // Verify that BestEffortDeleteTasks does NOT contain the long timeout task del := s.mutableState.BestEffortDeleteTasks if timerTasks, exists := del[tasks.CategoryTimer]; exists { - s.Equal(0, len(timerTasks), "Tasks with timeout > 120s should not be added to BestEffortDeleteTasks") + s.Empty(timerTasks, "Tasks with timeout > 120s should not be added to BestEffortDeleteTasks") } } @@ -1389,14 +1389,14 @@ func (s *mutableStateSuite) TestChecksum() { s.mutableState, err = NewMutableStateFromDB(s.mockShard, s.mockEventsCache, s.logger, tests.LocalNamespaceEntry, dbState, 123) s.NoError(err) s.Equal(loadErrors, loadErrorsFunc()) // no errors expected - s.EqualValues(dbState.Checksum, s.mutableState.checksum) + s.Equal(dbState.Checksum, s.mutableState.checksum) s.mutableState.namespaceEntry = s.newNamespaceCacheEntry() csum, err := tc.closeTxFunc(s.mutableState) - s.Nil(err) + s.NoError(err) s.NotNil(csum.Value) s.Equal(enumsspb.CHECKSUM_FLAVOR_IEEE_CRC32_OVER_PROTO3_BINARY, csum.Flavor) s.Equal(mutableStateChecksumPayloadV1, csum.Version) - s.EqualValues(csum, s.mutableState.checksum) + s.Equal(csum, s.mutableState.checksum) // verify checksum is verified on Load dbState.Checksum = csum @@ -1406,7 +1406,7 @@ func (s *mutableStateSuite) TestChecksum() { // generate checksum again and verify its the same csum, err = tc.closeTxFunc(s.mutableState) - s.Nil(err) + s.NoError(err) s.NotNil(csum.Value) s.Equal(dbState.Checksum.Value, csum.Value) @@ -1415,7 +1415,7 @@ func (s *mutableStateSuite) TestChecksum() { s.mutableState, err = NewMutableStateFromDB(s.mockShard, s.mockEventsCache, s.logger, tests.LocalNamespaceEntry, dbState, 123) s.NoError(err) s.Equal(loadErrors+1, loadErrorsFunc()) - s.EqualValues(dbState.Checksum, s.mutableState.checksum) + s.Equal(dbState.Checksum, s.mutableState.checksum) // test checksum is invalidated loadErrors = loadErrorsFunc() @@ -1904,20 +1904,20 @@ func (s *mutableStateSuite) TestContinueAsNewMinBackoff() { // with no backoff, verify min backoff is in [3s, 5s] minBackoff := s.mutableState.ContinueAsNewMinBackoff(nil).AsDuration() s.NotZero(minBackoff) - s.True(minBackoff >= 3*time.Second) - s.True(minBackoff <= 5*time.Second) + s.GreaterOrEqual(minBackoff, 3*time.Second) + s.LessOrEqual(minBackoff, 5*time.Second) // with 2s backoff, verify min backoff is in [3s, 5s] minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(time.Second * 2)).AsDuration() s.NotZero(minBackoff) - s.True(minBackoff >= 3*time.Second) - s.True(minBackoff <= 5*time.Second) + s.GreaterOrEqual(minBackoff, 3*time.Second) + s.LessOrEqual(minBackoff, 5*time.Second) // with 6s backoff, verify min backoff unchanged backoff := time.Second * 6 minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(backoff)).AsDuration() s.NotZero(minBackoff) - s.True(minBackoff == backoff) + s.Equal(minBackoff, backoff) // set start time to be 3s ago startTime := timestamppb.New(time.Now().Add(-time.Second * 3)) @@ -1927,13 +1927,13 @@ func (s *mutableStateSuite) TestContinueAsNewMinBackoff() { // with no backoff, verify min backoff is in [0, 2s] minBackoff = s.mutableState.ContinueAsNewMinBackoff(nil).AsDuration() s.NotNil(minBackoff) - s.True(minBackoff >= 0) - s.True(minBackoff <= 2*time.Second, "%v\n", minBackoff) + s.GreaterOrEqual(minBackoff, 0) + s.LessOrEqual(minBackoff, 2*time.Second, "%v\n", minBackoff) // with 2s backoff, verify min backoff not changed backoff = time.Second * 2 minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(backoff)).AsDuration() - s.True(minBackoff == backoff) + s.Equal(minBackoff, backoff) // set start time to be 5s ago startTime = timestamppb.New(time.Now().Add(-time.Second * 5)) @@ -1947,7 +1947,7 @@ func (s *mutableStateSuite) TestContinueAsNewMinBackoff() { // with 2s backoff, verify backoff unchanged backoff = time.Second * 2 minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(backoff)).AsDuration() - s.True(minBackoff == backoff) + s.Equal(minBackoff, backoff) } func (s *mutableStateSuite) TestEventReapplied() { @@ -2049,8 +2049,8 @@ func (s *mutableStateSuite) TestTransientWorkflowTaskStart_CurrentVersionChanged mutation, err := s.mutableState.hBuilder.Finish(true) s.NoError(err) - s.Equal(1, len(mutation.DBEventsBatches)) - s.Equal(2, len(mutation.DBEventsBatches[0])) + s.Len(mutation.DBEventsBatches, 1) + s.Len(mutation.DBEventsBatches[0], 2) attrs := mutation.DBEventsBatches[0][0].GetWorkflowTaskScheduledEventAttributes() s.NotNil(attrs) s.Equal("tq", attrs.TaskQueue.Name) @@ -2229,7 +2229,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl uuid.NewString(), workflowStartEvent, ) - s.Nil(err) + s.NoError(err) // setup transient workflow task wt, err := s.mutableState.ApplyWorkflowTaskScheduledEvent( @@ -2242,7 +2242,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl nil, enumsspb.WORKFLOW_TASK_TYPE_NORMAL, ) - s.Nil(err) + s.NoError(err) s.NotNil(wt) wt, err = s.mutableState.ApplyWorkflowTaskStartedEvent( @@ -2258,11 +2258,11 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl int64(0), nil, ) - s.Nil(err) + s.NoError(err) s.NotNil(wt) err = s.mutableState.ApplyWorkflowTaskFailedEvent() - s.Nil(err) + s.NoError(err) workflowTaskAttempt = int32(123) newWorkflowTaskScheduleEvent := &historypb.HistoryEvent{ @@ -2300,7 +2300,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl nil, enumsspb.WORKFLOW_TASK_TYPE_NORMAL, ) - s.Nil(err) + s.NoError(err) s.NotNil(wt) wt, err = s.mutableState.ApplyWorkflowTaskStartedEvent( @@ -2316,7 +2316,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl int64(0), nil, ) - s.Nil(err) + s.NoError(err) s.NotNil(wt) s.mutableState.SetHistoryBuilder(historybuilder.NewImmutable([]*historypb.HistoryEvent{ @@ -2576,8 +2576,8 @@ func (s *mutableStateSuite) TestUpdateInfos() { numAccepted++ } }) - s.Equal(numCompleted, 1, "expected 1 completed") - s.Equal(numAccepted, 1, "expected 1 accepted") + s.Equal(1, numCompleted, "expected 1 completed") + s.Equal(1, numAccepted, "expected 1 accepted") s.mockShard.Resource.ClusterMetadata.EXPECT().ClusterNameForFailoverVersion( namespaceEntry.IsGlobalNamespace(), @@ -2632,12 +2632,12 @@ func (s *mutableStateSuite) TestApplyActivityTaskStartedEvent() { }, }) s.NoError(err) - s.Assert().Equal(version, ai.Version) - s.Assert().Equal(eventID, ai.StartedEventId) + s.Equal(version, ai.Version) + s.Equal(eventID, ai.StartedEventId) s.NotNil(ai.StartedTime) - s.Assert().Equal(now, ai.StartedTime.AsTime()) - s.Assert().Equal(requestID, ai.RequestId) - s.Assert().Nil(ai.LastHeartbeatDetails) + s.Equal(now, ai.StartedTime.AsTime()) + s.Equal(requestID, ai.RequestId) + s.Nil(ai.LastHeartbeatDetails) } func (s *mutableStateSuite) TestAddContinueAsNewEvent_Default() { @@ -2841,7 +2841,7 @@ func (s *mutableStateSuite) TestSpeculativeWorkflowTaskNotPersisted() { // Normal WT is persisted as is. execInfo, err := tc.closeTxFunc(s.mutableState) - s.Nil(err) + s.NoError(err) s.Equal(enumsspb.WORKFLOW_TASK_TYPE_NORMAL, execInfo.WorkflowTaskType) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskScheduledEventId) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskStartedEventId) @@ -2850,7 +2850,7 @@ func (s *mutableStateSuite) TestSpeculativeWorkflowTaskNotPersisted() { // Speculative WT is converted to normal. execInfo, err = tc.closeTxFunc(s.mutableState) - s.Nil(err) + s.NoError(err) s.Equal(enumsspb.WORKFLOW_TASK_TYPE_NORMAL, execInfo.WorkflowTaskType) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskScheduledEventId) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskStartedEventId) @@ -2873,7 +2873,7 @@ func (s *mutableStateSuite) TestRetryWorkflowTask_WithNextRetryDelay() { duration, retryState := s.mutableState.GetRetryBackoffDuration(applicationFailure) s.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState) - s.Equal(duration, expectedDelayDuration) + s.Equal(expectedDelayDuration, duration) } func (s *mutableStateSuite) TestRetryActivity_TruncateRetryableFailure() { s.mockEventsCache.EXPECT().PutEvent(gomock.Any(), gomock.Any()).AnyTimes() @@ -3441,7 +3441,7 @@ func (s *mutableStateSuite) TestCloseTransactionUpdateTransition() { } execInfo, err := tc.txFunc(s.mutableState) - s.Nil(err) + s.NoError(err) protorequire.ProtoSliceEqual(t, expectedTransitionHistory, execInfo.TransitionHistory) }) @@ -3936,7 +3936,7 @@ func (s *mutableStateSuite) TestCloseTransactionHandleUnknownVersionedTransition execInfo, err := tc.txFunc(s.mutableState) s.NotNil(execInfo.PreviousTransitionHistory) s.Nil(execInfo.TransitionHistory) - s.Nil(err) + s.NoError(err) }) } } @@ -4121,7 +4121,7 @@ func (s *mutableStateSuite) TestCollapseVisibilityTasks() { ms.AddTasks(tc.tasks...) ms.closeTransactionCollapseVisibilityTasks() visTasks := ms.InsertTasks[tasks.CategoryVisibility] - s.Equal(len(tc.res), len(visTasks)) + s.Len(visTasks, len(tc.res)) for i, expectTaskType := range tc.res { s.Equal(expectTaskType, visTasks[i].GetType()) } @@ -4391,7 +4391,7 @@ func (s *mutableStateSuite) TestCloseTransactionPrepareReplicationTasks_HistoryT s.Fail("closeTransactionPrepareReplicationTasks failed", err) } repicationTasks := ms.InsertTasks[tasks.CategoryReplication] - s.Equal(len(tc.tasks), len(repicationTasks)) + s.Len(repicationTasks, len(tc.tasks)) for i, task := range tc.tasks { s.Equal(task, repicationTasks[i]) } @@ -4457,7 +4457,7 @@ func (s *mutableStateSuite) TestCloseTransactionPrepareReplicationTasks_SyncVers err := ms.closeTransactionPrepareReplicationTasks(historyi.TransactionPolicyActive, eventBatches, false) s.NoError(err) replicationTasks := ms.InsertTasks[tasks.CategoryReplication] - s.Equal(1, len(replicationTasks)) + s.Len(replicationTasks, 1) historyTasks := []tasks.Task{ &tasks.HistoryReplicationTask{ WorkflowKey: s.mutableState.GetWorkflowKey(), @@ -4487,7 +4487,7 @@ func (s *mutableStateSuite) TestCloseTransactionPrepareReplicationTasks_SyncVers s.Equal(expectedTask.WorkflowKey, actualTask.WorkflowKey) s.Equal(expectedTask.VersionedTransition, actualTask.VersionedTransition) s.Equal(expectedTask.ArchetypeID, actualTask.ArchetypeID) - s.Equal(3, len(actualTask.TaskEquivalents)) + s.Len(actualTask.TaskEquivalents, 3) s.Equal(historyTasks[0], actualTask.TaskEquivalents[0]) s.Equal(historyTasks[1], actualTask.TaskEquivalents[1]) s.Equal(enumsspb.TASK_TYPE_REPLICATION_SYNC_ACTIVITY, actualTask.TaskEquivalents[2].GetType()) @@ -4992,7 +4992,7 @@ func (s *mutableStateSuite) TestCloseTransactionTrackTombstones_CapIfLargerThanL s.NoError(err) tombstoneBatches := mutableState.GetExecutionInfo().SubStateMachineTombstoneBatches - s.Len(tombstoneBatches, 0) + s.Empty(tombstoneBatches) } func (s *mutableStateSuite) TestCloseTransactionTrackTombstones_OnlyTrackFirstEmpty() { @@ -5162,7 +5162,7 @@ func (s *mutableStateSuite) TestExecutionInfoClone() { &info.NamespaceId, } }) - s.Nil(err) + s.NoError(err) } func (s *mutableStateSuite) addChangesForStateReplication(state *persistencespb.WorkflowMutableState) { @@ -5190,14 +5190,14 @@ func (s *mutableStateSuite) addChangesForStateReplication(state *persistencespb. } func compareMapOfProto[K comparable, V proto.Message](s *mutableStateSuite, expected, actual map[K]V) { - s.Equal(len(expected), len(actual)) + s.Len(actual, len(expected)) for k, v := range expected { s.True(proto.Equal(v, actual[k])) } } func (s *mutableStateSuite) verifyChildExecutionInfos(expectedMap, actualMap, originMap map[int64]*persistencespb.ChildExecutionInfo) { - s.Equal(len(expectedMap), len(actualMap)) + s.Len(actualMap, len(expectedMap)) for k, expected := range expectedMap { actual, ok := actualMap[k] s.True(ok) @@ -5224,7 +5224,7 @@ func (s *mutableStateSuite) verifyChildExecutionInfos(expectedMap, actualMap, or } func (s *mutableStateSuite) verifyActivityInfos(expectedMap, actualMap map[int64]*persistencespb.ActivityInfo) { - s.Equal(len(expectedMap), len(actualMap)) + s.Len(actualMap, len(expectedMap)) for k, expected := range expectedMap { actual, ok := actualMap[k] s.True(ok) diff --git a/service/history/workflow/mutable_state_rebuilder_test.go b/service/history/workflow/mutable_state_rebuilder_test.go index e134c908ef4..02fd09ffc44 100644 --- a/service/history/workflow/mutable_state_rebuilder_test.go +++ b/service/history/workflow/mutable_state_rebuilder_test.go @@ -201,7 +201,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionStarted_No s.mockMutableState.EXPECT().SetHistoryTree(nil, timestamp.DurationFromSeconds(100), tests.RunID).Return(nil) _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -250,7 +250,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionStarted_Wi s.mockMutableState.EXPECT().SetHistoryTree(nil, timestamp.DurationFromSeconds(100), tests.RunID).Return(nil) _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -283,7 +283,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionTimedOut() s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -347,7 +347,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionTimedOut_W s.mockMutableState.EXPECT().ClearStickyTaskQueue() newRunStateBuilder, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), newRunEvents, newRunID) - s.Nil(err) + s.NoError(err) s.NotNil(newRunStateBuilder) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) @@ -384,7 +384,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionTerminated ).Return(nil) s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -442,7 +442,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionTerminated s.mockMutableState.EXPECT().ClearStickyTaskQueue() newRunStateBuilder, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), newRunEvents, uuid.NewString()) - s.Nil(err) + s.NoError(err) s.NotNil(newRunStateBuilder) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) @@ -480,7 +480,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionFailed() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -544,7 +544,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionFailed_Wit s.mockMutableState.EXPECT().ClearStickyTaskQueue() newRunStateBuilder, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), newRunEvents, newRunID) - s.Nil(err) + s.NoError(err) s.NotNil(newRunStateBuilder) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) @@ -582,7 +582,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionCompleted( s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -645,12 +645,12 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionCompleted_ s.mockMutableState.EXPECT().ClearStickyTaskQueue() newRunStateBuilder, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), newRunEvents, newRunID) - s.Nil(err) + s.NoError(err) s.NotNil(newRunStateBuilder) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) newRunTasks := newRunStateBuilder.PopTasks() - s.Len(newRunTasks[tasks.CategoryTimer], 0) + s.Empty(newRunTasks[tasks.CategoryTimer]) s.Len(newRunTasks[tasks.CategoryVisibility], 1) // recordWorkflowStarted } @@ -683,7 +683,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionCanceled() s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -796,7 +796,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionContinuedA newRunStateBuilder, err := s.stateRebuilder.ApplyEvents( context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(continueAsNewEvent), newRunEvents, "", ) - s.Nil(err) + s.NoError(err) s.NotNil(newRunStateBuilder) s.Equal(continueAsNewEvent.TaskId, s.executionInfo.LastRunningClock) @@ -846,7 +846,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionContinuedA newRunStateBuilder, err := s.stateRebuilder.ApplyEvents( context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(continueAsNewEvent), nil, "", ) - s.Nil(err) + s.NoError(err) s.Nil(newRunStateBuilder) s.Equal(continueAsNewEvent.TaskId, s.executionInfo.LastRunningClock) } @@ -875,7 +875,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionSignaled() s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -903,7 +903,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowExecutionCancelRequ s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -934,7 +934,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeUpsertWorkflowSearchAttribu s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -965,7 +965,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowPropertiesModified( s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -992,7 +992,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeMarkerRecorded() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1044,7 +1044,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowTaskScheduled() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowTaskStarted() { @@ -1093,7 +1093,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowTaskStarted() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1138,7 +1138,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowTaskTimedOut() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1182,7 +1182,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowTaskFailed() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1215,7 +1215,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeWorkflowTaskCompleted() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1260,7 +1260,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeTimerStarted() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1291,7 +1291,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeTimerFired() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1322,7 +1322,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeTimerCanceled() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1380,7 +1380,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeActivityTaskScheduled() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1423,7 +1423,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeActivityTaskStarted() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(startedEvent), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(startedEvent.TaskId, s.executionInfo.LastRunningClock) } @@ -1455,7 +1455,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeActivityTaskTimedOut() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1486,7 +1486,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeActivityTaskFailed() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1517,7 +1517,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeActivityTaskCompleted() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1545,7 +1545,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeActivityTaskCancelRequested s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1576,7 +1576,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeActivityTaskCanceled() { s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1629,7 +1629,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeStartChildWorkflowExecution s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1657,7 +1657,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeStartChildWorkflowExecution s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1685,7 +1685,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeChildWorkflowExecutionStart s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1713,7 +1713,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeChildWorkflowExecutionTimed s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1741,7 +1741,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeChildWorkflowExecutionTermi s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1769,7 +1769,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeChildWorkflowExecutionFaile s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1797,7 +1797,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeChildWorkflowExecutionCompl s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1854,7 +1854,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeRequestCancelExternalWorkfl s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1882,7 +1882,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeRequestCancelExternalWorkfl s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1910,7 +1910,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeExternalWorkflowExecutionCa s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -1938,7 +1938,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeChildWorkflowExecutionCance s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -2001,7 +2001,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeSignalExternalWorkflowExecu s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -2029,7 +2029,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeSignalExternalWorkflowExecu s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } @@ -2057,7 +2057,7 @@ func (s *stateBuilderSuite) TestApplyEvents_EventTypeExternalWorkflowExecutionSi s.mockMutableState.EXPECT().ClearStickyTaskQueue() _, err := s.stateRebuilder.ApplyEvents(context.Background(), tests.NamespaceID, requestID, execution, s.toHistory(event), nil, "") - s.Nil(err) + s.NoError(err) s.Equal(event.TaskId, s.executionInfo.LastRunningClock) } diff --git a/service/history/workflow/query_registry_test.go b/service/history/workflow/query_registry_test.go index e626be86cd2..9a8d288e33e 100644 --- a/service/history/workflow/query_registry_test.go +++ b/service/history/workflow/query_registry_test.go @@ -162,7 +162,7 @@ func (s *QueryRegistrySuite) assertCompletedState(qr historyi.QueryRegistry, ids s.NotNil(completionState) s.Equal(QueryCompletionTypeSucceeded, completionState.Type) s.NotNil(completionState.Result) - s.Nil(completionState.Err) + s.NoError(completionState.Err) } } @@ -179,7 +179,7 @@ func (s *QueryRegistrySuite) assertUnblockedState(qr historyi.QueryRegistry, ids s.NotNil(completionState) s.Equal(QueryCompletionTypeUnblocked, completionState.Type) s.Nil(completionState.Result) - s.Nil(completionState.Err) + s.NoError(completionState.Err) } } @@ -196,7 +196,7 @@ func (s *QueryRegistrySuite) assertFailedState(qr historyi.QueryRegistry, ids .. s.NotNil(completionState) s.Equal(QueryCompletionTypeFailed, completionState.Type) s.Nil(completionState.Result) - s.NotNil(completionState.Err) + s.Error(completionState.Err) } } diff --git a/service/history/workflow/query_test.go b/service/history/workflow/query_test.go index 6715d8469e2..60b81dac02e 100644 --- a/service/history/workflow/query_test.go +++ b/service/history/workflow/query_test.go @@ -196,7 +196,7 @@ func (s *QuerySuite) assertCompletionStateEqual(expected *historyi.QueryCompleti s.Equal(expected.Err.Error(), actual.Err.Error()) } if expected.Result != nil { - s.EqualValues(actual.Result, expected.Result) + s.EqualValues(expected.Result, actual.Result) } } diff --git a/service/history/workflow/state_machine_timers_test.go b/service/history/workflow/state_machine_timers_test.go index 2c535efc1d3..e4e9ad04ee7 100644 --- a/service/history/workflow/state_machine_timers_test.go +++ b/service/history/workflow/state_machine_timers_test.go @@ -39,18 +39,18 @@ func TestTrackStateMachineTimer_MaintainsSortedSlice(t *testing.T) { workflow.TrackStateMachineTimer(ms, now.Add(time.Hour), &persistencespb.StateMachineTaskInfo{Type: "2"}) workflow.TrackStateMachineTimer(ms, now.Add(-time.Hour), &persistencespb.StateMachineTaskInfo{Type: "3"}) - require.Equal(t, 3, len(execInfo.StateMachineTimers)) + require.Len(t, execInfo.StateMachineTimers, 3) - require.Equal(t, 1, len(execInfo.StateMachineTimers[0].Infos)) + require.Len(t, execInfo.StateMachineTimers[0].Infos, 1) require.Equal(t, "3", execInfo.StateMachineTimers[0].Infos[0].Type) - require.Equal(t, 2, len(execInfo.StateMachineTimers[1].Infos)) + require.Len(t, execInfo.StateMachineTimers[1].Infos, 2) require.Equal(t, "0", execInfo.StateMachineTimers[1].Infos[0].Type) protorequire.ProtoSliceEqual(t, []*persistencespb.StateMachineKey{{Type: "t", Id: "a"}}, execInfo.StateMachineTimers[1].Infos[0].Ref.Path) require.Equal(t, "0", execInfo.StateMachineTimers[1].Infos[1].Type) protorequire.ProtoSliceEqual(t, []*persistencespb.StateMachineKey{{Type: "t", Id: "b"}}, execInfo.StateMachineTimers[1].Infos[1].Ref.Path) - require.Equal(t, 2, len(execInfo.StateMachineTimers[2].Infos)) + require.Len(t, execInfo.StateMachineTimers[2].Infos, 2) require.Equal(t, "1", execInfo.StateMachineTimers[2].Infos[0].Type) require.Equal(t, "2", execInfo.StateMachineTimers[2].Infos[1].Type) } @@ -77,7 +77,7 @@ func TestAddNextStateMachineTimerTask(t *testing.T) { workflow.AddNextStateMachineTimerTask(ms) - require.Equal(t, 1, len(scheduledTasks)) + require.Len(t, scheduledTasks, 1) task, ok := scheduledTasks[0].(*tasks.StateMachineTimerTask) require.True(t, ok) require.Equal(t, "ns-id", task.GetNamespaceID()) @@ -88,5 +88,5 @@ func TestAddNextStateMachineTimerTask(t *testing.T) { // First timer already scheduled should not generate any tasks. workflow.AddNextStateMachineTimerTask(ms) - require.Equal(t, 1, len(scheduledTasks)) + require.Len(t, scheduledTasks, 1) } diff --git a/service/history/workflow/task_generator_test.go b/service/history/workflow/task_generator_test.go index fc12c1a7030..4a8706fa7cf 100644 --- a/service/history/workflow/task_generator_test.go +++ b/service/history/workflow/task_generator_test.go @@ -400,7 +400,7 @@ func TestTaskGenerator_GenerateDirtySubStateMachineTasks(t *testing.T) { err = taskGenerator.GenerateDirtySubStateMachineTasks(reg) require.NoError(t, err) - require.Equal(t, 2, len(genTasks)) + require.Len(t, genTasks, 2) invocationTask, ok := genTasks[0].(*tasks.StateMachineOutboundTask) var backoffTask *tasks.StateMachineTimerTask if ok { @@ -441,7 +441,7 @@ func TestTaskGenerator_GenerateDirtySubStateMachineTasks(t *testing.T) { require.Equal(t, int64(3), backoffTask.Version) timers := mutableState.GetExecutionInfo().StateMachineTimers - require.Equal(t, 1, len(timers)) + require.Len(t, timers, 1) protorequire.ProtoEqual(t, &persistencespb.StateMachineTimerGroup{ Deadline: callbackToBackoff.NextAttemptScheduleTime, Scheduled: true, @@ -495,12 +495,12 @@ func TestTaskGenerator_GenerateDirtySubStateMachineTasks(t *testing.T) { // No new timer tasks are generated they are collapsed. // Only an outbound task is expected here. - require.Equal(t, 1, len(genTasks)) + require.Len(t, genTasks, 1) _, ok = genTasks[0].(*tasks.StateMachineOutboundTask) require.True(t, ok) timers = mutableState.GetExecutionInfo().StateMachineTimers - require.Equal(t, 2, len(timers)) + require.Len(t, timers, 2) protorequire.ProtoEqual(t, &persistencespb.StateMachineTaskInfo{ Ref: &persistencespb.StateMachineRef{ @@ -828,15 +828,15 @@ func TestTaskGeneratorImpl_GenerateMigrationTasks(t *testing.T) { ) resultTasks, _, err := taskGenerator.GenerateMigrationTasks(nil) require.NoError(t, err) - require.Equal(t, len(tc.expectedTaskTypes), len(resultTasks)) + require.Len(t, resultTasks, len(tc.expectedTaskTypes)) if tc.transitionHistoryEnabled { - require.Equal(t, 1, len(resultTasks)) + require.Len(t, resultTasks, 1) require.Equal(t, tc.expectedTaskTypes[0].String(), resultTasks[0].GetType().String()) syncVersionTask, ok := resultTasks[0].(*tasks.SyncVersionedTransitionTask) require.True(t, ok) require.Equal(t, chasm.WorkflowArchetypeID, syncVersionTask.GetArchetypeID()) taskEquivalent := syncVersionTask.TaskEquivalents - require.Equal(t, len(tc.expectedTaskEquivalentTypes), len(taskEquivalent)) + require.Len(t, taskEquivalent, len(tc.expectedTaskEquivalentTypes)) for i, equivalent := range taskEquivalent { require.Equal(t, tc.expectedTaskEquivalentTypes[i], equivalent.GetType()) } diff --git a/service/history/workflow/timer_sequence_test.go b/service/history/workflow/timer_sequence_test.go index 2d7aabad779..9a90b1ea3a0 100644 --- a/service/history/workflow/timer_sequence_test.go +++ b/service/history/workflow/timer_sequence_test.go @@ -825,7 +825,7 @@ func (s *timerSequenceSuite) TestLoadAndSortActivityTimers_One_Scheduled_Started s.mockMutableState.EXPECT().GetPendingActivityInfos().Return(activityInfos) timerSequenceIDs := s.timerSequence.LoadAndSortActivityTimers() - s.EqualValues([]TimerSequenceID{ + s.Equal([]TimerSequenceID{ { EventID: activityInfo.ScheduledEventId, Timestamp: activityInfo.StartedTime.AsTime().Add(activityInfo.StartToCloseTimeout.AsDuration()), diff --git a/service/history/workflow/update/abort_reason_test.go b/service/history/workflow/update/abort_reason_test.go index e35941abcba..1b7a5018f26 100644 --- a/service/history/workflow/update/abort_reason_test.go +++ b/service/history/workflow/update/abort_reason_test.go @@ -14,7 +14,7 @@ func TestAbortReasonUpdateStateMatrix(t *testing.T) { // Do not modify the test but make sure to update the reasonStateMatrix. require.True(t, ok, "Missing combination: %v, %v. If new abort reason or state is added make sure to update the reasonStateMatrix", r, st) if fe.f != nil { - require.Nil(t, fe.err) + require.NoError(t, fe.err) } if fe.err != nil { require.Nil(t, fe.f) diff --git a/service/history/workflow/update/registry_test.go b/service/history/workflow/update/registry_test.go index d07c9b72b7c..e648aa7f5fb 100644 --- a/service/history/workflow/update/registry_test.go +++ b/service/history/workflow/update/registry_test.go @@ -712,7 +712,7 @@ func TestClear(t *testing.T) { reg.Clear() wg.Wait() - require.Equal(t, reg.Len(), 0, "registry should be cleared") + require.Equal(t, 0, reg.Len(), "registry should be cleared") } func TestFailoverVersion(t *testing.T) { @@ -788,11 +788,11 @@ func TestTryResurrect(t *testing.T) { reg := update.NewRegistry(emptyUpdateStore) upd, err := reg.TryResurrect(context.Background(), nil) - require.Nil(t, err) + require.NoError(t, err) require.Nil(t, upd) upd, err = reg.TryResurrect(context.Background(), &protocolpb.Message{Body: nil}) - require.Nil(t, err) + require.NoError(t, err) require.Nil(t, upd) }) @@ -803,7 +803,7 @@ func TestTryResurrect(t *testing.T) { })} upd, err := reg.TryResurrect(context.Background(), completedMsg) - require.Nil(t, err) + require.NoError(t, err) require.Nil(t, upd) }) diff --git a/service/matching/fair_level_test.go b/service/matching/fair_level_test.go index b99f6021863..d9240841320 100644 --- a/service/matching/fair_level_test.go +++ b/service/matching/fair_level_test.go @@ -20,7 +20,7 @@ func TestFairLevelComparator(t *testing.T) { m.Put(b, nil) m.Put(c, nil) m.Put(d, nil) - assert.Equal(t, m.Keys(), []any{d, b, a, c}) + assert.Equal(t, []any{d, b, a, c}, m.Keys()) } func TestFairLevelMax(t *testing.T) { diff --git a/service/matching/matcher_data_test.go b/service/matching/matcher_data_test.go index 41a2521d83e..9aeeeff4989 100644 --- a/service/matching/matcher_data_test.go +++ b/service/matching/matcher_data_test.go @@ -154,7 +154,7 @@ func (s *MatcherDataSuite) TestMatchBacklogTask() { ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond) defer cancel() pres := s.md.EnqueuePollerAndWait([]context.Context{ctx}, poller) - s.Error(context.DeadlineExceeded, pres.ctxErr) + s.ErrorIs(context.DeadlineExceeded, pres.ctxErr) s.Equal(0, pres.ctxErrIdx) // add a task @@ -181,7 +181,7 @@ func (s *MatcherDataSuite) TestMatchBacklogTask() { ctx, cancel = context.WithTimeout(context.Background(), time.Millisecond) defer cancel() pres = s.md.EnqueuePollerAndWait([]context.Context{context.Background(), ctx}, poller) - s.Error(context.DeadlineExceeded, pres.ctxErr) + s.ErrorIs(context.DeadlineExceeded, pres.ctxErr) s.Equal(1, pres.ctxErrIdx, "deadline context was index 1") } @@ -264,7 +264,7 @@ func (s *MatcherDataSuite) TestQueryForwardNil() { resp := <-respC s.True(resp.forwarded) s.NoError(resp.forwardErr) - s.True(resp.forwardRes != nil) // typed nil + s.NotEqual(resp.forwardRes, nil) // typed nil s.Nil(resp.forwardRes.(*matchingservice.QueryWorkflowResponse)) } @@ -525,9 +525,9 @@ func (s *MatcherDataSuite) TestReprocessTasks() { return t.event.TaskId%4 == 0 }) - s.Equal(25, len(removed)) + s.Len(removed, 25) for _, t := range removed { - s.True(t.event.TaskId%4 == 0) + s.Equal(t.event.TaskId%4, 0) s.NotNil(t.matchResult) s.Equal(errReprocessTask, t.matchResult.ctxErr) } @@ -537,7 +537,7 @@ func (s *MatcherDataSuite) TestReprocessTasks() { for range 75 { t := s.pollRealTime(time.Microsecond).task s.NotNil(t) - s.False(t.event.TaskId%4 == 0) + s.NotEqual(t.event.TaskId%4, 0) s.Greater(t.event.TaskId, prev) prev = t.event.TaskId } @@ -971,7 +971,7 @@ func TestSimpleLimiterLowToHigh(t *testing.T) { 1e-8, // 1 per 1000+ days } { pLow := makeSimpleLimiterParams(lowRate, time.Second) - require.True(t, pLow.never() == (lowRate == 0)) + require.Equal(t, pLow.never(), (lowRate == 0)) now := time.Now().UnixNano() var ready simpleLimiter diff --git a/service/matching/matcher_test.go b/service/matching/matcher_test.go index d4801d8a436..4d35fef6dbd 100644 --- a/service/matching/matcher_test.go +++ b/service/matching/matcher_test.go @@ -75,7 +75,7 @@ func (t *MatcherTestSuite) SetupTest() { cfg.MaxWaitForPollerBeforeFwd = dynamicconfig.GetDurationPropertyFnFilteredByTaskQueue(10 * time.Millisecond) f, err := tqid.NewTaskQueueFamily("", "tl0") - t.Assert().NoError(err) + t.NoError(err) prtn := f.TaskQueue(enumspb.TASK_QUEUE_TYPE_WORKFLOW).NormalPartition(1) t.queue = UnversionedQueueKey(prtn) tlCfg := newTaskQueueConfig(prtn.TaskQueue(), cfg, "test-namespace") @@ -87,7 +87,7 @@ func (t *MatcherTestSuite) SetupTest() { } t.childConfig = tlCfg t.fwdr, err = newForwarder(&t.childConfig.forwarderConfig, t.queue, t.client) - t.Assert().NoError(err) + t.NoError(err) t.childMatcher = newTaskMatcher(tlCfg, t.fwdr, metrics.NoopMetricsHandler, t.newDefaultRateLimiter()) t.childMatcher.Start() @@ -249,7 +249,7 @@ func (t *MatcherTestSuite) TestRejectSyncMatchWhenBacklog() { } t.False(happened) - t.Nil(err) + t.NoError(err) newCtxCancel() // poll old task which is from the backlog @@ -278,7 +278,7 @@ func (t *MatcherTestSuite) TestForwardingWhenBacklogIsYoung() { ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) // poll forwarding attempt happens when there is no backlog _, err := t.childMatcher.Poll(ctx, &pollMetadata{}) - t.Assert().NoError(err) + t.NoError(err) cancel() }() // This ensures that the poll request has been forwarded to the parent partition before the offer is made. @@ -291,7 +291,7 @@ func (t *MatcherTestSuite) TestForwardingWhenBacklogIsYoung() { // task is not forwarded because there is a local poller waiting err := t.childMatcher.MustOffer(ctx, historyTask, intruptC) - t.Nil(err) + t.NoError(err) cancel() // young task is forwarded @@ -426,19 +426,19 @@ func (t *MatcherTestSuite) TestBacklogAge() { youngBacklogTask := newInternalTaskFromBacklog(randomTaskInfoWithAge(time.Second), nil) go t.rootMatcher.MustOffer(ctx, youngBacklogTask, intruptC) //nolint:errcheck time.Sleep(time.Millisecond * 10) //nolint:forbidigo - t.InDelta(t.rootMatcher.getBacklogAge(), time.Second, float64(100*time.Millisecond)) + t.InDelta(time.Second, t.rootMatcher.getBacklogAge(), float64(100*time.Millisecond)) middleBacklogTask := newInternalTaskFromBacklog(randomTaskInfoWithAge(time.Second), nil) // offering a task with the exact creation to make sure of correct counting for each creation time middleBacklogTask.event.Data.CreateTime = youngBacklogTask.event.Data.CreateTime go t.rootMatcher.MustOffer(ctx, middleBacklogTask, intruptC) //nolint:errcheck time.Sleep(time.Millisecond * 10) //nolint:forbidigo - t.InDelta(t.rootMatcher.getBacklogAge(), time.Second, float64(100*time.Millisecond)) + t.InDelta(time.Second, t.rootMatcher.getBacklogAge(), float64(100*time.Millisecond)) oldBacklogTask := newInternalTaskFromBacklog(randomTaskInfoWithAge(time.Minute), nil) go t.rootMatcher.MustOffer(ctx, oldBacklogTask, intruptC) //nolint:errcheck time.Sleep(time.Millisecond * 10) //nolint:forbidigo - t.InDelta(t.rootMatcher.getBacklogAge(), time.Minute, float64(100*time.Millisecond)) + t.InDelta(time.Minute, t.rootMatcher.getBacklogAge(), float64(100*time.Millisecond)) task, _ := t.rootMatcher.Poll(ctx, &pollMetadata{}) time.Sleep(time.Millisecond * 10) //nolint:forbidigo @@ -478,7 +478,7 @@ func (t *MatcherTestSuite) TestQueryNoCurrentPollersButRecentPollers() { t.client.EXPECT().PollWorkflowTaskQueue(gomock.Any(), gomock.Any(), gomock.Any()).Do( func(arg0 context.Context, arg1 *matchingservice.PollWorkflowTaskQueueRequest, arg2 ...any) { _, err := t.rootMatcher.PollForQuery(arg0, &pollMetadata{}) - t.Assert().ErrorIs(err, errNoTasks) + t.ErrorIs(err, errNoTasks) }, ).Return(emptyClientPollWorkflowTaskQueueResponse, nil).AnyTimes() @@ -495,7 +495,7 @@ func (t *MatcherTestSuite) TestQueryNoCurrentPollersButRecentPollers() { task.forwardInfo = req.GetForwardInfo() resp, err := t.rootMatcher.OfferQuery(ctx, task) t.Nil(resp) - t.Assert().ErrorIs(err, context.DeadlineExceeded) + t.ErrorIs(err, context.DeadlineExceeded) }, ).Return(nil, context.DeadlineExceeded) @@ -509,7 +509,7 @@ func (t *MatcherTestSuite) TestQueryNoRecentPoller() { t.client.EXPECT().PollWorkflowTaskQueue(gomock.Any(), gomock.Any(), gomock.Any()).Do( func(arg0 context.Context, arg1 *matchingservice.PollWorkflowTaskQueueRequest, arg2 ...any) { _, err := t.rootMatcher.PollForQuery(arg0, &pollMetadata{}) - t.Assert().ErrorIs(err, errNoTasks) + t.ErrorIs(err, errNoTasks) }, ).Return(emptyClientPollWorkflowTaskQueueResponse, nil).AnyTimes() @@ -533,7 +533,7 @@ func (t *MatcherTestSuite) TestQueryNoRecentPoller() { task.forwardInfo = req.GetForwardInfo() resp, err := t.rootMatcher.OfferQuery(ctx, task) t.Nil(resp) - t.Assert().ErrorIs(err, errNoRecentPoller) + t.ErrorIs(err, errNoRecentPoller) }, ).Return(nil, errNoRecentPoller) @@ -551,7 +551,7 @@ func (t *MatcherTestSuite) TestQueryNoPollerAtAll() { task.forwardInfo = req.GetForwardInfo() resp, err := t.rootMatcher.OfferQuery(ctx, task) t.Nil(resp) - t.Assert().ErrorIs(err, errNoRecentPoller) + t.ErrorIs(err, errNoRecentPoller) }, ).Return(nil, errNoRecentPoller) @@ -629,7 +629,7 @@ func (t *MatcherTestSuite) TestQueryRemoteSyncMatch() { close(pollSigC) time.Sleep(10 * time.Millisecond) _, err := t.rootMatcher.OfferQuery(ctx, task) - t.Assert().NoError(err) + t.NoError(err) }, ).Return(&matchingservice.QueryWorkflowResponse{QueryResult: payloads.EncodeString("answer")}, nil) @@ -739,7 +739,7 @@ func (t *MatcherTestSuite) TestMustOfferRemoteMatch() { go func() { ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second) _, err := t.childMatcher.Poll(ctx, &pollMetadata{}) - t.Assert().NoError(err) + t.NoError(err) cancel() }() diff --git a/service/matching/matching_engine_test.go b/service/matching/matching_engine_test.go index cefe36afc57..876fe5a204f 100644 --- a/service/matching/matching_engine_test.go +++ b/service/matching/matching_engine_test.go @@ -438,7 +438,7 @@ func (s *matchingEngineSuite) PollForTasksEmptyResultTest(callContext context.Co }, }) s.NoError(err) - s.Equal(1, len(descResp.DescResponse.Pollers)) + s.Len(descResp.DescResponse.Pollers, 1) s.Equal(identity, descResp.DescResponse.Pollers[0].GetIdentity()) s.NotEmpty(descResp.DescResponse.Pollers[0].GetLastAccessTime()) s.Nil(descResp.DescResponse.GetTaskQueueStatus()) @@ -560,7 +560,7 @@ func (s *matchingEngineSuite) testFailAddTaskWithHistoryError( if expectedError != nil { s.ErrorAs(err, &expectedError) } else { - s.Nil(err) + s.NoError(err) } wg.Wait() } @@ -661,7 +661,7 @@ func (s *matchingEngineSuite) TestPollWorkflowTaskQueues() { NextPageToken: nil, } - s.Nil(err) + s.NoError(err) s.Equal(expectedResp, resp) } @@ -1300,7 +1300,7 @@ func (s *matchingEngineSuite) TestAddWorkflowTaskDoesNotLoadSticky() { // check loaded queues s.matchingEngine.partitionsLock.RLock() defer s.matchingEngine.partitionsLock.RUnlock() - s.Equal(0, len(s.matchingEngine.partitions)) + s.Empty(s.matchingEngine.partitions) } func (s *matchingEngineSuite) TestQueryWorkflowDoesNotLoadSticky() { @@ -1318,7 +1318,7 @@ func (s *matchingEngineSuite) TestQueryWorkflowDoesNotLoadSticky() { // check loaded queues s.matchingEngine.partitionsLock.RLock() defer s.matchingEngine.partitionsLock.RUnlock() - s.Equal(0, len(s.matchingEngine.partitions)) + s.Empty(s.matchingEngine.partitions) } func (s *matchingEngineSuite) TestAddThenConsumeActivities() { @@ -1359,7 +1359,7 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() { _, _, err := s.matchingEngine.AddActivityTask(context.Background(), &addRequest) s.NoError(err) } - s.EqualValues(taskCount, s.taskManager.getTaskCount(tlID)) + s.Equal(taskCount, s.taskManager.getTaskCount(tlID)) activityTypeName := "activity1" activityID := "activityId1" @@ -1410,15 +1410,15 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() { s.logger.Debug("empty poll returned") continue } - s.EqualValues(activityID, result.ActivityId) - s.EqualValues(activityType, result.ActivityType) - s.EqualValues(activityInput, result.Input) - s.EqualValues(workflowExecution, result.WorkflowExecution) - s.Equal(true, validateTimeRange(result.ScheduledTime.AsTime(), time.Minute)) - s.EqualValues(time.Second*100, result.ScheduleToCloseTimeout.AsDuration()) - s.Equal(true, validateTimeRange(result.StartedTime.AsTime(), time.Minute)) - s.EqualValues(time.Second*50, result.StartToCloseTimeout.AsDuration()) - s.EqualValues(time.Second*10, result.HeartbeatTimeout.AsDuration()) + s.Equal(activityID, result.ActivityId) + s.Equal(activityType, result.ActivityType) + s.Equal(activityInput, result.Input) + s.Equal(workflowExecution, result.WorkflowExecution) + s.True(validateTimeRange(result.ScheduledTime.AsTime(), time.Minute)) + s.Equal(time.Second*100, result.ScheduleToCloseTimeout.AsDuration()) + s.True(validateTimeRange(result.StartedTime.AsTime(), time.Minute)) + s.Equal(time.Second*50, result.StartToCloseTimeout.AsDuration()) + s.Equal(time.Second*10, result.HeartbeatTimeout.AsDuration()) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -1430,10 +1430,10 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() { } serializedToken, _ := s.matchingEngine.tokenSerializer.Serialize(taskToken) - s.EqualValues(serializedToken, result.TaskToken) + s.Equal(serializedToken, result.TaskToken) i++ } - s.EqualValues(0, s.taskManager.getTaskCount(tlID)) + s.Equal(0, s.taskManager.getTaskCount(tlID)) expectedRange := int64((taskCount + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -1558,13 +1558,13 @@ func (s *matchingEngineSuite) TestSyncMatchActivities() { s.NoError(err) s.NoError(pollErr) s.NotNil(result) - s.True(len(result.TaskToken) > 0) + s.Positive(len(result.TaskToken)) } - s.EqualValues(activityID, result.ActivityId) - s.EqualValues(activityType, result.ActivityType) - s.EqualValues(activityInput, result.Input) - s.EqualValues(workflowExecution, result.WorkflowExecution) + s.Equal(activityID, result.ActivityId) + s.Equal(activityType, result.ActivityType) + s.Equal(activityInput, result.Input) + s.Equal(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, @@ -1576,12 +1576,12 @@ func (s *matchingEngineSuite) TestSyncMatchActivities() { ActivityType: activityTypeName, } serializedToken, _ := s.matchingEngine.tokenSerializer.Serialize(taskToken) - s.EqualValues(serializedToken, result.TaskToken) + s.Equal(serializedToken, result.TaskToken) } s.EventuallyWithT(func(collect *assert.CollectT) { - assert.EqualValues(collect, 1, s.taskManager.getCreateTaskCount(dbq)) // Check times zero rps is set = Tasks stored in persistence - assert.EqualValues(collect, 0, s.taskManager.getTaskCount(dbq)) + assert.Equal(collect, 1, s.taskManager.getCreateTaskCount(dbq)) // Check times zero rps is set = Tasks stored in persistence + assert.Equal(collect, 0, s.taskManager.getTaskCount(dbq)) }, 2*time.Second, 100*time.Millisecond) syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count+namespace="+matchingTestNamespace+",namespace_state=active,operation=TaskQueueMgr,partition=0,service_name=matching,task_type=Activity,taskqueue=makeToast,worker_build_id=,worker_deployment_name=,worker_version=__unversioned__"] @@ -1601,7 +1601,7 @@ func (s *matchingEngineSuite) TestSyncMatchActivities() { }, }) s.NoError(err) - s.Equal(1, len(descResp.DescResponse.Pollers)) + s.Len(descResp.DescResponse.Pollers, 1) s.Equal(identity, descResp.DescResponse.Pollers[0].GetIdentity()) s.NotEmpty(descResp.DescResponse.Pollers[0].GetLastAccessTime()) s.Equal(defaultTaskDispatchRPS, descResp.DescResponse.Pollers[0].GetRatePerSecond()) @@ -1937,11 +1937,11 @@ func (s *matchingEngineSuite) concurrentPublishConsumeActivities( s.logger.Debug("empty poll returned") continue } - s.EqualValues(activityID, result.ActivityId) - s.EqualValues(activityType, result.ActivityType) - s.EqualValues(activityInput, result.Input) - s.EqualValues(activityHeader, result.Header) - s.EqualValues(workflowExecution, result.WorkflowExecution) + s.Equal(activityID, result.ActivityId) + s.Equal(activityType, result.ActivityType) + s.Equal(activityInput, result.Input) + s.Equal(activityHeader, result.Header) + s.Equal(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -1961,11 +1961,11 @@ func (s *matchingEngineSuite) concurrentPublishConsumeActivities( wg.Wait() totalTasks := int(taskCount) * workerCount persisted := s.taskManager.getCreateTaskCount(dbq) - s.True(persisted < totalTasks) + s.Less(persisted, totalTasks) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(dbq).rangeID) - s.EqualValues(0, s.taskManager.getTaskCount(dbq)) + s.Equal(0, s.taskManager.getTaskCount(dbq)) syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count+namespace="+matchingTestNamespace+",operation=TaskQueueMgr,taskqueue=makeToast"] bufCtr := scope.Snapshot().Counters()["test.buffer_throttle_count+namespace="+matchingTestNamespace+",operation=TaskQueueMgr,taskqueue=makeToast"] @@ -2063,10 +2063,10 @@ func (s *matchingEngineSuite) TestConcurrentPublishConsumeWorkflowTasks() { s.logger.Debug("empty poll returned") continue } - s.EqualValues(workflowExecution, result.WorkflowExecution) - s.EqualValues(workflowType, result.WorkflowType) - s.EqualValues(startedEventID, result.StartedEventId) - s.EqualValues(workflowExecution, result.WorkflowExecution) + s.Equal(workflowExecution, result.WorkflowExecution) + s.Equal(workflowType, result.WorkflowType) + s.Equal(startedEventID, result.StartedEventId) + s.Equal(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -2086,10 +2086,10 @@ func (s *matchingEngineSuite) TestConcurrentPublishConsumeWorkflowTasks() { }() } wg.Wait() - s.EqualValues(0, s.taskManager.getTaskCount(tlID)) + s.Equal(0, s.taskManager.getTaskCount(tlID)) totalTasks := taskCount * workerCount persisted := s.taskManager.getCreateTaskCount(tlID) - s.True(persisted < totalTasks) + s.Less(persisted, totalTasks) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -2128,7 +2128,7 @@ func (s *matchingEngineSuite) TestPollWithExpiredContext() { Identity: identity, }, }, metrics.NoopMetricsHandler) - s.Nil(err) + s.NoError(err) s.Equal(emptyPollActivityTaskQueueResponse, resp) } @@ -2158,7 +2158,7 @@ func (s *matchingEngineSuite) TestForceUnloadTaskQueue() { Identity: identity, }}, metrics.NoopMetricsHandler) - s.Nil(err) + s.NoError(err) s.NotNil(pollResp) // Sanity check: adding a task should succeed with the queue loaded @@ -2241,7 +2241,7 @@ func (s *matchingEngineSuite) TestMultipleEnginesActivitiesRangeStealing() { } } - s.EqualValues(iterations*engineCount*taskCount, s.taskManager.getCreateTaskCount(tlID)) + s.Equal(iterations*engineCount*taskCount, s.taskManager.getCreateTaskCount(tlID)) activityTypeName := "activity1" activityID := "activityId1" @@ -2299,10 +2299,10 @@ func (s *matchingEngineSuite) TestMultipleEnginesActivitiesRangeStealing() { s.logger.Debug("empty poll returned") continue } - s.EqualValues(activityID, result.ActivityId) - s.EqualValues(activityType, result.ActivityType) - s.EqualValues(activityInput, result.Input) - s.EqualValues(workflowExecution, result.WorkflowExecution) + s.Equal(activityID, result.ActivityId) + s.Equal(activityType, result.ActivityType) + s.Equal(activityInput, result.Input) + s.Equal(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -2328,11 +2328,11 @@ func (s *matchingEngineSuite) TestMultipleEnginesActivitiesRangeStealing() { e.Stop() } - s.EqualValues(0, s.taskManager.getTaskCount(tlID)) + s.Equal(0, s.taskManager.getTaskCount(tlID)) totalTasks := taskCount * engineCount * iterations persisted := s.taskManager.getCreateTaskCount(tlID) // No sync matching as all messages are published first - s.EqualValues(totalTasks, persisted) + s.Equal(totalTasks, persisted) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -2444,10 +2444,10 @@ func (s *matchingEngineSuite) TestMultipleEnginesWorkflowTasksRangeStealing() { s.logger.Debug("empty poll returned") continue } - s.EqualValues(workflowExecution, result.WorkflowExecution) - s.EqualValues(workflowType, result.WorkflowType) - s.EqualValues(startedEventID, result.StartedEventId) - s.EqualValues(workflowExecution, result.WorkflowExecution) + s.Equal(workflowExecution, result.WorkflowExecution) + s.Equal(workflowType, result.WorkflowType) + s.Equal(startedEventID, result.StartedEventId) + s.Equal(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -2472,11 +2472,11 @@ func (s *matchingEngineSuite) TestMultipleEnginesWorkflowTasksRangeStealing() { e.Stop() } - s.EqualValues(0, s.taskManager.getTaskCount(tlID)) + s.Equal(0, s.taskManager.getTaskCount(tlID)) totalTasks := taskCount * engineCount * iterations persisted := s.taskManager.getCreateTaskCount(tlID) // No sync matching as all messages are published first - s.EqualValues(totalTasks, persisted) + s.Equal(totalTasks, persisted) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -2506,7 +2506,7 @@ func (s *matchingEngineSuite) TestAddTaskAfterStartFailure() { ScheduleToStartTimeout: timestamp.DurationFromSeconds(100), }) s.NoError(err) - s.EqualValues(1, s.taskManager.getTaskCount(dbq)) + s.Equal(1, s.taskManager.getTaskCount(dbq)) task1, _, err := s.matchingEngine.pollTask(context.Background(), dbq.partition, &pollMetadata{}) s.NoError(err) @@ -2562,7 +2562,7 @@ func (s *matchingEngineSuite) TestTaskQueueManagerGetTaskBatch() { } tlMgr := s.getPhysicalTaskQueueManagerImplFromKey(dbq) - s.EqualValues(taskCount, s.taskManager.getTaskCount(dbq)) + s.Equal(taskCount, s.taskManager.getTaskCount(dbq)) // wait until all tasks are read by the task pump and enqueued into the in-memory buffer // at the end of this step, ackManager readLevel will also be equal to the buffer size @@ -2579,15 +2579,15 @@ func (s *matchingEngineSuite) TestTaskQueueManagerGetTaskBatch() { // This is only for unit test purpose blm.taskAckManager.setReadLevel(blm.getDB().GetMaxReadLevel(0)) batch, err := blm.taskReader.getTaskBatch(context.Background()) - s.Nil(err) - s.EqualValues(0, len(batch.tasks)) - s.EqualValues(blm.getDB().GetMaxReadLevel(0), batch.readLevel) + s.NoError(err) + s.Empty(batch.tasks) + s.Equal(blm.getDB().GetMaxReadLevel(0), batch.readLevel) s.True(batch.isReadBatchDone) blm.taskAckManager.setReadLevel(0) batch, err = blm.taskReader.getTaskBatch(context.Background()) - s.Nil(err) - s.EqualValues(rangeSize, len(batch.tasks)) + s.NoError(err) + s.Len(batch.tasks, rangeSize) s.EqualValues(rangeSize, batch.readLevel) s.True(batch.isReadBatchDone) @@ -2617,9 +2617,9 @@ func (s *matchingEngineSuite) TestTaskQueueManagerGetTaskBatch() { continue } } - s.EqualValues(taskCount-rangeSize, s.taskManager.getTaskCount(dbq)) + s.Equal(taskCount-rangeSize, s.taskManager.getTaskCount(dbq)) batch, err = blm.taskReader.getTaskBatch(context.Background()) - s.Nil(err) + s.NoError(err) s.True(0 < len(batch.tasks) && len(batch.tasks) <= rangeSize) s.True(batch.isReadBatchDone) } @@ -2696,7 +2696,7 @@ func (s *matchingEngineSuite) TestTaskExpiryAndCompletion() { } tlMgr := s.getPhysicalTaskQueueManagerImplFromKey(dbq) - s.EqualValues(taskCount, s.taskManager.getTaskCount(dbq)) + s.Equal(taskCount, s.taskManager.getTaskCount(dbq)) blm := tlMgr.backlogMgr.(*backlogManagerImpl) // wait until all tasks are loaded by into in-memory buffers by task queue manager @@ -2841,7 +2841,7 @@ func (s *matchingEngineSuite) TestGetVersioningData() { s.Equal("9", curDefault.GetBuildIds()[0]) lastNode = curDefault.GetBuildIds()[len(curDefault.GetBuildIds())-1] s.Equal("9.79", lastNode) - s.Equal(1, len(majorSets)) + s.Len(majorSets, 1) res, err = s.matchingEngine.GetWorkerBuildIdCompatibility(context.Background(), &matchingservice.GetWorkerBuildIdCompatibilityRequest{ NamespaceId: namespaceID.String(), @@ -3207,7 +3207,7 @@ func (s *matchingEngineSuite) TestDemotedMatch() { }, }, }) - s.Assert().NoError(err) + s.NoError(err) // add a task for build0, will get spooled in its set _, _, err = s.matchingEngine.AddWorkflowTask(ctx, &matchingservice.AddWorkflowTaskRequest{ @@ -3323,7 +3323,7 @@ func (s *matchingEngineSuite) TestUnloadOnMembershipChange() { _, _, err = e.getTaskQueuePartitionManager(context.Background(), p2, true, loadCauseUnspecified) s.NoError(err) - s.Equal(2, len(e.getTaskQueuePartitions(1000))) + s.Len(e.getTaskQueuePartitions(1000), 2) s.mockServiceResolver.EXPECT().Lookup(nexusEndpointsTablePartitionRoutingKey).Return(self, nil).AnyTimes() @@ -3334,7 +3334,7 @@ func (s *matchingEngineSuite) TestUnloadOnMembershipChange() { s.mockServiceResolver.EXPECT().LookupN(p2key, p2n+1).Return([]membership.HostInfo{self}) e.membershipChangedCh <- nil time.Sleep(50 * time.Millisecond) - s.Equal(2, len(e.getTaskQueuePartitions(1000)), "nothing should be unloaded yet") + s.Len(e.getTaskQueuePartitions(1000), 2, "nothing should be unloaded yet") // signal again but p2 doesn't belong to us anymore s.mockServiceResolver.EXPECT().LookupN(p1key, p1n+1).Return([]membership.HostInfo{self}) @@ -3468,7 +3468,7 @@ func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_UnVersioned() { partitionType: prtn.Kind(), versioned: "unversioned", } - assert.Equal(s.T(), s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters], 2) + assert.Equal(s.T(), 2, s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters]) } @@ -3511,7 +3511,7 @@ func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_VersionSet() { partitionType: dbq.Partition().Kind(), versioned: "versionSet", } - assert.Equal(s.T(), s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters], 2) + assert.Equal(s.T(), 2, s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters]) } func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_BuildID() { @@ -3552,7 +3552,7 @@ func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_BuildID() { partitionType: dbq.Partition().Kind(), versioned: "buildId", } - assert.Equal(s.T(), s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters], 2) + assert.Equal(s.T(), 2, s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters]) } @@ -3756,12 +3756,12 @@ func (s *matchingEngineSuite) resetBacklogCounter(numWorkers int, taskCount int, s.NoError(err) pqMgr := s.getPhysicalTaskQueueManagerImplFromKey(ptq) - s.EqualValues(taskCount*numWorkers, s.taskManager.getTaskCount(ptq)) + s.Equal(taskCount*numWorkers, s.taskManager.getTaskCount(ptq)) // Check the maxReadLevel with the value of task stored in db maxTaskId, ok := s.taskManager.maxTaskID(ptq) s.True(ok) - s.EqualValues(maxTaskId, pqMgr.backlogMgr.getDB().GetMaxReadLevel(0)) + s.Equal(maxTaskId, pqMgr.backlogMgr.getDB().GetMaxReadLevel(0)) // validate the approximateBacklogCounter s.EqualValues(taskCount*numWorkers, totalApproximateBacklogCount(pqMgr.backlogMgr)) @@ -3782,7 +3782,7 @@ func (s *matchingEngineSuite) resetBacklogCounter(numWorkers int, taskCount int, } _, err = s.taskManager.CompleteTasksLessThan(context.Background(), request) s.NoError(err) - s.EqualValues((taskCount*numWorkers)-1, s.taskManager.getTaskCount(ptq)) + s.Equal((taskCount*numWorkers)-1, s.taskManager.getTaskCount(ptq)) // Add pollers which shall also load the fresher version of tqMgr s.pollWorkflowTasks(workflowType, (taskCount*numWorkers)-1, ptq, taskQueue) @@ -3794,7 +3794,7 @@ func (s *matchingEngineSuite) resetBacklogCounter(numWorkers int, taskCount int, // stopped (which would not result in resetting). pqMgr.backlogMgr.getDB().setMaxReadLevelForTesting(subqueueZero, maxTaskId) - s.EqualValues(0, s.taskManager.getTaskCount(ptq)) + s.Equal(0, s.taskManager.getTaskCount(ptq)) s.EventuallyWithT(func(collect *assert.CollectT) { require.Equal(collect, int64(0), totalApproximateBacklogCount(pqMgr.backlogMgr)) }, 4*time.Second, 10*time.Millisecond, "backlog counter should have been reset") diff --git a/service/matching/reachability_test.go b/service/matching/reachability_test.go index 8e01a6d390e..6cf382be232 100644 --- a/service/matching/reachability_test.go +++ b/service/matching/reachability_test.go @@ -126,7 +126,7 @@ func TestIsReachableAssignmentRuleTarget(t *testing.T) { func TestGetDefaultBuildId(t *testing.T) { t.Parallel() - assert.Equal(t, "", getDefaultBuildId([]*persistencespb.AssignmentRule{})) + assert.Empty(t, getDefaultBuildId([]*persistencespb.AssignmentRule{})) createTs := hlc.Zero(1) deleteTs := hlc.Next(createTs, commonclock.NewRealTimeSource()) @@ -303,17 +303,17 @@ func checkReachability(ctx context.Context, metricsCapture := metricsHandler.StartCapture() logger := log.NewTestLogger() reachability, err := getBuildIdTaskReachability(ctx, rc, metricsHandler, logger, buildId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, expectedReachability, reachability) snapshot := metricsCapture.Snapshot() counterRecordings := snapshot[metrics.ReachabilityExitPointCounter.Name()] - assert.Equal(t, len(counterRecordings), 1) + assert.Equal(t, 1, len(counterRecordings)) assert.Equal(t, int64(1), counterRecordings[0].Value.(int64)) assert.Equal(t, reachabilityExitPoint2TagValue[expectedExitPoint], counterRecordings[0].Tags[reachabilityExitPointTagName]) // check that rc.run works (don't check exit point this time because cache will be warm) reachability, _, err = rc.run(ctx, buildId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, expectedReachability, reachability) } diff --git a/service/matching/task_queue_partition_manager_test.go b/service/matching/task_queue_partition_manager_test.go index 9092f47b4bb..d0c18e31d55 100644 --- a/service/matching/task_queue_partition_manager_test.go +++ b/service/matching/task_queue_partition_manager_test.go @@ -154,7 +154,7 @@ func (s *PartitionManagerTestSuite) TestDescribeTaskQueuePartition_MultipleBuild // validating TQ Stats resp, err := s.partitionMgr.Describe(ctx, buildIds, false, true, true, false) s.NoError(err) - s.Equal(2, len(resp.VersionsInfoInternal)) + s.Len(resp.VersionsInfoInternal, 2) // validate PhysicalTaskQueueInfo structures info1 := resp.VersionsInfoInternal[bld1].GetPhysicalTaskQueueInfo() @@ -217,10 +217,10 @@ func (s *PartitionManagerTestSuite) TestDescribeTaskQueuePartition_MultipleBuild } status1 := resp.VersionsInfoInternal[bld1].PhysicalTaskQueueInfo.GetInternalTaskQueueStatus() - s.Equal(1, len(status1)) + s.Len(status1, 1) s.ProtoEqual(status0, status1[0]) status2 := resp.VersionsInfoInternal[bld2].PhysicalTaskQueueInfo.GetInternalTaskQueueStatus() - s.Equal(1, len(status2)) + s.Len(status2, 1) s.ProtoEqual(status0, status2[0]) } @@ -1081,22 +1081,22 @@ func (s *PartitionManagerTestSuite) TestAddTaskWithAssignmentRulesAndVersionSets func (s *PartitionManagerTestSuite) TestGetAllPollerInfo() { // no pollers pollers := s.partitionMgr.GetAllPollerInfo() - s.True(len(pollers) == 0) + s.Equal(len(pollers), 0) // one unversioned poller s.pollWithIdentity("uv", "", false, false) pollers = s.partitionMgr.GetAllPollerInfo() - s.True(len(pollers) == 1) + s.Equal(len(pollers), 1) // one versioned poller s.pollWithIdentity("v", "bid", true, false) pollers = s.partitionMgr.GetAllPollerInfo() - s.True(len(pollers) == 2) + s.Equal(len(pollers), 2) // one unversioned poller with deployment options s.pollWithIdentity("uvdo", "bid", false, true) pollers = s.partitionMgr.GetAllPollerInfo() - s.True(len(pollers) == 3) + s.Equal(len(pollers), 3) for _, p := range pollers { //nolint:staticcheck // SA1019 deprecated GetWorkerVersionCapabilities @@ -1172,19 +1172,19 @@ func (s *PartitionManagerTestSuite) TestLegacyDescribeTaskQueue() { // no pollers resp, err := s.partitionMgr.LegacyDescribeTaskQueue(false) s.NoError(err) - s.Equal(0, len(resp.DescResponse.GetPollers())) + s.Empty(resp.DescResponse.GetPollers()) // one unversioned poller s.pollWithIdentity("uv", "", false, false) resp, err = s.partitionMgr.LegacyDescribeTaskQueue(false) s.NoError(err) - s.Equal(1, len(resp.DescResponse.GetPollers())) + s.Len(resp.DescResponse.GetPollers(), 1) // one versioned poller s.pollWithIdentity("v", "bid", true, false) resp, err = s.partitionMgr.LegacyDescribeTaskQueue(false) s.NoError(err) - s.Equal(2, len(resp.DescResponse.GetPollers())) + s.Len(resp.DescResponse.GetPollers(), 2) for _, p := range resp.DescResponse.GetPollers() { //nolint:staticcheck // SA1019 deprecated GetWorkerVersionCapabilities diff --git a/service/matching/task_validation_test.go b/service/matching/task_validation_test.go index a16f7e09672..70b0f5850d2 100644 --- a/service/matching/task_validation_test.go +++ b/service/matching/task_validation_test.go @@ -98,7 +98,7 @@ func (s *taskValidatorSuite) TestPreValidateActive_NewTask_Skip_WithoutCreationT shouldValidate := s.taskValidator.preValidateActive(s.task) s.False(shouldValidate) s.Equal(s.task.TaskId, s.taskValidator.lastValidatedTaskInfo.taskID) - s.True(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime) < time.Second) + s.Less(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime), time.Second) } func (s *taskValidatorSuite) TestPreValidateActive_ExistingTask_Validate() { @@ -161,7 +161,7 @@ func (s *taskValidatorSuite) TestPreValidatePassive_NewTask_Skip_WithoutCreation shouldValidate := s.taskValidator.preValidatePassive(s.task) s.False(shouldValidate) s.Equal(s.task.TaskId, s.taskValidator.lastValidatedTaskInfo.taskID) - s.True(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime) < time.Second) + s.Less(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime), time.Second) } func (s *taskValidatorSuite) TestPreValidatePassive_ExistingTask_Validate() { diff --git a/service/matching/version_rule_helper_test.go b/service/matching/version_rule_helper_test.go index a32cc128f81..fefab033ba5 100644 --- a/service/matching/version_rule_helper_test.go +++ b/service/matching/version_rule_helper_test.go @@ -11,7 +11,7 @@ import ( func TestFindAssignmentBuildId_NoRules(t *testing.T) { b := FindAssignmentBuildId(nil, "") - assert.Equal(t, "", b) + assert.Empty(t, b) } func TestFindAssignmentBuildId_OneFullRule(t *testing.T) { diff --git a/service/matching/version_rule_test.go b/service/matching/version_rule_test.go index ad9444bf249..64c36f54286 100644 --- a/service/matching/version_rule_test.go +++ b/service/matching/version_rule_test.go @@ -851,7 +851,7 @@ func TestDeleteRedirectRuleBasic(t *testing.T) { data, err = deleteRedirectRule("1", data, clock1) assert.NoError(t, err) deleted := getDeletedRedirectRuleBySrc("1", data) - assert.Equal(t, 1, len(deleted)) + assert.Len(t, deleted, 1) assert.Equal(t, clock1.GetWallClock(), deleted[0].GetDeleteTimestamp().GetWallClock()) assert.Equal(t, "1", deleted[0].GetRule().GetSourceBuildId()) assert.Equal(t, "2", deleted[0].GetRule().GetTargetBuildId()) @@ -860,7 +860,7 @@ func TestDeleteRedirectRuleBasic(t *testing.T) { data, err = deleteRedirectRule("2", data, clock2) assert.NoError(t, err) deleted = getDeletedRedirectRuleBySrc("2", data) - assert.Equal(t, 1, len(deleted)) + assert.Len(t, deleted, 1) assert.Equal(t, clock2.GetWallClock(), deleted[0].GetDeleteTimestamp().GetWallClock()) assert.Equal(t, "2", deleted[0].GetRule().GetSourceBuildId()) assert.Equal(t, "3", deleted[0].GetRule().GetTargetBuildId()) @@ -913,7 +913,7 @@ func TestGetWorkerVersioningRules(t *testing.T) { // check assignment rules assignmentRules := resp.GetResponse().GetAssignmentRules() - assert.Equal(t, 3, len(assignmentRules)) + assert.Len(t, assignmentRules, 3) protoassert.ProtoEqual(t, &taskqueuepb.TimestampedBuildIdAssignmentRule{ Rule: mkAssignmentRuleWithoutRamp("1"), CreateTime: hlc.ProtoTimestamp(clock1), @@ -929,7 +929,7 @@ func TestGetWorkerVersioningRules(t *testing.T) { // check redirect rules, no ordering guarantee redirectRules := resp.GetResponse().GetCompatibleRedirectRules() - assert.Equal(t, 3, len(redirectRules)) + assert.Len(t, redirectRules, 3) contains := func(expected *taskqueuepb.TimestampedCompatibleBuildIdRedirectRule) bool { for _, r := range redirectRules { if proto.Equal(expected, r) { @@ -1197,8 +1197,8 @@ func TestFindTerminalBuildId(t *testing.T) { mkRedirectRulePersistence(mkRedirectRule("1", "2"), createTs, nil), mkRedirectRulePersistence(mkRedirectRule("2", "1"), createTs, nil), } - assert.Equal(t, "", findTerminalBuildId("1", redirectRules)) - assert.Equal(t, "", findTerminalBuildId("2", redirectRules)) + assert.Empty(t, findTerminalBuildId("1", redirectRules)) + assert.Empty(t, findTerminalBuildId("2", redirectRules)) } func TestGetUpstreamBuildIds_NoCycle(t *testing.T) { diff --git a/service/worker/deletenamespace/activities_test.go b/service/worker/deletenamespace/activities_test.go index 0d62634f7a4..4719eedb759 100644 --- a/service/worker/deletenamespace/activities_test.go +++ b/service/worker/deletenamespace/activities_test.go @@ -90,7 +90,7 @@ func Test_ValidateNexusEndpointsActivity(t *testing.T) { nexusEndpointManager.EXPECT().ListNexusEndpoints(gomock.Any(), gomock.Any()).Return(nil, errors.New("persistence failure")) err = a.ValidateNexusEndpointsActivity(context.Background(), "namespace-id", "namespace") require.Error(t, err) - require.Equal(t, err.Error(), "unable to list Nexus endpoints for namespace namespace: persistence failure") + require.Equal(t, "unable to list Nexus endpoints for namespace namespace: persistence failure", err.Error()) ctrl.Finish() } diff --git a/service/worker/deletenamespace/deleteexecutions/workflow_test.go b/service/worker/deletenamespace/deleteexecutions/workflow_test.go index e9742ea9330..4dbaef41d9d 100644 --- a/service/worker/deletenamespace/deleteexecutions/workflow_test.go +++ b/service/worker/deletenamespace/deleteexecutions/workflow_test.go @@ -237,8 +237,8 @@ func Test_DeleteExecutionsWorkflow_ManyExecutions_ActivityError(t *testing.T) { err := env.GetWorkflowError() require.Error(t, err) var appErr *temporal.ApplicationError - require.True(t, stderrors.As(err, &appErr)) - require.Equal(t, appErr.Error(), "specific_error_from_activity (type: Unavailable, retryable: true)") + require.ErrorAs(t, err, &appErr) + require.Equal(t, "specific_error_from_activity (type: Unavailable, retryable: true)", appErr.Error()) } func Test_DeleteExecutionsWorkflow_NoActivityMocks_ManyExecutions(t *testing.T) { diff --git a/service/worker/deletenamespace/reclaimresources/workflow_test.go b/service/worker/deletenamespace/reclaimresources/workflow_test.go index b61c32ac1cc..5712ff8f5ce 100644 --- a/service/worker/deletenamespace/reclaimresources/workflow_test.go +++ b/service/worker/deletenamespace/reclaimresources/workflow_test.go @@ -70,7 +70,7 @@ func Test_ReclaimResourcesWorkflow_Success(t *testing.T) { require.NoError(t, env.GetWorkflowResult(&result)) require.Equal(t, 0, result.DeleteErrorCount) require.Equal(t, 10, result.DeleteSuccessCount) - require.Equal(t, true, result.NamespaceDeleted) + require.True(t, result.NamespaceDeleted) } func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_Error(t *testing.T) { @@ -119,8 +119,7 @@ func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_Error(t *testing.T err := env.GetWorkflowError() require.Error(t, err) require.Equal(t, - err.Error(), - "workflow execution error (type: ReclaimResourcesWorkflow, workflowID: default-test-workflow-id, runID: default-test-run-id): activity error (type: EnsureNoExecutionsAdvVisibilityActivity, scheduledEventID: 0, startedEventID: 0, identity: ): specific_error_from_activity") + "workflow execution error (type: ReclaimResourcesWorkflow, workflowID: default-test-workflow-id, runID: default-test-run-id): activity error (type: EnsureNoExecutionsAdvVisibilityActivity, scheduledEventID: 0, startedEventID: 0, identity: ): specific_error_from_activity", err.Error()) } func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_ExecutionsStillExist(t *testing.T) { @@ -168,7 +167,7 @@ func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_ExecutionsStillExi require.True(t, env.IsWorkflowCompleted()) err := env.GetWorkflowError() var appErr *temporal.ApplicationError - require.True(t, stderrors.As(err, &appErr)) + require.ErrorAs(t, err, &appErr) require.Equal(t, errors.ExecutionsStillExistErrType, appErr.Type()) } @@ -264,7 +263,7 @@ func Test_ReclaimResourcesWorkflow_NoActivityMocks_Success(t *testing.T) { require.NoError(t, env.GetWorkflowResult(&result)) require.Equal(t, 0, result.DeleteErrorCount) require.Equal(t, 10, result.DeleteSuccessCount) - require.Equal(t, true, result.NamespaceDeleted) + require.True(t, result.NamespaceDeleted) } func Test_ReclaimResourcesWorkflow_NoActivityMocks_NoProgressMade(t *testing.T) { @@ -340,7 +339,7 @@ func Test_ReclaimResourcesWorkflow_NoActivityMocks_NoProgressMade(t *testing.T) err := env.GetWorkflowError() require.Error(t, err) var appErr *temporal.ApplicationError - require.True(t, stderrors.As(err, &appErr)) + require.ErrorAs(t, err, &appErr) require.Equal(t, errors.NoProgressErrType, appErr.Type()) } @@ -416,5 +415,5 @@ func Test_ReclaimResourcesWorkflow_UpdateDeleteDelay(t *testing.T) { require.NoError(t, env.GetWorkflowResult(&result)) require.Equal(t, 0, result.DeleteErrorCount) require.Equal(t, 10, result.DeleteSuccessCount) - require.Equal(t, true, result.NamespaceDeleted) + require.True(t, result.NamespaceDeleted) } diff --git a/service/worker/deletenamespace/workflow_test.go b/service/worker/deletenamespace/workflow_test.go index 4f14c61964c..67586329def 100644 --- a/service/worker/deletenamespace/workflow_test.go +++ b/service/worker/deletenamespace/workflow_test.go @@ -252,7 +252,7 @@ func Test_DeleteProtectedNamespace(t *testing.T) { require.Error(t, err) var appErr *temporal.ApplicationError require.ErrorAs(t, err, &appErr) - require.Equal(t, appErr.Message(), "namespace namespace is protected from deletion") + require.Equal(t, "namespace namespace is protected from deletion", appErr.Message()) } func Test_DeleteNamespaceUsedByNexus(t *testing.T) { @@ -279,5 +279,5 @@ func Test_DeleteNamespaceUsedByNexus(t *testing.T) { require.Error(t, err) var appErr *temporal.ApplicationError require.ErrorAs(t, err, &appErr) - require.Equal(t, appErr.Message(), "cannot delete a namespace that is a target of a Nexus endpoint") + require.Equal(t, "cannot delete a namespace that is a target of a Nexus endpoint", appErr.Message()) } diff --git a/service/worker/dlq/workflow_test.go b/service/worker/dlq/workflow_test.go index 8d13821227f..01143cbc745 100644 --- a/service/worker/dlq/workflow_test.go +++ b/service/worker/dlq/workflow_test.go @@ -572,7 +572,7 @@ func (p *testParams) setDefaultParams(t *testing.T) { require.Equal(t, p.expectedQueryResp.LastProcessedMessageID, response.LastProcessedMessageID) require.Equal(t, p.expectedQueryResp.WorkflowType, response.WorkflowType) require.Equal(t, p.expectedQueryResp.NumberOfMessagesProcessed, response.NumberOfMessagesProcessed) - require.EqualValues(t, p.expectedQueryResp.DlqKey, response.DlqKey) + require.Equal(t, p.expectedQueryResp.DlqKey, response.DlqKey) } p.taskClientDialer = dlq.TaskClientDialerFn(func(ctx context.Context, address string) (dlq.TaskClient, error) { return dlq.AddTasksFn(func(ctx context.Context, req *adminservice.AddTasksRequest) (*adminservice.AddTasksResponse, error) { diff --git a/service/worker/migration/activities_test.go b/service/worker/migration/activities_test.go index 4ca1d7492c9..c09dbe61fd9 100644 --- a/service/worker/migration/activities_test.go +++ b/service/worker/migration/activities_test.go @@ -226,7 +226,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_Success() { s.NoError(err) s.Equal(len(request.Executions), int(output.VerifiedWorkflowCount)) - s.Greater(len(iceptor.replicationRecordedHeartbeats), 0) + s.NotEmpty(iceptor.replicationRecordedHeartbeats) lastHeartBeat := iceptor.replicationRecordedHeartbeats[len(iceptor.replicationRecordedHeartbeats)-1] s.Equal(len(request.Executions), lastHeartBeat.NextIndex) s.Equal(execution2, lastHeartBeat.LastNotVerifiedWorkflowExecution) @@ -290,7 +290,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_SkipWorkflowExecution() { })).Return(t.resp, t.err).Times(1) _, err := env.ExecuteActivity(s.a.VerifyReplicationTasks, &request) - s.Greater(len(iceptor.replicationRecordedHeartbeats), 0) + s.NotEmpty(iceptor.replicationRecordedHeartbeats) lastHeartBeat := iceptor.replicationRecordedHeartbeats[len(iceptor.replicationRecordedHeartbeats)-1] if t.expectedErr == nil { s.NoError(err) @@ -346,7 +346,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_FailedNotFound() { s.Error(err) s.ErrorContains(err, "verifyReplicationTasks was not able to make progress") - s.Greater(len(iceptor.replicationRecordedHeartbeats), 0) + s.NotEmpty(iceptor.replicationRecordedHeartbeats) lastHeartBeat := iceptor.replicationRecordedHeartbeats[len(iceptor.replicationRecordedHeartbeats)-1] s.Equal(0, lastHeartBeat.NextIndex) s.Equal(execution1, lastHeartBeat.LastNotVerifiedWorkflowExecution) @@ -370,7 +370,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_AlreadyVerified() { _, err := env.ExecuteActivity(s.a.VerifyReplicationTasks, &request) s.NoError(err) - s.Equal(len(iceptor.replicationRecordedHeartbeats), 1) + s.Equal(1, len(iceptor.replicationRecordedHeartbeats)) } func (s *activitiesSuite) Test_verifySingleReplicationTask() { @@ -757,7 +757,7 @@ func (s *activitiesSuite) TestGenerateReplicationTasks_Success() { _, err := env.ExecuteActivity(s.a.GenerateReplicationTasks, &request) s.NoError(err) - s.Greater(len(iceptor.generateReplicationRecordedHeartbeats), 0) + s.NotEmpty(iceptor.generateReplicationRecordedHeartbeats) lastIdx := len(iceptor.generateReplicationRecordedHeartbeats) - 1 lastHeartBeat := iceptor.generateReplicationRecordedHeartbeats[lastIdx] s.Equal(lastIdx, lastHeartBeat) @@ -794,7 +794,7 @@ func (s *activitiesSuite) TestGenerateReplicationTasks_Failed() { _, err := env.ExecuteActivity(s.a.GenerateReplicationTasks, &request) s.Error(err) - s.Greater(len(iceptor.generateReplicationRecordedHeartbeats), 0) + s.NotEmpty(iceptor.generateReplicationRecordedHeartbeats) lastIdx := len(iceptor.generateReplicationRecordedHeartbeats) - 1 lastHeartBeat := iceptor.generateReplicationRecordedHeartbeats[lastIdx] // Only the generation of 1st execution suceeded. diff --git a/service/worker/migration/force_replication_workflow_test.go b/service/worker/migration/force_replication_workflow_test.go index bf0ea3ebba0..c913713bc05 100644 --- a/service/worker/migration/force_replication_workflow_test.go +++ b/service/worker/migration/force_replication_workflow_test.go @@ -125,7 +125,7 @@ func (s *ForceReplicationWorkflowTestSuite) TestForceReplicationWorkflow() { s.Equal(startTime, status.LastStartTime) s.Equal(closeTime, status.LastCloseTime) s.True(status.TaskQueueUserDataReplicationStatus.Done) - s.Equal("", status.TaskQueueUserDataReplicationStatus.FailureMessage) + s.Empty(status.TaskQueueUserDataReplicationStatus.FailureMessage) s.Equal(int64(4), status.TotalWorkflowCount) s.Equal(int64(4), status.ReplicatedWorkflowCount) s.Equal([]byte(nil), status.PageTokenForRestart) @@ -269,7 +269,7 @@ func (s *ForceReplicationWorkflowTestSuite) testRunForceReplicationForContinueAs s.NoError(err) } else { s.Error(err) - s.True(errors.As(err, &continueAsNewErr)) + s.ErrorAs(err, &continueAsNewErr) var params ForceReplicationParams payloads := continueAsNewErr.Input.GetPayloads() @@ -689,7 +689,7 @@ func TestSeedReplicationQueueWithUserDataEntries_Heartbeats(t *testing.T) { } _, err := env.ExecuteActivity(a.SeedReplicationQueueWithUserDataEntries, params) assert.Error(t, err) - assert.Equal(t, len(iceptor.seedRecordedHeartbeats), 2) + assert.Equal(t, 2, len(iceptor.seedRecordedHeartbeats)) assert.Equal(t, []byte(nil), iceptor.seedRecordedHeartbeats[1].NextPageToken) assert.Equal(t, 1, iceptor.seedRecordedHeartbeats[1].IndexInPage) env.SetHeartbeatDetails(iceptor.seedRecordedHeartbeats[1]) diff --git a/service/worker/scanner/executions/task_test.go b/service/worker/scanner/executions/task_test.go index aa0a53dcf5c..01145a0fa47 100644 --- a/service/worker/scanner/executions/task_test.go +++ b/service/worker/scanner/executions/task_test.go @@ -56,7 +56,7 @@ func (s *taskTestSuite) TestRun_Success_EmptyResults() { Return(&persistence.ListConcreteExecutionsResponse{}, nil) status := task.Run() - assert.Equal(s.T(), executor.TaskStatusDone, status) + s.Equal(executor.TaskStatusDone, status) } func (s *taskTestSuite) TestRun_PaginationError() { @@ -68,5 +68,5 @@ func (s *taskTestSuite) TestRun_PaginationError() { Return(nil, errors.New("pagination error")) status := task.Run() - assert.Equal(s.T(), executor.TaskStatusDefer, status) + s.Equal(executor.TaskStatusDefer, status) } diff --git a/service/worker/scanner/history/scavenger_test.go b/service/worker/scanner/history/scavenger_test.go index d9e7e45e52c..48acaab189b 100644 --- a/service/worker/scanner/history/scavenger_test.go +++ b/service/worker/scanner/history/scavenger_test.go @@ -160,12 +160,12 @@ func (s *ScavengerTestSuite) TestAllSkipTasksTwoPages() { }, nil) hbd, err := s.scavenger.Run(context.Background()) - s.Nil(err) + s.NoError(err) s.Equal(4, hbd.SkipCount) s.Equal(0, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Equal(0, len(hbd.NextPageToken)) + s.Empty(hbd.NextPageToken) } func (s *ScavengerTestSuite) TestAllErrorSplittingTasksTwoPages() { @@ -218,12 +218,12 @@ func (s *ScavengerTestSuite) TestAllErrorSplittingTasksTwoPages() { }, nil) hbd, err := s.scavenger.Run(context.Background()) - s.Nil(err) + s.NoError(err) s.Equal(0, hbd.SkipCount) s.Equal(0, hbd.SuccessCount) s.Equal(4, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Equal(0, len(hbd.NextPageToken)) + s.Empty(hbd.NextPageToken) } func (s *ScavengerTestSuite) TestNoGarbageTwoPages() { @@ -323,12 +323,12 @@ func (s *ScavengerTestSuite) TestNoGarbageTwoPages() { })).Return(ms, nil) hbd, err := s.scavenger.Run(context.Background()) - s.Nil(err) + s.NoError(err) s.Equal(0, hbd.SkipCount) s.Equal(4, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Equal(0, len(hbd.NextPageToken)) + s.Empty(hbd.NextPageToken) } func (s *ScavengerTestSuite) TestDeletingBranchesTwoPages() { @@ -412,37 +412,37 @@ func (s *ScavengerTestSuite) TestDeletingBranchesTwoPages() { ArchetypeId: chasm.WorkflowArchetypeID, })).Return(nil, serviceerror.NewNotFound("")) branchToken1, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID1, &branchID1, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.Nil(err) + s.NoError(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken1, ShardID: common.WorkflowIDToHistoryShard("namespaceID1", "workflowID1", s.numShards), })).Return(nil) branchToken2, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID2, &branchID2, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.Nil(err) + s.NoError(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken2, ShardID: common.WorkflowIDToHistoryShard("namespaceID2", "workflowID2", s.numShards), })).Return(nil) branchToken3, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID3, &branchID3, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.Nil(err) + s.NoError(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken3, ShardID: common.WorkflowIDToHistoryShard("namespaceID3", "workflowID3", s.numShards), })).Return(nil) branchToken4, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID4, &branchID4, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.Nil(err) + s.NoError(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken4, ShardID: common.WorkflowIDToHistoryShard("namespaceID4", "workflowID4", s.numShards), })).Return(nil) hbd, err := s.scavenger.Run(context.Background()) - s.Nil(err) + s.NoError(err) s.Equal(0, hbd.SkipCount) s.Equal(4, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Equal(0, len(hbd.NextPageToken)) + s.Empty(hbd.NextPageToken) } func (s *ScavengerTestSuite) TestMixesTwoPages() { @@ -548,26 +548,26 @@ func (s *ScavengerTestSuite) TestMixesTwoPages() { })).Return(ms, nil) branchToken3, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID3, &branchID3, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.Nil(err) + s.NoError(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken3, ShardID: common.WorkflowIDToHistoryShard("namespaceID3", "workflowID3", s.numShards), })).Return(nil) branchToken4, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID4, &branchID4, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.Nil(err) + s.NoError(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken4, ShardID: common.WorkflowIDToHistoryShard("namespaceID4", "workflowID4", s.numShards), })).Return(fmt.Errorf("failed to delete history")) hbd, err := s.scavenger.Run(context.Background()) - s.Nil(err) + s.NoError(err) s.Equal(1, hbd.SkipCount) s.Equal(2, hbd.SuccessCount) s.Equal(2, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Equal(0, len(hbd.NextPageToken)) + s.Empty(hbd.NextPageToken) } func (s *ScavengerTestSuite) TestDeleteWorkflowAfterRetention() { @@ -737,10 +737,10 @@ func (s *ScavengerTestSuite) TestDeleteWorkflowAfterRetention() { })).Return(nil, nil).Times(1) hbd, err := s.scavenger.Run(context.Background()) - s.Nil(err) + s.NoError(err) s.Equal(0, hbd.SkipCount) s.Equal(5, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Equal(0, len(hbd.NextPageToken)) + s.Empty(hbd.NextPageToken) } diff --git a/temporal/environment/env_test.go b/temporal/environment/env_test.go index e6addee752d..67b7a3b45ca 100644 --- a/temporal/environment/env_test.go +++ b/temporal/environment/env_test.go @@ -25,7 +25,7 @@ func TestLookupLocalhostIPMissingHostname(t *testing.T) { ip := net.ParseIP(ipString) a.True(ip.IsLoopback()) // if host can't be found, use ipv4 loopback - a.Equal(ip.String(), localhostIPDefault) + a.Equal(localhostIPDefault, ip.String()) } func TestLookupLocalhostIPWithIPv6(t *testing.T) { diff --git a/temporal/fx_test.go b/temporal/fx_test.go index fc4fe72d57f..b6fef3f2cac 100644 --- a/temporal/fx_test.go +++ b/temporal/fx_test.go @@ -63,7 +63,7 @@ func TestUpdateCurrentClusterMetadataRecord(t *testing.T) { mockClusterMetadataManager.EXPECT().SaveClusterMetadata(gomock.Any(), gomock.Any()).DoAndReturn( func(_ context.Context, request *persistence.SaveClusterMetadataRequest) (bool, error) { require.Equal(t, cfg.ClusterMetadata.EnableGlobalNamespace, request.IsGlobalNamespaceEnabled) - require.Equal(t, "", request.ClusterName) + require.Empty(t, request.ClusterName) require.Equal(t, cfg.ClusterMetadata.ClusterInformation[cfg.ClusterMetadata.CurrentClusterName].RPCAddress, request.ClusterAddress) require.Equal(t, cfg.ClusterMetadata.ClusterInformation[cfg.ClusterMetadata.CurrentClusterName].HTTPAddress, request.HttpAddress) require.Equal(t, cfg.ClusterMetadata.ClusterInformation[cfg.ClusterMetadata.CurrentClusterName].InitialFailoverVersion, request.InitialFailoverVersion) diff --git a/tools/cassandra/cqlclient_tests.go b/tools/cassandra/cqlclient_tests.go index b987f7db1d0..474ab29650f 100644 --- a/tools/cassandra/cqlclient_tests.go +++ b/tools/cassandra/cqlclient_tests.go @@ -38,7 +38,7 @@ func (s *CQLClientTestSuite) TestParseCQLFile() { func (s *CQLClientTestSuite) TestCQLClient() { client, err := newTestCQLClient(s.DBName) - s.Nil(err) + s.NoError(err) s.RunCreateTest(client) s.RunUpdateTest(client) s.RunDropTest(client) diff --git a/tools/cassandra/handler_test.go b/tools/cassandra/handler_test.go index 4cfc062e4a3..1ab2fc21918 100644 --- a/tools/cassandra/handler_test.go +++ b/tools/cassandra/handler_test.go @@ -25,26 +25,26 @@ func (s *HandlerTestSuite) SetupTest() { func (s *HandlerTestSuite) TestValidateCQLClientConfig() { config := new(CQLClientConfig) - s.NotNil(validateCQLClientConfig(config)) + s.Error(validateCQLClientConfig(config)) config.Hosts = environment.GetCassandraAddress() - s.NotNil(validateCQLClientConfig(config)) + s.Error(validateCQLClientConfig(config)) config.Keyspace = "foobar" - s.Nil(validateCQLClientConfig(config)) + s.NoError(validateCQLClientConfig(config)) } func (s *HandlerTestSuite) TestParsingOfOptionsMap() { parsedMap := parseOptionsMap("key1=value1 ,key2= value2,key3=value3") - s.Assert().Equal("value1", parsedMap["key1"]) - s.Assert().Equal("value2", parsedMap["key2"]) - s.Assert().Equal("value3", parsedMap["key3"]) - s.Assert().Equal("", parsedMap["key4"]) + s.Equal("value1", parsedMap["key1"]) + s.Equal("value2", parsedMap["key2"]) + s.Equal("value3", parsedMap["key3"]) + s.Assert().Empty(parsedMap["key4"]) parsedMap2 := parseOptionsMap("key1=,=value2") - s.Assert().Equal(0, len(parsedMap2)) + s.Assert().Empty(parsedMap2) } func (s *HandlerTestSuite) TestDropKeyspaceError() { @@ -57,7 +57,7 @@ func (s *HandlerTestSuite) TestDropKeyspaceError() { args := []string{"./tool", "drop-keyspace", "-f", "--keyspace", ""} app := buildCLIOptions() err := app.Run(args) - s.Nil(err) + s.NoError(err) } func (s *HandlerTestSuite) TestCreateKeyspaceError() { @@ -70,5 +70,5 @@ func (s *HandlerTestSuite) TestCreateKeyspaceError() { args := []string{"./tool", "create-keyspace", "--keyspace", ""} app := buildCLIOptions() err := app.Run(args) - s.Nil(err) + s.NoError(err) } diff --git a/tools/cassandra/setup_task_tests.go b/tools/cassandra/setup_task_tests.go index a78ed543d00..936be67f971 100644 --- a/tools/cassandra/setup_task_tests.go +++ b/tools/cassandra/setup_task_tests.go @@ -27,13 +27,13 @@ func (s *SetupSchemaTestSuite) TearDownSuite() { } func (s *SetupSchemaTestSuite) TestCreateKeyspace() { - s.Nil(RunTool([]string{"./tool", "create", "-k", "foobar123", "--rf", "1"})) + s.NoError(RunTool([]string{"./tool", "create", "-k", "foobar123", "--rf", "1"})) err := s.client.dropKeyspace("foobar123") - s.Nil(err) + s.NoError(err) } func (s *SetupSchemaTestSuite) TestSetupSchema() { client, err := newTestCQLClient(s.DBName) - s.Nil(err) + s.NoError(err) s.RunSetupTest(buildCLIOptions(), client, "-k", createTestCQLFileContent(), []string{"tasks", "events"}) } diff --git a/tools/cassandra/update_task_tests.go b/tools/cassandra/update_task_tests.go index 38e13ee864b..339ed32ed1e 100644 --- a/tools/cassandra/update_task_tests.go +++ b/tools/cassandra/update_task_tests.go @@ -25,14 +25,14 @@ func (s *UpdateSchemaTestSuite) TearDownSuite() { func (s *UpdateSchemaTestSuite) TestUpdateSchema() { client, err := newTestCQLClient(s.DBName) - s.Nil(err) + s.NoError(err) defer client.Close() s.RunUpdateSchemaTest(buildCLIOptions(), client, "-k", createTestCQLFileContent(), []string{"events", "tasks"}) } func (s *UpdateSchemaTestSuite) TestDryrun() { client, err := newTestCQLClient(s.DBName) - s.Nil(err) + s.NoError(err) defer client.Close() dir := "../../schema/cassandra/temporal/versioned" s.RunDryrunTest(buildCLIOptions(), client, "-k", dir, cassandra.Version) diff --git a/tools/cassandra/version_tests.go b/tools/cassandra/version_tests.go index 666d9854b5c..4ea3f56c7f3 100644 --- a/tools/cassandra/version_tests.go +++ b/tools/cassandra/version_tests.go @@ -34,7 +34,7 @@ func (s *VersionTestSuite) TestVerifyCompatibleVersion() { cqlFile := path.Join(root, "schema/cassandra/temporal/schema.cql") defer s.createKeyspace(keyspace)() - s.Nil(RunTool([]string{ + s.NoError(RunTool([]string{ "./tool", "-k", keyspace, "-q", "setup-schema", "-f", cqlFile, "-version", "10.0", "-o", })) diff --git a/tools/common/schema/handler_test.go b/tools/common/schema/handler_test.go index 7362573e093..0de188e30b0 100644 --- a/tools/common/schema/handler_test.go +++ b/tools/common/schema/handler_test.go @@ -102,24 +102,24 @@ func (s *HandlerTestSuite) TestValidateUpdateConfig() { func (s *HandlerTestSuite) assertValidateSetupSucceeds(input *SetupConfig, db DB) { err := validateSetupConfig(input, db) - s.Nil(err) + s.NoError(err) } func (s *HandlerTestSuite) assertValidateSetupFails(input *SetupConfig, db DB) { err := validateSetupConfig(input, db) - s.NotNil(err) + s.Error(err) _, ok := err.(*ConfigError) s.True(ok) } func (s *HandlerTestSuite) assertValidateUpdateSucceeds(input *UpdateConfig, db DB) { err := validateUpdateConfig(input, db) - s.Nil(err) + s.NoError(err) } func (s *HandlerTestSuite) assertValidateUpdateFails(input *UpdateConfig, db DB) { err := validateUpdateConfig(input, db) - s.NotNil(err) + s.Error(err) _, ok := err.(*ConfigError) s.True(ok) } diff --git a/tools/common/schema/test/dbtest.go b/tools/common/schema/test/dbtest.go index e139352b7d0..3c1176d389b 100644 --- a/tools/common/schema/test/dbtest.go +++ b/tools/common/schema/test/dbtest.go @@ -88,67 +88,67 @@ func (tb *DBTestBase) RunParseFileTest(content string) { _, err := cqlFile.WriteString(content) tb.NoError(err) stmts, err := persistence.LoadAndSplitQuery([]string{cqlFile.Name()}) - tb.Nil(err) - tb.Equal(2, len(stmts), "wrong number of sql statements") + tb.NoError(err) + tb.Len(stmts, 2, "wrong number of sql statements") } // RunCreateTest tests schema version table creation func (tb *DBTestBase) RunCreateTest(db DB) { tables, err := db.ListTables() - tb.Nil(err) - tb.Equal(0, len(tables)) + tb.NoError(err) + tb.Empty(tables) err = db.CreateSchemaVersionTables() - tb.Nil(err) + tb.NoError(err) expectedTables := make(map[string]struct{}) expectedTables["schema_version"] = struct{}{} expectedTables["schema_update_history"] = struct{}{} tables, err = db.ListTables() - tb.Nil(err) - tb.Equal(len(expectedTables), len(tables)) + tb.NoError(err) + tb.Len(tables, len(expectedTables)) for _, t := range tables { _, ok := expectedTables[t] tb.True(ok) delete(expectedTables, t) } - tb.Equal(0, len(expectedTables)) + tb.Empty(expectedTables) } // RunUpdateTest tests update of schema and schema version tables func (tb *DBTestBase) RunUpdateTest(db DB) { err := db.UpdateSchemaVersion("10.0", "5.0") - tb.Nil(err) + tb.NoError(err) err = db.WriteSchemaUpdateLog("9.0", "10.0", "abc", "test") - tb.Nil(err) + tb.NoError(err) ver, err := db.ReadSchemaVersion() - tb.Nil(err) + tb.NoError(err) tb.Equal("10.0", ver) err = db.UpdateSchemaVersion("12.0", "5.0") - tb.Nil(err) + tb.NoError(err) ver, err = db.ReadSchemaVersion() - tb.Nil(err) + tb.NoError(err) tb.Equal("12.0", ver) } // RunDropTest tests the drop methods in DB implementation func (tb *DBTestBase) RunDropTest(db DB) { tables, err := db.ListTables() - tb.Nil(err) - tb.True(len(tables) > 0) + tb.NoError(err) + tb.Positive(len(tables)) err = db.DropAllTables() - tb.Nil(err) + tb.NoError(err) tables, err = db.ListTables() - tb.Nil(err) - tb.Equal(0, len(tables)) + tb.NoError(err) + tb.Empty(tables) _, err = db.ReadSchemaVersion() - tb.NotNil(err) + tb.Error(err) } diff --git a/tools/common/schema/test/setuptest.go b/tools/common/schema/test/setuptest.go index c2344bab68b..2366391d175 100644 --- a/tools/common/schema/test/setuptest.go +++ b/tools/common/schema/test/setuptest.go @@ -59,8 +59,8 @@ func (tb *SetupSchemaTestBase) RunSetupTest( }...) tb.NoError(app.Run(command)) tables, err := db.ListTables() - tb.Nil(err) - tb.Equal(0, len(tables)) + tb.NoError(err) + tb.Empty(tables) tmpDir := testutils.MkdirTemp(tb.T(), "", "setupSchemaTestDir") sqlFile := testutils.CreateTemp(tb.T(), tmpDir, "setupSchema.cliOptionsTest") @@ -77,8 +77,8 @@ func (tb *SetupSchemaTestBase) RunSetupTest( }...) tb.NoError(app.Run(command)) tables, err = db.ListTables() - tb.Nil(err) - tb.Equal(0, len(tables)) + tb.NoError(err) + tb.Empty(tables) for i := range 4 { @@ -110,22 +110,22 @@ func (tb *SetupSchemaTestBase) RunSetupTest( expectedTables := getExpectedTables(versioningEnabled, expectedTables) tables, err = db.ListTables() - tb.Nil(err) - tb.Equal(len(expectedTables), len(tables)) + tb.NoError(err) + tb.Len(tables, len(expectedTables)) for _, t := range tables { _, ok := expectedTables[t] tb.True(ok) delete(expectedTables, t) } - tb.Equal(0, len(expectedTables)) + tb.Empty(expectedTables) gotVer, err := db.ReadSchemaVersion() if versioningEnabled { - tb.Nil(err) + tb.NoError(err) tb.Equal(ver, gotVer) } else { - tb.NotNil(err) + tb.Error(err) } } } diff --git a/tools/common/schema/test/updatetest.go b/tools/common/schema/test/updatetest.go index ad2b3598a1d..f65baeaaa65 100644 --- a/tools/common/schema/test/updatetest.go +++ b/tools/common/schema/test/updatetest.go @@ -66,7 +66,7 @@ func (tb *UpdateSchemaTestBase) RunDryrunTest(app *cli.App, db DB, dbNameFlag st }...) tb.NoError(app.Run(command)) ver, err := db.ReadSchemaVersion() - tb.Nil(err) + tb.NoError(err) // update the version to the latest tb.Logger.Info(ver) tb.Equal(endVersion, ver) @@ -100,12 +100,12 @@ func (tb *UpdateSchemaTestBase) RunUpdateSchemaTest(app *cli.App, db DB, dbNameF expected["namespaces"] = struct{}{} ver, err := db.ReadSchemaVersion() - tb.Nil(err) + tb.NoError(err) tb.Equal("2.0", ver) tables, err := db.ListTables() - tb.Nil(err) - tb.Equal(len(expected), len(tables)) + tb.NoError(err) + tb.Len(tables, len(expected)) for _, t := range tables { _, ok := expected[t] @@ -113,7 +113,7 @@ func (tb *UpdateSchemaTestBase) RunUpdateSchemaTest(app *cli.App, db DB, dbNameF delete(expected, t) } - tb.Equal(0, len(expected)) + tb.Empty(expected) tb.NoError(db.DropAllTables()) } @@ -128,9 +128,9 @@ func (tb *UpdateSchemaTestBase) makeSchemaVersionDirs(rootDir string, sqlFileCon dir := rootDir + "/v1.0" tb.NoError(os.Mkdir(rootDir+"/v1.0", os.FileMode(0700))) err := os.WriteFile(dir+"/manifest.json", []byte(mData), os.FileMode(0600)) - tb.Nil(err) + tb.NoError(err) err = os.WriteFile(dir+"/base.sql", []byte(sqlFileContent), os.FileMode(0600)) - tb.Nil(err) + tb.NoError(err) mData = `{ "CurrVersion": "2.0", @@ -147,9 +147,9 @@ func (tb *UpdateSchemaTestBase) makeSchemaVersionDirs(rootDir string, sqlFileCon dir = rootDir + "/v2.0" tb.NoError(os.Mkdir(rootDir+"/v2.0", os.FileMode(0700))) err = os.WriteFile(dir+"/manifest.json", []byte(mData), os.FileMode(0600)) - tb.Nil(err) + tb.NoError(err) err = os.WriteFile(dir+"/namespace.cql", []byte(namespace), os.FileMode(0600)) - tb.Nil(err) + tb.NoError(err) } func (tb *UpdateSchemaTestBase) getCommandBase() []string { diff --git a/tools/common/schema/updatetask_test.go b/tools/common/schema/updatetask_test.go index 28d9628bb8e..da0fba67480 100644 --- a/tools/common/schema/updatetask_test.go +++ b/tools/common/schema/updatetask_test.go @@ -61,12 +61,12 @@ func (s *UpdateTaskTestSuite) TestReadSchemaDir() { // Start version found, no later versions. Return nothing. ans, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "10.2", "", s.logger) s.NoError(err) - s.Equal(0, len(ans)) + s.Empty(ans) // Start version not found, no later versions. Return nothing. ans, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "10.3", "", s.logger) s.NoError(err) - s.Equal(0, len(ans)) + s.Empty(ans) ans, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "2.5.2", "", s.logger) s.NoError(err) @@ -96,35 +96,35 @@ func (s *UpdateTaskTestSuite) TestReadSchemaDirEFS() { func (s *UpdateTaskTestSuite) TestSortAndFilterVersionsWithEndLessThanStart_ReturnsError() { _, err := sortAndFilterVersions(updateTaskTestData.versions, "1.5", "0.5", s.logger) s.Error(err) - assert.Containsf(s.T(), err.Error(), "less than end version", "Unexpected error message") + s.Containsf(err.Error(), "less than end version", "Unexpected error message") } func (s *UpdateTaskTestSuite) TestReadSchemaDirWithEndVersion_ReturnsErrorWhenNotFound() { // No versions in range _, err := readSchemaDir(os.DirFS(s.versionsDir), ".", "11.0", "11.2", s.logger) s.Error(err) - assert.Containsf(s.T(), err.Error(), "specified but not found", "Unexpected error message") + s.Containsf(err.Error(), "specified but not found", "Unexpected error message") // Versions in range, but nothing for v10.3 _, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "0.5", "10.3", s.logger) s.Error(err) - assert.Containsf(s.T(), err.Error(), "specified but not found", "Unexpected error message") + s.Containsf(err.Error(), "specified but not found", "Unexpected error message") } func (s *UpdateTaskTestSuite) TestReadSchemaDirWithSameStartAndEnd_ReturnsEmptyList() { ans, err := readSchemaDir(os.DirFS(s.versionsDir), ".", "1.7", "1.7", s.logger) s.NoError(err) - assert.Equal(s.T(), 0, len(ans)) + assert.Empty(s.T(), ans) } func (s *UpdateTaskTestSuite) TestReadSchemaDirWithEmptyDir_ReturnsError() { _, err := readSchemaDir(os.DirFS(s.emptyDir), ".", "11.0", "", s.logger) s.Error(err) - assert.Containsf(s.T(), err.Error(), "contains no subDirs", "Unexpected error message") + s.Containsf(err.Error(), "contains no subDirs", "Unexpected error message") _, err = readSchemaDir(os.DirFS(s.emptyDir), ".", "10.1", "", s.logger) s.Error(err) - assert.Containsf(s.T(), err.Error(), "contains no subDirs", "Unexpected error message") + s.Containsf(err.Error(), "contains no subDirs", "Unexpected error message") } func (s *UpdateTaskTestSuite) TestReadManifest() { @@ -206,7 +206,7 @@ func (s *UpdateTaskTestSuite) runReadManifestTest( file := dir + "/manifest.json" err := os.WriteFile(file, []byte(input), os.FileMode(0644)) - s.Nil(err) + s.NoError(err) m, err := readManifest(os.DirFS(dir), ".") if isErr { @@ -217,6 +217,6 @@ func (s *UpdateTaskTestSuite) runReadManifestTest( s.Equal(currVer, m.CurrVersion) s.Equal(minVer, m.MinCompatibleVersion) s.Equal(desc, m.Description) - s.True(len(m.md5) > 0) + s.Positive(len(m.md5)) s.Equal(files, m.SchemaUpdateCqlFiles) } diff --git a/tools/elasticsearch/main_test.go b/tools/elasticsearch/main_test.go index 251af9c665a..31e7464e8e7 100644 --- a/tools/elasticsearch/main_test.go +++ b/tools/elasticsearch/main_test.go @@ -33,7 +33,7 @@ func (s *MainTestSuite) TestSetupSchemaError() { args := []string{"./tool", "setup-schema"} app := BuildCLIOptions() err := app.Run(args) - s.Nil(err) + s.NoError(err) } func (s *MainTestSuite) TestPingError() { @@ -46,5 +46,5 @@ func (s *MainTestSuite) TestPingError() { args := []string{"./tool", "--endpoint", "http://nonexistent:9200", "ping"} app := BuildCLIOptions() err := app.Run(args) - s.Nil(err) + s.NoError(err) } diff --git a/tools/sql/clitest/conn_tests.go b/tools/sql/clitest/conn_tests.go index 137d8fd879f..f08681ad30b 100644 --- a/tools/sql/clitest/conn_tests.go +++ b/tools/sql/clitest/conn_tests.go @@ -72,7 +72,7 @@ func (s *SQLConnTestSuite) TestParseCQLFile() { // TestSQLConn test func (s *SQLConnTestSuite) TestSQLConn() { conn, err := newTestConn(s.DBName, s.host, s.port, s.pluginName) - s.Nil(err) + s.NoError(err) s.RunCreateTest(conn) s.RunUpdateTest(conn) s.RunDropTest(conn) diff --git a/tools/sql/clitest/handler_tests.go b/tools/sql/clitest/handler_tests.go index adca13224f7..3c348e5b687 100644 --- a/tools/sql/clitest/handler_tests.go +++ b/tools/sql/clitest/handler_tests.go @@ -44,14 +44,14 @@ func (s *HandlerTestSuite) SetupTest() { func (s *HandlerTestSuite) TestValidateConnectConfig() { cfg := new(config.SQL) - s.NotNil(sql.ValidateConnectConfig(cfg)) + s.Error(sql.ValidateConnectConfig(cfg)) cfg.ConnectAddr = net.JoinHostPort( environment.GetMySQLAddress(), strconv.Itoa(environment.GetMySQLPort()), ) - s.NotNil(sql.ValidateConnectConfig(cfg)) + s.Error(sql.ValidateConnectConfig(cfg)) cfg.DatabaseName = "foobar" - s.Nil(sql.ValidateConnectConfig(cfg)) + s.NoError(sql.ValidateConnectConfig(cfg)) } diff --git a/tools/sql/clitest/update_task_tests.go b/tools/sql/clitest/update_task_tests.go index 48df6260ff9..e85ee917d80 100644 --- a/tools/sql/clitest/update_task_tests.go +++ b/tools/sql/clitest/update_task_tests.go @@ -66,7 +66,7 @@ func (s *UpdateSchemaTestSuite) TearDownSuite() { // TestUpdateSchema test func (s *UpdateSchemaTestSuite) TestUpdateSchema() { conn, err := newTestConn(s.DBName, s.host, s.port, s.pluginName) - s.Nil(err) + s.NoError(err) defer conn.Close() s.RunUpdateSchemaTest(sql.BuildCLIOptions(), conn, "--db", s.sqlQuery, []string{"executions", "current_executions"}) } diff --git a/tools/tdbg/app_test.go b/tools/tdbg/app_test.go index 10627a6b456..16253f953d0 100644 --- a/tools/tdbg/app_test.go +++ b/tools/tdbg/app_test.go @@ -31,7 +31,7 @@ func (s *utilSuite) TestAcceptStringSliceArgsWithCommas() { Name: "dostuff", Action: func(c *cli.Context) error { input := c.StringSlice("input") - s.Equal(3, len(input)) + s.Len(input, 3) expectedInput := []string{"s1", "s2", "s3"} s.Equal(expectedInput, input) return nil diff --git a/tools/tdbg/util_test.go b/tools/tdbg/util_test.go index 861829ddbbd..44ff7beb88b 100644 --- a/tools/tdbg/util_test.go +++ b/tools/tdbg/util_test.go @@ -12,7 +12,7 @@ func (s *utilSuite) TestStringToEnum_MapCaseInsensitive() { result, err := tdbg.StringToEnum("timeR", enumValues) s.NoError(err) - s.Equal(result, int32(2)) // Timer + s.Equal(int32(2), result) // Timer } func (s *utilSuite) TestStringToEnum_MapNonExisting() { @@ -25,7 +25,7 @@ func (s *utilSuite) TestStringToEnum_MapNonExisting() { result, err := tdbg.StringToEnum("Timer2", enumValues) s.Error(err) - s.Equal(result, int32(0)) + s.Equal(int32(0), result) } func (s *utilSuite) TestStringToEnum_MapEmptyValue() { @@ -38,7 +38,7 @@ func (s *utilSuite) TestStringToEnum_MapEmptyValue() { result, err := tdbg.StringToEnum("", enumValues) s.NoError(err) - s.Equal(result, int32(0)) + s.Equal(int32(0), result) } func (s *utilSuite) TestStringToEnum_MapEmptyEnum() { @@ -46,5 +46,5 @@ func (s *utilSuite) TestStringToEnum_MapEmptyEnum() { result, err := tdbg.StringToEnum("Timer", enumValues) s.Error(err) - s.Equal(result, int32(0)) + s.Equal(int32(0), result) } diff --git a/tools/testrunner/junit_test.go b/tools/testrunner/junit_test.go index df806928d84..124937aa311 100644 --- a/tools/testrunner/junit_test.go +++ b/tools/testrunner/junit_test.go @@ -319,7 +319,7 @@ func TestJUnitXMLWellFormed(t *testing.T) { require.NoError(t, j2.read(), "Should be able to re-read the written XML") // Validate that the structure is reasonable - require.Greater(t, len(parsed.Suites), 0, "Should have at least one test suite") + require.NotEmpty(t, parsed.Suites, "Should have at least one test suite") }) } } diff --git a/tools/testrunner/log_test.go b/tools/testrunner/log_test.go index a3ca35f4def..779809bca36 100644 --- a/tools/testrunner/log_test.go +++ b/tools/testrunner/log_test.go @@ -72,7 +72,7 @@ func TestParseAlerts_DataRaceAndPanic(t *testing.T) { alerts := parseAlerts(string(input)) require.NotEmpty(t, alerts) - require.Equal(t, 2, len(alerts)) + require.Len(t, alerts, 2) require.Contains(t, alerts[0].Details, "WARNING: DATA RACE") require.Contains(t, alerts[0].Tests[0], "test.TestDataRaceExample") @@ -83,7 +83,7 @@ func TestParseAlerts_DataRaceAndPanic(t *testing.T) { // Ensure dedupe works deduped := dedupeAlerts(append(alerts, alerts...)) - require.Equal(t, len(deduped), len(alerts)) + require.Len(t, alerts, len(deduped)) } func TestParseFailureDetails(t *testing.T) { From 6b1e58f013a84467f7579d5a66002e8aaa5dca13 Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Sun, 21 Jun 2026 10:34:41 -0700 Subject: [PATCH 2/7] Run goimports after testifylint fixes --- common/masker/masker_test.go | 1 - service/frontend/namespace_handler_test.go | 1 - service/history/handler_test.go | 1 - .../history/replication/stream_sender_flow_controller_test.go | 1 - service/history/workflow/activity_test.go | 1 - service/worker/deletenamespace/deleteexecutions/workflow_test.go | 1 - service/worker/scanner/executions/task_test.go | 1 - 7 files changed, 7 deletions(-) diff --git a/common/masker/masker_test.go b/common/masker/masker_test.go index b5adb362764..07ba17fa2eb 100644 --- a/common/masker/masker_test.go +++ b/common/masker/masker_test.go @@ -2,7 +2,6 @@ package masker import ( "fmt" - "strings" "testing" "github.com/stretchr/testify/assert" diff --git a/service/frontend/namespace_handler_test.go b/service/frontend/namespace_handler_test.go index 8def8e9eb36..eee83dca972 100644 --- a/service/frontend/namespace_handler_test.go +++ b/service/frontend/namespace_handler_test.go @@ -7,7 +7,6 @@ import ( "time" "github.com/google/uuid" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" enumspb "go.temporal.io/api/enums/v1" namespacepb "go.temporal.io/api/namespace/v1" diff --git a/service/history/handler_test.go b/service/history/handler_test.go index 22149954941..90802ad049f 100644 --- a/service/history/handler_test.go +++ b/service/history/handler_test.go @@ -2,7 +2,6 @@ package history import ( "context" - "errors" "testing" "github.com/stretchr/testify/assert" diff --git a/service/history/replication/stream_sender_flow_controller_test.go b/service/history/replication/stream_sender_flow_controller_test.go index 4c215da9e81..dd18e1d6a9d 100644 --- a/service/history/replication/stream_sender_flow_controller_test.go +++ b/service/history/replication/stream_sender_flow_controller_test.go @@ -6,7 +6,6 @@ import ( "testing" "time" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" enumsspb "go.temporal.io/server/api/enums/v1" replicationspb "go.temporal.io/server/api/replication/v1" diff --git a/service/history/workflow/activity_test.go b/service/history/workflow/activity_test.go index a6d0ddf4735..d5d538b82ce 100644 --- a/service/history/workflow/activity_test.go +++ b/service/history/workflow/activity_test.go @@ -2,7 +2,6 @@ package workflow import ( "context" - "fmt" "testing" "time" diff --git a/service/worker/deletenamespace/deleteexecutions/workflow_test.go b/service/worker/deletenamespace/deleteexecutions/workflow_test.go index 4dbaef41d9d..ee5a90fbb1f 100644 --- a/service/worker/deletenamespace/deleteexecutions/workflow_test.go +++ b/service/worker/deletenamespace/deleteexecutions/workflow_test.go @@ -3,7 +3,6 @@ package deleteexecutions import ( "context" "encoding/json" - stderrors "errors" "strconv" "sync/atomic" "testing" diff --git a/service/worker/scanner/executions/task_test.go b/service/worker/scanner/executions/task_test.go index 01145a0fa47..bd1a591fdf9 100644 --- a/service/worker/scanner/executions/task_test.go +++ b/service/worker/scanner/executions/task_test.go @@ -5,7 +5,6 @@ import ( "errors" "testing" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "go.temporal.io/server/common/log" "go.temporal.io/server/common/metrics" From 00c33bf92d3d6c5f81cafb32ab47cdd3474b6a8b Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Sun, 21 Jun 2026 10:53:08 -0700 Subject: [PATCH 3/7] Revert testifylint fixes with lint errors --- client/history/historytest/clienttest.go | 4 +- common/api/metadata_test.go | 4 +- .../archiver/gcloud/history_archiver_test.go | 10 +- common/cache/lru_test.go | 34 +-- common/collection/paging_iterator_test.go | 8 +- common/collection/sync_map_test.go | 4 +- common/dynamicconfig/deepcopy_test.go | 4 +- common/log/zap_logger_test.go | 16 +- common/masker/masker_test.go | 7 +- common/metrics/otel_metrics_handler_test.go | 4 +- common/metrics/tally/statsd/reporter_test.go | 2 +- common/namespace/namespace_test.go | 2 +- .../replication_task_executor_test.go | 18 +- common/payloads/payloads_test.go | 2 +- .../history_task_queue_manager_test.go | 2 +- .../operation_mode_validator_test.go | 48 ++-- .../cluster_metadata_manager.go | 54 ++--- .../history_v2_persistence.go | 206 +++++++++--------- .../metadata_persistence_v2.go | 112 +++++----- .../persistence-tests/queue_persistence.go | 40 ++-- .../persistence_metrics_clients_test.go | 8 +- .../serialization/serializer_test.go | 16 +- common/persistence/serializer_test.go | 16 +- .../sql/sqlplugin/tests/queue_v2.go | 8 +- .../persistence/tests/queue_v2_test_suite.go | 18 +- .../versionhistory/version_history_test.go | 16 +- .../store/elasticsearch/converter_test.go | 8 +- .../visibility_store_read_test.go | 60 ++--- common/retrypolicy/retry_policy_test.go | 6 +- common/rpc/dial_tracer_test.go | 4 +- .../interceptor/mask_internal_error_test.go | 2 +- common/rpc/interceptor/sdk_version_test.go | 2 +- .../sadefs/encode_value_test.go | 2 +- common/searchattribute/validator_test.go | 2 +- common/util/strings_test.go | 6 +- .../worker_versioning_test.go | 4 +- schema/embed_test.go | 2 +- service/frontend/admin_handler_test.go | 20 +- service/frontend/workflow_handler_test.go | 20 +- .../api/command_attr_validator_test.go | 14 +- service/history/api/pollupdate/api_test.go | 2 +- .../archival_queue_task_executor_test.go | 2 +- service/history/handler_test.go | 3 +- service/history/history_engine2_test.go | 48 ++-- service/history/history_engine_test.go | 142 ++++++------ .../historybuilder/history_builder_test.go | 39 ++-- service/history/queues/queue_base_test.go | 32 +-- service/history/queues/slice_test.go | 6 +- .../executable_history_task_test.go | 8 +- .../stream_sender_flow_controller_test.go | 3 +- .../timer_queue_active_task_executor_test.go | 18 +- .../workflow/mutable_state_impl_test.go | 94 ++++---- service/history/workflow/query_test.go | 2 +- service/matching/fair_level_test.go | 2 +- service/matching/matcher_data_test.go | 14 +- service/matching/matcher_test.go | 30 +-- service/matching/matching_engine_test.go | 150 ++++++------- service/matching/reachability_test.go | 8 +- .../task_queue_partition_manager_test.go | 20 +- service/matching/task_validation_test.go | 4 +- service/matching/version_rule_helper_test.go | 2 +- service/matching/version_rule_test.go | 12 +- service/worker/migration/activities_test.go | 12 +- .../force_replication_workflow_test.go | 6 +- .../worker/scanner/history/scavenger_test.go | 36 +-- tools/cassandra/handler_test.go | 20 +- tools/common/schema/test/dbtest.go | 38 ++-- tools/common/schema/updatetask_test.go | 20 +- 68 files changed, 796 insertions(+), 792 deletions(-) diff --git a/client/history/historytest/clienttest.go b/client/history/historytest/clienttest.go index f758fad6848..effa2479c77 100644 --- a/client/history/historytest/clienttest.go +++ b/client/history/historytest/clienttest.go @@ -94,7 +94,7 @@ func TestClient(t *testing.T, historyTaskQueueManager persistence.HistoryTaskQue PageSize: 10, }) require.NoError(t, err) - assert.Len(t, res.DlqTasks, 1) + assert.Equal(t, 1, len(res.DlqTasks)) assert.Equal(t, int64(persistence.FirstQueueMessageID+1), res.DlqTasks[0].Metadata.MessageId) }) @@ -128,7 +128,7 @@ func readTasks( NextPageToken: nextPageToken, }) require.NoError(t, err) - assert.Len(t, res.DlqTasks, 1) + assert.Equal(t, 1, len(res.DlqTasks)) assert.Equal(t, int64(persistence.FirstQueueMessageID+i), res.DlqTasks[0].Metadata.MessageId) nextPageToken = res.NextPageToken } diff --git a/common/api/metadata_test.go b/common/api/metadata_test.go index 4a768098bb1..6b7791a6cd5 100644 --- a/common/api/metadata_test.go +++ b/common/api/metadata_test.go @@ -105,6 +105,6 @@ func getMethodNames(tp reflect.Type) []string { func TestServiceName(t *testing.T) { assert.Equal(t, WorkflowServicePrefix, ServiceName(WorkflowServicePrefix+"SomeAPI")) assert.Equal(t, AdminServicePrefix, ServiceName(AdminServicePrefix+"SomeAPI")) - assert.Empty(t, ServiceName("SomeAPI")) - assert.Empty(t, ServiceName("")) + assert.Equal(t, "", ServiceName("SomeAPI")) + assert.Equal(t, "", ServiceName("")) } diff --git a/common/archiver/gcloud/history_archiver_test.go b/common/archiver/gcloud/history_archiver_test.go index f800ff23dba..237118461f3 100644 --- a/common/archiver/gcloud/history_archiver_test.go +++ b/common/archiver/gcloud/history_archiver_test.go @@ -517,7 +517,7 @@ func (h *historyArchiverSuite) TestGet_Success_PageSize() { response, err := historyArchiver.Get(ctx, h.testArchivalURI, request) h.NoError(err) h.NotNil(response.NextPageToken) - h.EqualValues(2, len(response.HistoryBatches)) + h.EqualValues(len(response.HistoryBatches), 2) } func (h *historyArchiverSuite) TestGet_Success_FromToken() { @@ -557,15 +557,15 @@ func (h *historyArchiverSuite) TestGet_Success_FromToken() { token, err = deserializeGetHistoryToken(response.NextPageToken) h.NoError(err) - h.Equal(5, token.HighestPart) - h.Equal(5, token.CurrentPart) - h.Len(response.HistoryBatches, 3) + h.EqualValues(5, token.HighestPart) + h.EqualValues(5, token.CurrentPart) + h.EqualValues(3, len(response.HistoryBatches)) numOfEvents := 0 for _, batch := range response.HistoryBatches { numOfEvents += len(batch.Events) } - h.Equal(4, numOfEvents) + h.EqualValues(4, numOfEvents) } func (h *historyArchiverSuite) TestGet_NoHistory() { diff --git a/common/cache/lru_test.go b/common/cache/lru_test.go index 4c3c3fe03ac..bb73bc38ab4 100644 --- a/common/cache/lru_test.go +++ b/common/cache/lru_test.go @@ -67,7 +67,7 @@ func TestLRU(t *testing.T) { assert.Nil(t, cache.Get("B")) // Oldest, should be evicted assert.Equal(t, 4, cache.Size()) snapshot = capture.Snapshot() - assert.Len(t, snapshot[metrics.CacheUsage.Name()], 2) + assert.Equal(t, 2, len(snapshot[metrics.CacheUsage.Name()])) assert.Equal(t, float64(4), snapshot[metrics.CacheUsage.Name()][1].Value) // Access C, D is now LRU @@ -81,7 +81,7 @@ func TestLRU(t *testing.T) { assert.Nil(t, cache.Get("A")) assert.Equal(t, 3, cache.Size()) snapshot = capture.Snapshot() - assert.Len(t, snapshot[metrics.CacheUsage.Name()], 1) + assert.Equal(t, 1, len(snapshot[metrics.CacheUsage.Name()])) assert.Equal(t, float64(3), snapshot[metrics.CacheUsage.Name()][0].Value) } @@ -136,10 +136,10 @@ func TestLRUWithTTL(t *testing.T) { timeSource.Advance(time.Millisecond * 300) assert.Nil(t, cache.Get("A")) snapshot = capture.Snapshot() - assert.Len(t, snapshot[metrics.CacheUsage.Name()], 2) + assert.Equal(t, 2, len(snapshot[metrics.CacheUsage.Name()])) assert.Equal(t, float64(0), snapshot[metrics.CacheUsage.Name()][1].Value) assert.Equal(t, 0, cache.Size()) - assert.Len(t, snapshot[metrics.CacheEntryAgeOnGet.Name()], 1) + assert.Equal(t, 1, len(snapshot[metrics.CacheEntryAgeOnGet.Name()])) assert.Equal(t, time.Millisecond*300, snapshot[metrics.CacheEntryAgeOnEviction.Name()][0].Value) } @@ -389,7 +389,7 @@ func TestZeroSizeCache(t *testing.T) { cache := NewLRU(0, metrics.NoopMetricsHandler) _, err := cache.PutIfNotExist("A", t) assert.NoError(t, err) - assert.Nil(t, cache.Get("A")) + assert.Equal(t, nil, cache.Get("A")) assert.Equal(t, 0, cache.Size()) it := cache.Iterator() assert.False(t, it.HasNext()) @@ -398,7 +398,7 @@ func TestZeroSizeCache(t *testing.T) { cache.Delete("A") v, err := cache.PutIfNotExist("A", t) assert.Equal(t, v, t) - assert.NoError(t, err) + assert.Nil(t, err) assert.Equal(t, 0, cache.Size()) } @@ -409,12 +409,12 @@ func TestCache_ItemSizeTooLarge(t *testing.T) { cache := NewLRU(maxTotalBytes, metrics.NoopMetricsHandler) res := cache.Put(uuid.New(), &testEntryWithCacheSize{maxTotalBytes}) - assert.Nil(t, res) + assert.Equal(t, res, nil) assert.Equal(t, 10, cache.Size()) res, err := cache.PutIfNotExist(uuid.New(), &testEntryWithCacheSize{maxTotalBytes + 1}) assert.Equal(t, err, ErrCacheItemTooLarge) - assert.Nil(t, res) + assert.Equal(t, res, nil) assert.Equal(t, 10, cache.Size()) } @@ -435,7 +435,7 @@ func TestCache_ItemHasCacheSizeDefined(t *testing.T) { go func() { startWG.Wait() - assert.Less(t, cache.Size(), maxTotalBytes) + assert.True(t, cache.Size() < maxTotalBytes) }() for range numPuts { go func() { @@ -492,7 +492,7 @@ func TestCache_ItemHasCacheSizeDefined_PutWithSameKeyAndDifferentSizes(t *testin assert.Equal(t, 8, cache.Size()) // put same key with smaller size, should not evict any items cache.Put(key2, &testEntryWithCacheSize{3}) - assert.Equal(t, &testEntryWithCacheSize{4}, cache.Get(key1)) + assert.Equal(t, cache.Get(key1), &testEntryWithCacheSize{4}) // 8 - 4 + 3 = 7 < 10, should not evict any items assert.Equal(t, 7, cache.Size()) @@ -501,15 +501,15 @@ func TestCache_ItemHasCacheSizeDefined_PutWithSameKeyAndDifferentSizes(t *testin // 7 - 3 + 6 = 10 =< 10, should not evict any items assert.Equal(t, 10, cache.Size()) // get key1 after to make it the most recently used - assert.Equal(t, &testEntryWithCacheSize{6}, cache.Get(key2)) - assert.Equal(t, &testEntryWithCacheSize{4}, cache.Get(key1)) + assert.Equal(t, cache.Get(key2), &testEntryWithCacheSize{6}) + assert.Equal(t, cache.Get(key1), &testEntryWithCacheSize{4}) // put same key with larger size, but take all cache size, should evict all items cache.Put(key2, &testEntryWithCacheSize{10}) // 10 - 4 - 6 + 10 = 10 =< 10, should evict all items assert.Equal(t, 10, cache.Size()) - assert.Nil(t, cache.Get(key1)) - assert.Equal(t, &testEntryWithCacheSize{10}, cache.Get(key2)) + assert.Equal(t, cache.Get(key1), nil) + assert.Equal(t, cache.Get(key2), &testEntryWithCacheSize{10}) } func TestCache_ItemHasCacheSizeDefined_PutWithSameKey(t *testing.T) { @@ -709,11 +709,11 @@ func TestCache_InvokeLifecycleCallbacks(t *testing.T) { TTL: ttl, TimeSource: timeSource, OnPut: func(val any) { - require.Equal(t, "value", val) + require.Equal(t, val, "value") onPut++ }, OnEvict: func(val any) { - require.Equal(t, "value", val) + require.Equal(t, val, "value") onEvict++ }, }, @@ -803,7 +803,7 @@ func TestCache_UnusedExpiry(t *testing.T) { // The cache should still have entry 4, r.Equal(1, cache.Size()) // but this Get call will check the (hard) ttl & expire it. - r.Nil(cache.Get(4)) + r.Equal(nil, cache.Get(4)) } func TestCache_UnusedExpiryPin(t *testing.T) { diff --git a/common/collection/paging_iterator_test.go b/common/collection/paging_iterator_test.go index e34507177d4..e788af230f0 100644 --- a/common/collection/paging_iterator_test.go +++ b/common/collection/paging_iterator_test.go @@ -50,7 +50,7 @@ func (s *pagingIteratorSuite) TestIteration_NoErr() { pagingFn := func(token []byte) ([]int, []byte, error) { switch phase { case 0: - s.Empty(token) + s.Equal(0, len(token)) defer func() { phase++ }() return outputs[phase], tokens[phase], nil case 1: @@ -74,7 +74,7 @@ func (s *pagingIteratorSuite) TestIteration_NoErr() { ite := NewPagingIterator(pagingFn) for ite.HasNext() { num, err := ite.Next() - s.NoError(err) + s.Nil(err) result = append(result, num) } s.Equal([]int{1, 2, 3, 4, 5, 6}, result) @@ -95,7 +95,7 @@ func (s *pagingIteratorSuite) TestIteration_Err_Beginging() { s.True(ite.HasNext()) item, err := ite.Next() s.Nil(item) - s.Error(err) + s.NotNil(err) s.False(ite.HasNext()) } @@ -111,7 +111,7 @@ func (s *pagingIteratorSuite) TestIteration_Err_NotBegining() { pagingFn := func(token []byte) ([]any, []byte, error) { switch phase { case 0: - s.Empty(token) + s.Equal(0, len(token)) defer func() { phase++ }() return outputs[phase], tokens[phase], nil case 1: diff --git a/common/collection/sync_map_test.go b/common/collection/sync_map_test.go index 80d6c21152c..87521542f79 100644 --- a/common/collection/sync_map_test.go +++ b/common/collection/sync_map_test.go @@ -122,7 +122,7 @@ func TestMap_Pop_ReturnsTrueWhenKeyExists(t *testing.T) { func TestMap_PopAll(t *testing.T) { m := collection.NewSyncMap[int, int]() values := m.PopAll() - assert.Empty(t, values) + assert.Equal(t, 0, len(values)) m.Set(1, 1) m.Set(2, 2) @@ -133,7 +133,7 @@ func TestMap_PopAll(t *testing.T) { mCopy := m values = m.PopAll() - assert.Len(t, values, 3) + assert.Equal(t, 3, len(values)) sum := 0 for _, v := range values { sum += v diff --git a/common/dynamicconfig/deepcopy_test.go b/common/dynamicconfig/deepcopy_test.go index e2e58d6cd25..a612eafbb15 100644 --- a/common/dynamicconfig/deepcopy_test.go +++ b/common/dynamicconfig/deepcopy_test.go @@ -70,7 +70,7 @@ func TestDeepCopy_Map(t *testing.T) { b := deepCopyForMapstructure(a) a[3] = 7 a[8] = 9 - assert.Equal(t, 5, b[3]) + assert.Equal(t, b[3], 5) assert.Zero(t, b[8]) } @@ -81,7 +81,7 @@ func TestDeepCopy_MapMap(t *testing.T) { } b := deepCopyForMapstructure(a) a[5]["five"] = 3 - assert.Equal(t, 5, b[5]["five"]) + assert.Equal(t, b[5]["five"], 5) } func TestDeepCopy_OtherReferenceTypes_Nil(t *testing.T) { diff --git a/common/log/zap_logger_test.go b/common/log/zap_logger_test.go index 191a108c3a7..a5746c83060 100644 --- a/common/log/zap_logger_test.go +++ b/common/log/zap_logger_test.go @@ -52,7 +52,7 @@ func (s *LogSuite) TestNewLogger() { log := BuildZapLogger(cfg) s.NotNil(log) _, err := os.Stat(dir + "/test.log") - s.NoError(err) + s.Nil(err) log.DPanic("Development default is false; should not panic here!") s.Panics(nil, func() { log.Panic("Must Panic") @@ -66,7 +66,7 @@ func (s *LogSuite) TestNewLogger() { log = BuildZapLogger(cfg) s.NotNil(log) _, err = os.Stat(dir + "/test.log") - s.NoError(err) + s.Nil(err) s.Panics(nil, func() { log.DPanic("Must panic!") }) @@ -100,12 +100,12 @@ func TestDefaultLogger(t *testing.T) { withLogger.Info("Log message with tag") // put Stdout back to normal state - require.NoError(t, w.Close()) + require.Nil(t, w.Close()) os.Stdout = old // restoring the real stdout out := <-outC sps := strings.Split(preCaller, ":") par, err := strconv.Atoi(sps[1]) - assert.NoError(t, err) + assert.Nil(t, err) lineNum := fmt.Sprintf("%v", par+1) assert.Regexp(t, `{"level":"info","msg":"test info","error":"test error","wf-action":"add-workflow-started-event","logging-call-at":".*zap_logger_test.go:`+lineNum+`"}`+"\n", out) @@ -134,12 +134,12 @@ func TestThrottleLogger(t *testing.T) { With(With(logger, tag.Error(fmt.Errorf("test error"))), tag.ComponentShardContext).Info("test info", tag.WorkflowActionWorkflowStarted) // back to normal state - require.NoError(t, w.Close()) + require.Nil(t, w.Close()) os.Stdout = old // restoring the real stdout out := <-outC sps := strings.Split(preCaller, ":") par, err := strconv.Atoi(sps[1]) - assert.NoError(t, err) + assert.Nil(t, err) lineNum := fmt.Sprintf("%v", par+1) fmt.Println(out, lineNum) assert.Regexp(t, `{"level":"info","msg":"test info","error":"test error","component":"shard-context","wf-action":"add-workflow-started-event","logging-call-at":".*zap_logger_test.go:`+lineNum+`"}`+"\n", out) @@ -163,12 +163,12 @@ func TestEmptyMsg(t *testing.T) { logger.With(tag.Error(fmt.Errorf("test error"))).Info("", tag.WorkflowActionWorkflowStarted) // back to normal state - require.NoError(t, w.Close()) + require.Nil(t, w.Close()) os.Stdout = old // restoring the real stdout out := <-outC sps := strings.Split(preCaller, ":") par, err := strconv.Atoi(sps[1]) - assert.NoError(t, err) + assert.Nil(t, err) lineNum := fmt.Sprintf("%v", par+1) fmt.Println(out, lineNum) assert.Regexp(t, `{"level":"info","msg":"`+defaultMsgForEmpty+`","error":"test error","wf-action":"add-workflow-started-event","logging-call-at":".*zap_logger_test.go:`+lineNum+`"}`+"\n", out) diff --git a/common/masker/masker_test.go b/common/masker/masker_test.go index 07ba17fa2eb..d1962ce1433 100644 --- a/common/masker/masker_test.go +++ b/common/masker/masker_test.go @@ -2,6 +2,7 @@ package masker import ( "fmt" + "strings" "testing" "github.com/stretchr/testify/assert" @@ -67,9 +68,9 @@ func TestMaskYaml(t *testing.T) { maskedYaml, err := MaskYaml(yaml, DefaultYAMLFieldNames) assert.NoError(err) - assert.Contains(yaml, "secret") - assert.NotContains(maskedYaml, "secret") - assert.Contains(maskedYaml, "******") + assert.True(strings.Contains(yaml, "secret")) + assert.False(strings.Contains(maskedYaml, "secret")) + assert.True(strings.Contains(maskedYaml, "******")) fmt.Println(maskedYaml) } diff --git a/common/metrics/otel_metrics_handler_test.go b/common/metrics/otel_metrics_handler_test.go index 8ced74ec7da..e186e79ec9f 100644 --- a/common/metrics/otel_metrics_handler_test.go +++ b/common/metrics/otel_metrics_handler_test.go @@ -88,7 +88,7 @@ func TestMeter(t *testing.T) { var got metricdata.ResourceMetrics err = rdr.Collect(ctx, &got) - assert.NoError(t, err) + assert.Nil(t, err) want := []metricdata.Metrics{ { @@ -232,7 +232,7 @@ func TestMeter_TimerInSeconds(t *testing.T) { var got metricdata.ResourceMetrics err = rdr.Collect(ctx, &got) - assert.NoError(t, err) + assert.Nil(t, err) want := []metricdata.Metrics{ { diff --git a/common/metrics/tally/statsd/reporter_test.go b/common/metrics/tally/statsd/reporter_test.go index 463871000ad..029017f4103 100644 --- a/common/metrics/tally/statsd/reporter_test.go +++ b/common/metrics/tally/statsd/reporter_test.go @@ -63,7 +63,7 @@ func TestMetricNameWithSeparatedTags(t *testing.T) { if sep == "" { // Tags should be embedded. - assert.Equal(t, "test-metric-name3.tag1.123.tag2.456.tag3.789", newName) + assert.Equal(t, newName, "test-metric-name3.tag1.123.tag2.456.tag3.789") } else { // Tags will be appended with the separator. assert.True(t, strings.HasPrefix(newName, name)) diff --git a/common/namespace/namespace_test.go b/common/namespace/namespace_test.go index 653fc236e2d..b676cf7eafd 100644 --- a/common/namespace/namespace_test.go +++ b/common/namespace/namespace_test.go @@ -120,5 +120,5 @@ func TestNamespace_GetCustomData(t *testing.T) { data := ns.GetCustomData("foo") assert.Equal(t, "bar", data) data2 := ns.GetCustomData("fake") - assert.Empty(t, data2) + assert.Equal(t, "", data2) } diff --git a/common/namespace/nsreplication/replication_task_executor_test.go b/common/namespace/nsreplication/replication_task_executor_test.go index ff465514692..8b8cde153be 100644 --- a/common/namespace/nsreplication/replication_task_executor_test.go +++ b/common/namespace/nsreplication/replication_task_executor_test.go @@ -123,7 +123,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas task.Id = uuid.NewString() task.Info.Name = name err := s.namespaceReplicator.Execute(context.Background(), task) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.InvalidArgument{}, err) task.Id = id @@ -145,7 +145,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas }).Times(2) s.mockMetadataMgr.EXPECT().CreateNamespace(gomock.Any(), gomock.Any()).Return(nil, errors.New("test")) err = s.namespaceReplicator.Execute(context.Background(), task) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -254,7 +254,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas IsGlobalNamespace: true, }) err := s.namespaceReplicator.Execute(context.Background(), task) - s.NoError(err) + s.Nil(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTask_Duplicate() { @@ -299,7 +299,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas }}, nil).Times(1) s.mockMetadataMgr.EXPECT().CreateNamespace(gomock.Any(), gomock.Any()).Return(nil, errors.New("test")) err := s.namespaceReplicator.Execute(context.Background(), task) - s.NoError(err) + s.Nil(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_NamespaceNotExist() { @@ -384,7 +384,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ IsGlobalNamespace: true, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.NoError(err) + s.Nil(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_UpdateConfig_UpdateActiveCluster() { @@ -487,7 +487,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ NotificationVersion: updateFailoverVersion, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.NoError(err) + s.Nil(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_UpdateConfig_NoUpdateActiveCluster() { @@ -581,7 +581,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ NotificationVersion: updateFailoverVersion, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.NoError(err) + s.Nil(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_NoUpdateConfig_UpdateActiveCluster() { @@ -663,7 +663,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ NotificationVersion: updateFailoverVersion, }) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.NoError(err) + s.Nil(err) } func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_NoUpdateConfig_NoUpdateActiveCluster() { @@ -733,7 +733,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_ s.mockMetadataMgr.EXPECT().UpdateNamespace(gomock.Any(), gomock.Any()).Times(0) err := s.namespaceReplicator.Execute(context.Background(), updateTask) - s.NoError(err) + s.Nil(err) } // TestExecute_UpdateNamespaceTask_FailoverPropagatesNormalState verifies the diff --git a/common/payloads/payloads_test.go b/common/payloads/payloads_test.go index be0f922c032..593c0ae04a7 100644 --- a/common/payloads/payloads_test.go +++ b/common/payloads/payloads_test.go @@ -37,7 +37,7 @@ func TestToString(t *testing.T) { }, 10, "str") assert.NoError(err) result = ToString(p) - assert.JSONEq(`[{"Int":10,"String":"str","Bytes":"MzQ1"}, 10, "str"]`, result) + assert.Equal(`[{"Int":10,"String":"str","Bytes":"MzQ1"}, 10, "str"]`, result) result = ToString(nil) assert.Equal("[]", result) diff --git a/common/persistence/history_task_queue_manager_test.go b/common/persistence/history_task_queue_manager_test.go index 2bd358b910b..cb0bf24a105 100644 --- a/common/persistence/history_task_queue_manager_test.go +++ b/common/persistence/history_task_queue_manager_test.go @@ -24,7 +24,7 @@ func TestQueueKey_Determinism(t *testing.T) { SourceCluster: "a", TargetCluster: "b", }.GetQueueName() - assert.Equal(t, "1_a_b_5aAf7hTg", name) + assert.Equal(t, name, "1_a_b_5aAf7hTg") } // TestQueueKey_Conflicts tests that unique tuples of cluster names containing the delimiter character will not produce diff --git a/common/persistence/operation_mode_validator_test.go b/common/persistence/operation_mode_validator_test.go index a6e1195f33b..0f06bffa829 100644 --- a/common/persistence/operation_mode_validator_test.go +++ b/common/persistence/operation_mode_validator_test.go @@ -54,9 +54,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestCreateMode_UpdateCurrent() for _, createMode := range creatModes { err := ValidateCreateWorkflowModeState(createMode, testSnapshot) if !expectError { - s.NotErrorIs(err, err) + s.NoError(err, err) } else { - s.ErrorIs(err, err) + s.Error(err, err) } } } @@ -75,9 +75,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestCreateMode_BypassCurrent() testSnapshot := s.newTestWorkflowSnapshot(state) err := ValidateCreateWorkflowModeState(CreateWorkflowModeBypassCurrent, testSnapshot) if !expectError { - s.NotErrorIs(err, err) + s.NoError(err, err) } else { - s.ErrorIs(err, err) + s.Error(err, err) } } } @@ -99,9 +99,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_UpdateCurrent() nil, ) if !expectError { - s.NotErrorIs(err, err) + s.NoError(err, err) } else { - s.ErrorIs(err, err) + s.Error(err, err) } } @@ -128,9 +128,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_UpdateCurrent() &testNewSnapshot, ) if currentExpectError || newExpectError { - s.ErrorIs(err, err) + s.Error(err, err) } else { - s.NotErrorIs(err, err) + s.NoError(err, err) } } } @@ -153,9 +153,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_BypassCurrent() nil, ) if !expectError { - s.NotErrorIs(err, err) + s.NoError(err, err) } else { - s.ErrorIs(err, err) + s.Error(err, err) } } @@ -182,9 +182,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestUpdateMode_BypassCurrent() &testNewSnapshot, ) if currentExpectError || newExpectError { - s.ErrorIs(err, err) + s.Error(err, err) } else { - s.NotErrorIs(err, err) + s.NoError(err, err) } } } @@ -208,9 +208,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update nil, ) if !expectError { - s.NotErrorIs(err, err) + s.NoError(err, err) } else { - s.ErrorIs(err, err) + s.Error(err, err) } } @@ -238,9 +238,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update nil, ) if resetExpectError || newExpectError { - s.ErrorIs(err, err) + s.Error(err, err) } else { - s.NotErrorIs(err, err) + s.NoError(err, err) } } } @@ -269,9 +269,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update &testCurrentSnapshot, ) if resetExpectError || currentExpectError { - s.ErrorIs(err, err) + s.Error(err, err) } else { - s.NotErrorIs(err, err) + s.NoError(err, err) } } } @@ -308,9 +308,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Update &testCurrentSnapshot, ) if resetExpectError || newExpectError || currentExpectError { - s.ErrorIs(err, err) + s.Error(err, err) } else { - s.NotErrorIs(err, err) + s.NoError(err, err) } } } @@ -335,9 +335,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Bypass nil, ) if !expectError { - s.NotErrorIs(err, err) + s.NoError(err, err) } else { - s.ErrorIs(err, err) + s.Error(err, err) } } @@ -368,9 +368,9 @@ func (s *validateOperationWorkflowModeStateSuite) TestConflictResolveMode_Bypass if err == nil { fmt.Print("##") } - s.ErrorIs(err, err) + s.Error(err, err) } else { - s.NotErrorIs(err, err) + s.NoError(err, err) } } } diff --git a/common/persistence/persistence-tests/cluster_metadata_manager.go b/common/persistence/persistence-tests/cluster_metadata_manager.go index 2374636b2e1..a5aba91d026 100644 --- a/common/persistence/persistence-tests/cluster_metadata_manager.go +++ b/common/persistence/persistence-tests/cluster_metadata_manager.go @@ -54,7 +54,7 @@ func (s *ClusterMetadataManagerSuite) TearDownSuite() { // TestClusterMembershipEmptyInitially verifies the GetClusterMembers() works with an initial empty table func (s *ClusterMetadataManagerSuite) TestClusterMembershipEmptyInitially() { resp, err := s.ClusterMetadataManager.GetClusterMembers(s.ctx, &p.GetClusterMembersRequest{LastHeartbeatWithin: time.Minute * 10}) - s.NoError(err) + s.Nil(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) } @@ -73,11 +73,11 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertCanReadAny() { } err = s.ClusterMetadataManager.UpsertClusterMembership(s.ctx, req) - s.NoError(err) + s.Nil(err) resp, err := s.ClusterMetadataManager.GetClusterMembers(s.ctx, &p.GetClusterMembersRequest{}) - s.NoError(err) + s.Nil(err) s.NotNil(resp) s.NotEmpty(resp.ActiveMembers) @@ -134,10 +134,10 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertCanPageRead() { } func (s *ClusterMetadataManagerSuite) validateUpsert(req *p.UpsertClusterMembershipRequest, resp *p.GetClusterMembersResponse, err error) { - s.NoError(err) + s.Nil(err) s.NotNil(resp) s.NotEmpty(resp.ActiveMembers) - s.Equal(1, len(resp.ActiveMembers)) + s.Equal(len(resp.ActiveMembers), 1) // Have to round to 1 second due to SQL implementations. Cassandra truncates at 1ms. s.Equal(resp.ActiveMembers[0].SessionStart.Round(time.Second), req.SessionStart.Round(time.Second)) s.Equal(resp.ActiveMembers[0].RPCAddress.String(), req.RPCAddress.String()) @@ -162,7 +162,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( } err = s.ClusterMetadataManager.UpsertClusterMembership(s.ctx, req) - s.NoError(err) + s.Nil(err) resp, err := s.ClusterMetadataManager.GetClusterMembers( s.ctx, @@ -177,7 +177,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( &p.GetClusterMembersRequest{LastHeartbeatWithin: time.Millisecond, HostIDEquals: req.HostID}, ) - s.NoError(err) + s.Nil(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) @@ -186,7 +186,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( &p.GetClusterMembersRequest{RoleEquals: p.Matching}, ) - s.NoError(err) + s.Nil(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) @@ -195,7 +195,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipReadFiltersCorrectly( &p.GetClusterMembersRequest{SessionStartedAfter: time.Now().UTC()}, ) - s.NoError(err) + s.Nil(err) s.NotNil(resp) s.Empty(resp.ActiveMembers) @@ -235,7 +235,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertExpiresCorrectl s.NoError(err) s.NotNil(resp) s.NotEmpty(resp.ActiveMembers) - s.Equal(1, len(resp.ActiveMembers)) + s.Equal(len(resp.ActiveMembers), 1) // Have to round to 1 second due to SQL implementations. Cassandra truncates at 1ms. s.Equal(resp.ActiveMembers[0].SessionStart.Round(time.Second), req.SessionStart.Round(time.Second)) s.Equal(resp.ActiveMembers[0].RPCAddress.String(), req.RPCAddress.String()) @@ -252,7 +252,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertExpiresCorrectl func (s *ClusterMetadataManagerSuite) waitForPrune(waitFor time.Duration) { s.Eventually(func() bool { err := s.ClusterMetadataManager.PruneClusterMembership(s.ctx, &p.PruneClusterMembershipRequest{MaxRecordsPruned: 100}) - s.NoError(err) + s.Nil(err) resp, err := s.ClusterMetadataManager.GetClusterMembers( s.ctx, @@ -281,7 +281,7 @@ func (s *ClusterMetadataManagerSuite) TestClusterMembershipUpsertInvalidExpiry() } err = s.ClusterMetadataManager.UpsertClusterMembership(s.ctx, req) - s.Error(err) + s.NotNil(err) s.IsType(err, p.ErrInvalidMembershipExpiry) } @@ -308,7 +308,7 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { getResp, err := s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) s.Nil(getResp) @@ -329,7 +329,7 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { IsConnectionEnabled: true, }}) - s.NoError(err) + s.Nil(err) s.True(initialResp) // request should be applied as this is first initialize // Case 3 - Get, data persisted @@ -337,8 +337,8 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.NoError(err) - s.NotEqual(getResp, nil) + s.Nil(err) + s.True(getResp != nil) s.Equal(clusterNameToPersist, getResp.ClusterName) s.Equal(historyShardsToPersist, getResp.HistoryShardCount) s.Equal(clusterIdToPersist, getResp.ClusterId) @@ -357,14 +357,14 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { HistoryShardCount: int32(77), }}) - s.NoError(err) + s.Nil(err) s.False(secondResp) // Should not have applied, and should match values from first request // Refetch persisted getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initial values - s.NoError(err) + s.Nil(err) s.NotNil(getResp) s.Equal(clusterNameToPersist, getResp.ClusterName) s.Equal(historyShardsToPersist, getResp.HistoryShardCount) @@ -386,20 +386,20 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { ClusterMetadata: getResp.ClusterMetadata, Version: getResp.Version, }) - s.NoError(err) + s.Nil(err) s.True(thirdResp) getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) - s.NoError(err) + s.Nil(err) s.NotNil(getResp) s.Equal("1.0", getResp.ClusterMetadata.VersionInfo.Current.Version) // Case 6 - Delete Cluster Metadata err = s.ClusterMetadataManager.DeleteClusterMetadata(s.ctx, &p.DeleteClusterMetadataRequest{ClusterName: clusterNameToPersist}) - s.NoError(err) + s.Nil(err) getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) s.Nil(getResp) @@ -419,7 +419,7 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { IsGlobalNamespaceEnabled: true, IsConnectionEnabled: true, }}) - s.NoError(err) + s.Nil(err) s.True(initialResp) // Case 8 - Get, data persisted @@ -427,8 +427,8 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { getResp, err = s.ClusterMetadataManager.GetClusterMetadata(s.ctx, &p.GetClusterMetadataRequest{ClusterName: clusterNameToPersist}) // Validate they match our initializations - s.NoError(err) - s.NotEqual(getResp, nil) + s.Nil(err) + s.True(getResp != nil) s.Equal(clusterNameToPersist, getResp.ClusterName) s.Equal(historyShardsToPersist, getResp.HistoryShardCount) s.Equal(clusterIdToPersist, getResp.ClusterId) @@ -477,8 +477,8 @@ func (s *ClusterMetadataManagerSuite) TestInitImmutableMetadataReadWrite() { resp, err := s.ClusterMetadataManager.ListClusterMetadata(s.ctx, &p.ListClusterMetadataRequest{PageSize: 1}) s.NoError(err) - s.Len(resp.ClusterMetadata, 1) + s.Equal(1, len(resp.ClusterMetadata)) resp, err = s.ClusterMetadataManager.ListClusterMetadata(s.ctx, &p.ListClusterMetadataRequest{PageSize: 1, NextPageToken: resp.NextPageToken}) s.NoError(err) - s.Len(resp.ClusterMetadata, 1) + s.Equal(1, len(resp.ClusterMetadata)) } diff --git a/common/persistence/persistence-tests/history_v2_persistence.go b/common/persistence/persistence-tests/history_v2_persistence.go index a45cfc035d2..e306a336bab 100644 --- a/common/persistence/persistence-tests/history_v2_persistence.go +++ b/common/persistence/persistence-tests/history_v2_persistence.go @@ -101,8 +101,8 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { resp, err := s.ExecutionManager.GetAllHistoryTreeBranches(s.ctx, &p.GetAllHistoryTreeBranchesRequest{ PageSize: 1, }) - s.NoError(err) - s.Empty(resp.Branches, "some trees were leaked in other tests") + s.Nil(err) + s.Equal(0, len(resp.Branches), "some trees were leaked in other tests") trees := map[string]bool{} totalTrees := 1002 @@ -111,11 +111,11 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { for range totalTrees { treeID := uuid.NewString() bi, err := s.newHistoryBranch(treeID) - s.NoError(err) + s.Nil(err) events := s.genRandomEvents([]int64{1, 2, 3}, 1) err = s.appendNewBranchAndFirstNode(bi, events, 1, "branchInfo") - s.NoError(err) + s.Nil(err) trees[string(treeID)] = true } @@ -125,14 +125,14 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { PageSize: pgSize, NextPageToken: pgToken, }) - s.NoError(err) + s.Nil(err) for _, br := range resp.Branches { uuidTreeId := br.BranchInfo.TreeId if trees[uuidTreeId] { delete(trees, uuidTreeId) - s.Positive(br.ForkTime.AsTime().UnixNano()) - s.Positive(len(br.BranchInfo.BranchId)) + s.True(br.ForkTime.AsTime().UnixNano() > 0) + s.True(len(br.BranchInfo.BranchId) > 0) s.Equal("branchInfo", br.Info) } else { s.Fail("treeID not found", br.BranchInfo.TreeId) @@ -145,47 +145,47 @@ func (s *HistoryV2PersistenceSuite) TestScanAllTrees() { pgToken = resp.NextPageToken } - s.Empty(trees) + s.Equal(0, len(trees)) } // TestReadBranchByPagination test func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { treeID := uuid.NewString() bi, err := s.newHistoryBranch(treeID) - s.NoError(err) + s.Nil(err) historyW := &historypb.History{} events := s.genRandomEvents([]int64{1, 2, 3}, 0) err = s.appendNewBranchAndFirstNode(bi, events, 1, "branchInfo") - s.NoError(err) + s.Nil(err) historyW.Events = events events = s.genRandomEvents([]int64{4}, 0) err = s.appendNewNode(bi, events, 2) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{5, 6, 7, 8}, 4) err = s.appendNewNode(bi, events, 6) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) // stale event batch events = s.genRandomEvents([]int64{6, 7, 8}, 1) err = s.appendNewNode(bi, events, 3) - s.NoError(err) + s.Nil(err) // stale event batch events = s.genRandomEvents([]int64{6, 7, 8}, 2) err = s.appendNewNode(bi, events, 4) - s.NoError(err) + s.Nil(err) // stale event batch events = s.genRandomEvents([]int64{6, 7, 8}, 3) err = s.appendNewNode(bi, events, 5) - s.NoError(err) + s.Nil(err) events = s.genRandomEvents([]int64{9}, 4) err = s.appendNewNode(bi, events, 7) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) // Start to read from middle, should not return error, but the first batch should be ignored by application layer @@ -199,53 +199,53 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { } // first page resp, err := s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) - s.Len(resp.HistoryEvents, 4) + s.Nil(err) + s.Equal(4, len(resp.HistoryEvents)) s.Equal(int64(6), resp.HistoryEvents[0].GetEventId()) events = s.genRandomEvents([]int64{10}, 4) err = s.appendNewNode(bi, events, 8) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{11}, 4) err = s.appendNewNode(bi, events, 9) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{12}, 4) err = s.appendNewNode(bi, events, 10) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{13, 14, 15}, 4) err = s.appendNewNode(bi, events, 11) - s.NoError(err) + s.Nil(err) // we don't append this batch because we will fork from 13 // historyW.Events = append(historyW.Events, events...) // fork from here bi2, err := s.fork(bi, 13) - s.NoError(err) + s.Nil(err) events = s.genRandomEvents([]int64{13}, 4) err = s.appendNewNode(bi2, events, 12) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{14}, 4) err = s.appendNewNode(bi2, events, 13) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{15, 16, 17}, 4) err = s.appendNewNode(bi2, events, 14) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{18, 19, 20}, 4) err = s.appendNewNode(bi2, events, 15) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) // read branch to verify @@ -262,9 +262,9 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // first page resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) + s.Nil(err) - s.Len(resp.HistoryEvents, 8) + s.Equal(8, len(resp.HistoryEvents)) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken @@ -272,14 +272,14 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // doe to difference in Cassandra / MySQL pagination // the stale event batch may get returned resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) + s.Nil(err) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken if len(resp.HistoryEvents) == 0 { // second page resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) - s.Len(resp.HistoryEvents, 3) + s.Nil(err) + s.Equal(3, len(resp.HistoryEvents)) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken } else if len(resp.HistoryEvents) == 3 { @@ -290,15 +290,15 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // 3rd page, since we fork from nodeID=13, we can only see one batch of 12 here resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) - s.Len(resp.HistoryEvents, 1) + s.Nil(err) + s.Equal(1, len(resp.HistoryEvents)) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken // 4th page, 13~17 resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) - s.Len(resp.HistoryEvents, 5) + s.Nil(err) + s.Equal(5, len(resp.HistoryEvents)) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken @@ -309,18 +309,18 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { // to get history again, no error and history events should be returned. req.PageSize = 1 resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) - s.Len(resp.HistoryEvents, 3) + s.Nil(err) + s.Equal(3, len(resp.HistoryEvents)) historyR.Events = append(historyR.Events, resp.HistoryEvents...) req.NextPageToken = resp.NextPageToken if len(resp.NextPageToken) != 0 { resp, err = s.ExecutionManager.ReadHistoryBranch(s.ctx, req) - s.NoError(err) - s.Empty(resp.HistoryEvents) + s.Nil(err) + s.Equal(0, len(resp.HistoryEvents)) } s.ProtoEqual(historyW, historyR) - s.Empty(resp.NextPageToken) + s.Equal(0, len(resp.NextPageToken)) // MinEventID is in the middle of the last batch and this is the first request (NextPageToken // is empty), the call should return an error. @@ -330,11 +330,11 @@ func (s *HistoryV2PersistenceSuite) TestReadBranchByPagination() { s.IsType(&serviceerror.NotFound{}, err) err = s.deleteHistoryBranch(bi2) - s.NoError(err) + s.Nil(err) err = s.deleteHistoryBranch(bi) - s.NoError(err) + s.Nil(err) branches := s.descTree(treeID) - s.Empty(branches) + s.Equal(0, len(branches)) } // TestConcurrentlyCreateAndAppendBranches test @@ -350,34 +350,34 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { go func(idx int) { defer wg.Done() bi, err := s.newHistoryBranch(treeID) - s.NoError(err) + s.Nil(err) historyW := &historypb.History{} m.Store(idx, bi) events := s.genRandomEvents([]int64{1, 2, 3}, 1) err = s.appendNewBranchAndFirstNode(bi, events, 1, "branchInfo") - s.NoError(err) + s.Nil(err) historyW.Events = events events = s.genRandomEvents([]int64{4}, 1) err = s.appendNewNode(bi, events, 2) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{5, 6, 7, 8}, 1) err = s.appendNewNode(bi, events, 3) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) events = s.genRandomEvents([]int64{9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, 1) err = s.appendNewNode(bi, events, 4000) - s.NoError(err) + s.Nil(err) historyW.Events = append(historyW.Events, events...) // read branch to verify historyR := &historypb.History{} events = s.read(bi, 1, 21) - s.Len(events, 20) + s.Equal(20, len(events)) historyR.Events = events s.ProtoEqual(historyW, historyR) @@ -386,7 +386,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { wg.Wait() branches := s.descTree(treeID) - s.Len(branches, concurrency) + s.Equal(concurrency, len(branches)) wg = sync.WaitGroup{} // test appending nodes(override and new nodes) on each branch concurrently @@ -400,48 +400,48 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { // override with smaller txn_id events := s.genRandomEvents([]int64{5}, 1) err := s.appendNewNode(branch, events, 0) - s.NoError(err) + s.Nil(err) // it shouldn't change anything events = s.read(branch, 1, 25) - s.Len(events, 20) + s.Equal(20, len(events)) // override with greatest txn_id events = s.genRandomEvents([]int64{5}, 1) err = s.appendNewNode(branch, events, 3000) - s.NoError(err) + s.Nil(err) // read to verify override success, at this point history is corrupted, missing 6/7/8, so we should only see 5 events events = s.read(branch, 1, 6) - s.Len(events, 5) + s.Equal(5, len(events)) _, err = s.readWithError(branch, 1, 25) _, ok := err.(*serviceerror.DataLoss) - s.True(ok) + s.Equal(true, ok) // override with even larger txn_id and same version events = s.genRandomEvents([]int64{5, 6}, 1) err = s.appendNewNode(branch, events, 3001) - s.NoError(err) + s.Nil(err) // read to verify override success, at this point history is corrupted, missing 7/8, so we should only see 6 events events = s.read(branch, 1, 7) - s.Len(events, 6) + s.Equal(6, len(events)) _, err = s.readWithError(branch, 1, 25) _, ok = err.(*serviceerror.DataLoss) - s.True(ok) + s.Equal(true, ok) // override more with larger txn_id, this would fix the corrupted hole so that we cna get 20 events again events = s.genRandomEvents([]int64{7, 8}, 1) err = s.appendNewNode(branch, events, 3002) - s.NoError(err) + s.Nil(err) // read to verify override events = s.read(branch, 1, 25) - s.Len(events, 20) + s.Equal(20, len(events)) events = s.genRandomEvents([]int64{9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23}, 1) err = s.appendNewNode(branch, events, 4001) - s.NoError(err) + s.Nil(err) events = s.read(branch, 1, 25) - s.Len(events, 23) + s.Equal(23, len(events)) }(i) } @@ -451,12 +451,12 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyCreateAndAppendBranches() { br := v.([]byte) // delete old branches along with create new branches err := s.deleteHistoryBranch(br) - s.NoError(err) + s.Nil(err) return true }) branches = s.descTree(treeID) - s.Empty(branches) + s.Equal(0, len(branches)) } // TestConcurrentlyForkAndAppendBranches test @@ -465,9 +465,9 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { wg := sync.WaitGroup{} concurrency := 10 masterBr, err := s.newHistoryBranch(treeID) - s.NoError(err) + s.Nil(err) branches := s.descTree(treeID) - s.Empty(branches) + s.Equal(0, len(branches)) // append first batch to master branch eids := []int64{} @@ -476,14 +476,14 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } events := s.genRandomEvents(eids, 1) err = s.appendNewBranchAndFirstNode(masterBr, events[0:1], 1, "masterbr") - s.NoError(err) + s.Nil(err) readEvents := s.read(masterBr, 1, int64(concurrency)+2) - s.NoError(err) - s.Len(readEvents, 1) + s.Nil(err) + s.Equal(1, len(readEvents)) branches = s.descTree(treeID) - s.Len(branches, 1) + s.Equal(1, len(branches)) mbrID := branches[0].BranchId txn := int64(1) @@ -498,10 +498,10 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } err = s.appendOneByOne(masterBr, events[1:], reserveTxn(len(events[1:]))) - s.NoError(err) + s.Nil(err) events = s.read(masterBr, 1, int64(concurrency)+2) - s.NoError(err) - s.Len(events, (concurrency)+1) + s.Nil(err) + s.Equal((concurrency)+1, len(events)) level1ID := new(sync.Map) level1Br := new(sync.Map) @@ -515,14 +515,14 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { level1ID.Store(idx, forkNodeID) bi, err := s.fork(masterBr, forkNodeID) - s.NoError(err) + s.Nil(err) level1Br.Store(idx, bi) // cannot append to ancestors events := s.genRandomEvents([]int64{forkNodeID - 1}, 1) err = s.appendNewNode(bi, events, reserveTxn(1)) _, ok := err.(*p.InvalidPersistenceRequestError) - s.True(ok) + s.Equal(true, ok) // append second batch to first level eids := make([]int64, 0) @@ -532,18 +532,18 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { events = s.genRandomEvents(eids, 1) err = s.appendNewNode(bi, events[0:1], reserveTxn(1)) - s.NoError(err) + s.Nil(err) err = s.appendOneByOne(bi, events[1:], reserveTxn(len(events[1:]))) - s.NoError(err) + s.Nil(err) events = s.read(bi, 1, int64(concurrency)*2+2) - s.NoError(err) - s.Len(events, (concurrency)*2+1) + s.Nil(err) + s.Equal((concurrency)*2+1, len(events)) if idx == 0 { err = s.deleteHistoryBranch(bi) - s.NoError(err) + s.Nil(err) } }(i) @@ -551,7 +551,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { wg.Wait() branches = s.descTree(treeID) - s.Len(branches, concurrency) + s.Equal(concurrency, len(branches)) forkOnLevel1 := int32(0) level2Br := new(sync.Map) wg = sync.WaitGroup{} @@ -572,7 +572,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } bi, err := s.fork(forkBr, forkNodeID) - s.NoError(err) + s.Nil(err) level2Br.Store(idx, bi) // append second batch to second level @@ -582,36 +582,36 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } events := s.genRandomEvents(eids, 1) err = s.appendNewNode(bi, events[0:1], reserveTxn(1)) - s.NoError(err) + s.Nil(err) err = s.appendOneByOne(bi, events[1:], reserveTxn(len(events[1:]))) - s.NoError(err) + s.Nil(err) events = s.read(bi, 1, int64(concurrency)*3+2) - s.NoError(err) - s.Len(events, (concurrency)*3+1) + s.Nil(err) + s.Equal((concurrency)*3+1, len(events)) // try override last event events = s.genRandomEvents([]int64{int64(concurrency)*3 + 1}, 1) err = s.appendNewNode(bi, events, reserveTxn(1)) - s.NoError(err) + s.Nil(err) events = s.read(bi, 1, int64(concurrency)*3+2) - s.NoError(err) - s.Len(events, (concurrency)*3+1) + s.Nil(err) + s.Equal((concurrency)*3+1, len(events)) // test fork and newBranch concurrently bi, err = s.newHistoryBranch(treeID) - s.NoError(err) + s.Nil(err) level2Br.Store(concurrency+idx, bi) events = s.genRandomEvents([]int64{1}, 1) err = s.appendNewBranchAndFirstNode(bi, events, reserveTxn(1), "newbr") - s.NoError(err) + s.Nil(err) }(i) } wg.Wait() branches = s.descTree(treeID) - s.Len(branches, concurrency*3-2) + s.Equal(concurrency*3-2, len(branches)) actualForkOnLevel1 := int32(0) masterCnt := 0 for _, b := range branches { @@ -620,7 +620,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { } else if len(b.Ancestors) == 0 { masterCnt++ } else { - s.Len(b.Ancestors, 1) + s.Equal(1, len(b.Ancestors)) s.Equal(mbrID, b.Ancestors[0].GetBranchId()) } } @@ -632,7 +632,7 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { br := v.([]byte) // delete old branches along with create new branches err := s.deleteHistoryBranch(br) - s.NoError(err) + s.Nil(err) return true }) @@ -640,28 +640,28 @@ func (s *HistoryV2PersistenceSuite) TestConcurrentlyForkAndAppendBranches() { br := v.([]byte) // delete old branches along with create new branches err := s.deleteHistoryBranch(br) - s.NoError(err) + s.Nil(err) return true }) err = s.deleteHistoryBranch(masterBr) - s.NoError(err) + s.Nil(err) branches = s.descTree(treeID) - s.Empty(branches) + s.Equal(0, len(branches)) } func (s *HistoryV2PersistenceSuite) getBranchByKey(m *sync.Map, k int) []byte { v, ok := m.Load(k) - s.True(ok) + s.Equal(true, ok) br := v.([]byte) return br } func (s *HistoryV2PersistenceSuite) getIDByKey(m *sync.Map, k int) int64 { v, ok := m.Load(k) - s.True(ok) + s.Equal(true, ok) id := v.(int64) return id } @@ -736,7 +736,7 @@ func (s *HistoryV2PersistenceSuite) descTree(treeID string) []*persistencespb.Hi // persistence helper func (s *HistoryV2PersistenceSuite) read(branch []byte, minID, maxID int64) []*historypb.HistoryEvent { res, err := s.readWithError(branch, minID, maxID) - s.NoError(err) + s.Nil(err) return res } @@ -759,7 +759,7 @@ func (s *HistoryV2PersistenceSuite) readWithError(branch []byte, minID, maxID in return nil, err } if len(resp.HistoryEvents) > 0 { - s.Positive(resp.Size) + s.True(resp.Size > 0) } res = append(res, resp.HistoryEvents...) token = resp.NextPageToken @@ -811,7 +811,7 @@ func (s *HistoryV2PersistenceSuite) append(branch []byte, events []*historypb.Hi if err != nil { return err } - s.Positive(resp.Size) + s.True(resp.Size > 0) return err } diff --git a/common/persistence/persistence-tests/metadata_persistence_v2.go b/common/persistence/persistence-tests/metadata_persistence_v2.go index 32b2af94253..5363298b23e 100644 --- a/common/persistence/persistence-tests/metadata_persistence_v2.go +++ b/common/persistence/persistence-tests/metadata_persistence_v2.go @@ -150,31 +150,31 @@ func (m *MetadataPersistenceSuiteV2) TestCreateWithPartialNamespaceSameNameSameI ) m.NoError(err0) m.NotNil(resp0) - m.Equal(id, resp0.ID) + m.EqualValues(id, resp0.ID) // for namespace which do not have replication config set, will default to // use current cluster as active, with current cluster as all clusters resp1, err1 := m.GetNamespace(id, "") m.NoError(err1) m.NotNil(resp1) - m.Equal(id, resp1.Namespace.Info.Id) + m.EqualValues(id, resp1.Namespace.Info.Id) m.Equal(name, resp1.Namespace.Info.Name) m.Equal(state, resp1.Namespace.Info.State) m.Equal(description, resp1.Namespace.Info.Description) m.Equal(owner, resp1.Namespace.Info.Owner) m.Equal(data, resp1.Namespace.Info.Data) - m.Equal(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) + m.EqualValues(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp1.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp1.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp1.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp1.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(badBinaries, resp1.Namespace.Config.BadBinaries) m.Equal(cluster.TestCurrentClusterName, resp1.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp1.Namespace.ReplicationConfig.Clusters, 1) + m.Equal(1, len(resp1.Namespace.ReplicationConfig.Clusters)) m.Equal(isGlobalNamespace, resp1.IsGlobalNamespace) m.Equal(configVersion, resp1.Namespace.ConfigVersion) m.Equal(failoverVersion, resp1.Namespace.FailoverVersion) - m.Equal(resp1.Namespace.ReplicationConfig.Clusters[0], cluster.TestCurrentClusterName) + m.True(resp1.Namespace.ReplicationConfig.Clusters[0] == cluster.TestCurrentClusterName) m.Equal(p.InitialFailoverNotificationVersion, resp1.Namespace.FailoverNotificationVersion) m.truncatePartialNamespace() } @@ -229,31 +229,31 @@ func (m *MetadataPersistenceSuiteV2) TestCreateWithPartialNamespaceSameNameDiffe ) m.NoError(err0) m.NotNil(resp0) - m.Equal(id, resp0.ID) + m.EqualValues(id, resp0.ID) // for namespace which do not have replication config set, will default to // use current cluster as active, with current cluster as all clusters resp1, err1 := m.GetNamespace(id, "") m.NoError(err1) m.NotNil(resp1) - m.Equal(id, resp1.Namespace.Info.Id) + m.EqualValues(id, resp1.Namespace.Info.Id) m.Equal(name, resp1.Namespace.Info.Name) m.Equal(state, resp1.Namespace.Info.State) m.Equal(description, resp1.Namespace.Info.Description) m.Equal(owner, resp1.Namespace.Info.Owner) m.Equal(data, resp1.Namespace.Info.Data) - m.Equal(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) + m.EqualValues(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp1.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp1.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp1.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp1.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(badBinaries, resp1.Namespace.Config.BadBinaries) m.Equal(cluster.TestCurrentClusterName, resp1.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp1.Namespace.ReplicationConfig.Clusters, 1) + m.Equal(1, len(resp1.Namespace.ReplicationConfig.Clusters)) m.Equal(isGlobalNamespace, resp1.IsGlobalNamespace) m.Equal(configVersion, resp1.Namespace.ConfigVersion) m.Equal(failoverVersion, resp1.Namespace.FailoverVersion) - m.Equal(resp1.Namespace.ReplicationConfig.Clusters[0], cluster.TestCurrentClusterName) + m.True(resp1.Namespace.ReplicationConfig.Clusters[0] == cluster.TestCurrentClusterName) m.Equal(p.InitialFailoverNotificationVersion, resp1.Namespace.FailoverNotificationVersion) m.truncatePartialNamespace() } @@ -353,31 +353,31 @@ func (m *MetadataPersistenceSuiteV2) TestCreateNamespace() { ) m.NoError(err0) m.NotNil(resp0) - m.Equal(id, resp0.ID) + m.EqualValues(id, resp0.ID) // for namespace which do not have replication config set, will default to // use current cluster as active, with current cluster as all clusters resp1, err1 := m.GetNamespace(id, "") m.NoError(err1) m.NotNil(resp1) - m.Equal(id, resp1.Namespace.Info.Id) + m.EqualValues(id, resp1.Namespace.Info.Id) m.Equal(name, resp1.Namespace.Info.Name) m.Equal(state, resp1.Namespace.Info.State) m.Equal(description, resp1.Namespace.Info.Description) m.Equal(owner, resp1.Namespace.Info.Owner) m.Equal(data, resp1.Namespace.Info.Data) - m.Equal(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) + m.EqualValues(time.Duration(retention)*time.Hour*24, resp1.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp1.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp1.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp1.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp1.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(badBinaries, resp1.Namespace.Config.BadBinaries) m.Equal(cluster.TestCurrentClusterName, resp1.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp1.Namespace.ReplicationConfig.Clusters, 1) + m.Equal(1, len(resp1.Namespace.ReplicationConfig.Clusters)) m.Equal(isGlobalNamespace, resp1.IsGlobalNamespace) m.Equal(configVersion, resp1.Namespace.ConfigVersion) m.Equal(failoverVersion, resp1.Namespace.FailoverVersion) - m.Equal(resp1.Namespace.ReplicationConfig.Clusters[0], cluster.TestCurrentClusterName) + m.True(resp1.Namespace.ReplicationConfig.Clusters[0] == cluster.TestCurrentClusterName) m.Equal(p.InitialFailoverNotificationVersion, resp1.Namespace.FailoverNotificationVersion) resp2, err2 := m.CreateNamespace( @@ -468,25 +468,25 @@ func (m *MetadataPersistenceSuiteV2) TestGetNamespace() { ) m.NoError(err1) m.NotNil(resp1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) m.NotNil(resp2) - m.Equal(id, resp2.Namespace.Info.Id) + m.EqualValues(id, resp2.Namespace.Info.Id) m.Equal(name, resp2.Namespace.Info.Name) m.Equal(state, resp2.Namespace.Info.State) m.Equal(description, resp2.Namespace.Info.Description) m.Equal(owner, resp2.Namespace.Info.Owner) m.Equal(data, resp2.Namespace.Info.Data) - m.Equal(time.Duration(retention)*time.Hour*24, resp2.Namespace.Config.Retention.AsDuration()) + m.EqualValues(time.Duration(retention)*time.Hour*24, resp2.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp2.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp2.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp2.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp2.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp2.Namespace.Config.BadBinaries) m.Equal(clusterActive, resp2.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp2.Namespace.ReplicationConfig.Clusters, len(clusters)) + m.Equal(len(clusters), len(resp2.Namespace.ReplicationConfig.Clusters)) for index := range clusters { m.Equal(clusters[index], resp2.Namespace.ReplicationConfig.Clusters[index]) } @@ -498,19 +498,19 @@ func (m *MetadataPersistenceSuiteV2) TestGetNamespace() { resp3, err3 := m.GetNamespace("", name) m.NoError(err3) m.NotNil(resp3) - m.Equal(id, resp3.Namespace.Info.Id) + m.EqualValues(id, resp3.Namespace.Info.Id) m.Equal(name, resp3.Namespace.Info.Name) m.Equal(state, resp3.Namespace.Info.State) m.Equal(description, resp3.Namespace.Info.Description) m.Equal(owner, resp3.Namespace.Info.Owner) m.Equal(data, resp3.Namespace.Info.Data) - m.Equal(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) + m.EqualValues(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp3.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp3.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp3.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp3.Namespace.Config.VisibilityArchivalUri) m.Equal(clusterActive, resp3.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp3.Namespace.ReplicationConfig.Clusters, len(clusters)) + m.Equal(len(clusters), len(resp3.Namespace.ReplicationConfig.Clusters)) for index := range clusters { m.Equal(clusters[index], resp3.Namespace.ReplicationConfig.Clusters[index]) } @@ -607,14 +607,14 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() { m.Equal(state, resp.Namespace.Info.State) m.Equal(description, resp.Namespace.Info.Description) m.Equal(owner, resp.Namespace.Info.Owner) - m.Equal(time.Duration(retention)*time.Hour*24, resp.Namespace.Config.Retention.AsDuration()) + m.EqualValues(time.Duration(retention)*time.Hour*24, resp.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp.Namespace.Config.BadBinaries) m.Equal(clusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp.Namespace.ReplicationConfig.Clusters, len(clusters)) + m.Equal(len(clusters), len(resp.Namespace.ReplicationConfig.Clusters)) for index := range clusters { m.Equal(clusters[index], resp.Namespace.ReplicationConfig.Clusters[index]) } @@ -624,10 +624,10 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() { // check namespace data ss := strings.Split(resp.Namespace.Info.Data["k0"], "-") - m.Len(ss, 2) + m.Equal(2, len(ss)) vi, err := strconv.Atoi(ss[1]) m.NoError(err) - m.True(vi > 0 && vi <= concurrency) + m.Equal(true, vi > 0 && vi <= concurrency) } // TestConcurrentUpdateNamespace test @@ -678,7 +678,7 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() { failoverVersion, ) m.NoError(err1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -743,21 +743,21 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() { resp3, err3 := m.GetNamespace("", name) m.NoError(err3) m.NotNil(resp3) - m.Equal(id, resp3.Namespace.Info.Id) + m.EqualValues(id, resp3.Namespace.Info.Id) m.Equal(name, resp3.Namespace.Info.Name) m.Equal(state, resp3.Namespace.Info.State) m.Equal(isGlobalNamespace, resp3.IsGlobalNamespace) m.Equal(description, resp3.Namespace.Info.Description) m.Equal(owner, resp3.Namespace.Info.Owner) - m.Equal(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) + m.EqualValues(time.Duration(retention)*time.Hour*24, resp3.Namespace.Config.Retention.AsDuration()) m.Equal(historyArchivalState, resp3.Namespace.Config.HistoryArchivalState) m.Equal(historyArchivalURI, resp3.Namespace.Config.HistoryArchivalUri) m.Equal(visibilityArchivalState, resp3.Namespace.Config.VisibilityArchivalState) m.Equal(visibilityArchivalURI, resp3.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp3.Namespace.Config.BadBinaries) m.Equal(clusterActive, resp3.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp3.Namespace.ReplicationConfig.Clusters, len(clusters)) + m.Equal(len(clusters), len(resp3.Namespace.ReplicationConfig.Clusters)) for index := range clusters { m.Equal(clusters[index], resp3.Namespace.ReplicationConfig.Clusters[index]) } @@ -767,10 +767,10 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() { // check namespace data ss := strings.Split(resp3.Namespace.Info.Data["k0"], "-") - m.Len(ss, 2) + m.Equal(2, len(ss)) vi, err := strconv.Atoi(ss[1]) m.NoError(err) - m.True(vi > 0 && vi <= concurrency) + m.Equal(true, vi > 0 && vi <= concurrency) } // TestUpdateNamespace test @@ -820,7 +820,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { failoverVersion, ) m.NoError(err1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -889,7 +889,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { resp4, err4 := m.GetNamespace("", name) m.NoError(err4) m.NotNil(resp4) - m.Equal(id, resp4.Namespace.Info.Id) + m.EqualValues(id, resp4.Namespace.Info.Id) m.Equal(name, resp4.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp4.IsGlobalNamespace) m.Equal(updatedState, resp4.Namespace.Info.State) @@ -903,7 +903,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { m.Equal(updatedVisibilityArchivalURI, resp4.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp4.Namespace.Config.BadBinaries) m.Equal(updateClusterActive, resp4.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp4.Namespace.ReplicationConfig.Clusters, len(updateClusters)) + m.Equal(len(updateClusters), len(resp4.Namespace.ReplicationConfig.Clusters)) for index := range clusters { m.Equal(updateClusters[index], resp4.Namespace.ReplicationConfig.Clusters[index]) } @@ -916,7 +916,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { resp5, err5 := m.GetNamespace(id, "") m.NoError(err5) m.NotNil(resp5) - m.Equal(id, resp5.Namespace.Info.Id) + m.EqualValues(id, resp5.Namespace.Info.Id) m.Equal(name, resp5.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp5.IsGlobalNamespace) m.Equal(updatedState, resp5.Namespace.Info.State) @@ -929,7 +929,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { m.Equal(updatedVisibilityArchivalState, resp5.Namespace.Config.VisibilityArchivalState) m.Equal(updatedVisibilityArchivalURI, resp5.Namespace.Config.VisibilityArchivalUri) m.Equal(updateClusterActive, resp5.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp5.Namespace.ReplicationConfig.Clusters, len(updateClusters)) + m.Equal(len(updateClusters), len(resp5.Namespace.ReplicationConfig.Clusters)) for index := range clusters { m.Equal(updateClusters[index], resp5.Namespace.ReplicationConfig.Clusters[index]) } @@ -973,7 +973,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { resp6, err6 := m.GetNamespace(id, "") m.NoError(err6) m.NotNil(resp6) - m.Equal(id, resp6.Namespace.Info.Id) + m.EqualValues(id, resp6.Namespace.Info.Id) m.Equal(name, resp6.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp6.IsGlobalNamespace) m.Equal(updatedState, resp6.Namespace.Info.State) @@ -987,7 +987,7 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() { m.Equal(updatedVisibilityArchivalURI, resp6.Namespace.Config.VisibilityArchivalUri) m.ProtoEqual(testBinaries, resp6.Namespace.Config.BadBinaries) m.Equal(updateClusterActive, resp6.Namespace.ReplicationConfig.ActiveClusterName) - m.Len(resp6.Namespace.ReplicationConfig.Clusters, len(updateClusters)) + m.Equal(len(updateClusters), len(resp6.Namespace.ReplicationConfig.Clusters)) for index := range clusters { m.Equal(updateClusters[index], resp4.Namespace.ReplicationConfig.Clusters[index]) } @@ -1045,7 +1045,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespace() { failoverVersion, ) m.NoError(err1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) _, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -1059,14 +1059,14 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespace() { resp4, err4 := m.GetNamespace("", newName) m.NoError(err4) m.NotNil(resp4) - m.Equal(id, resp4.Namespace.Info.Id) + m.EqualValues(id, resp4.Namespace.Info.Id) m.Equal(newName, resp4.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp4.IsGlobalNamespace) resp5, err5 := m.GetNamespace(id, "") m.NoError(err5) m.NotNil(resp5) - m.Equal(id, resp5.Namespace.Info.Id) + m.EqualValues(id, resp5.Namespace.Info.Id) m.Equal(newName, resp5.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp5.IsGlobalNamespace) @@ -1079,7 +1079,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespace() { resp6, err6 := m.GetNamespace(id, "") m.NoError(err6) m.NotNil(resp6) - m.Equal(id, resp6.Namespace.Info.Id) + m.EqualValues(id, resp6.Namespace.Info.Id) m.Equal(newNewName, resp6.Namespace.Info.Name) m.Equal(isGlobalNamespace, resp6.IsGlobalNamespace) } @@ -1130,7 +1130,7 @@ func (m *MetadataPersistenceSuiteV2) TestDeleteNamespace() { failoverVersion, ) m.NoError(err1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) resp2, err2 := m.GetNamespace("", name) m.NoError(err2) @@ -1184,7 +1184,7 @@ func (m *MetadataPersistenceSuiteV2) TestDeleteNamespace() { failoverVersion, ) m.NoError(err6) - m.Equal(id, resp6.ID) + m.EqualValues(id, resp6.ID) err7 := m.DeleteNamespace(id, "") m.NoError(err7) @@ -1322,8 +1322,8 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces() { } // There should be 2 non-empty pages. - m.Equal(2, pageCount) - m.Len(outputNamespaces, len(inputNamespaces)) + m.Equal(pageCount, 2) + m.Equal(len(inputNamespaces), len(outputNamespaces)) for _, namespace := range inputNamespaces { m.DeepEqual(namespace, outputNamespaces[namespace.Namespace.Info.Id]) } @@ -1409,7 +1409,7 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces_DeletedNamespace() { m.Equal(1, pageCount) m.Len(listNamespacesPageSize2, 2) for _, namespace := range listNamespacesPageSize2 { - m.NotEqual(enumspb.NAMESPACE_STATE_DELETED, namespace.Namespace.Info.State) + m.NotEqual(namespace.Namespace.Info.State, enumspb.NAMESPACE_STATE_DELETED) } pageCount = 0 @@ -1432,7 +1432,7 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces_DeletedNamespace() { m.Equal(2, pageCount) m.Len(listNamespacesPageSize1, 2) for _, namespace := range listNamespacesPageSize1 { - m.NotEqual(enumspb.NAMESPACE_STATE_DELETED, namespace.Namespace.Info.State) + m.NotEqual(namespace.Namespace.Info.State, enumspb.NAMESPACE_STATE_DELETED) } } @@ -1550,7 +1550,7 @@ func (m *MetadataPersistenceSuiteV2) TestCASFailureUpdateNamespace() { failoverVersion, ) m.NoError(err1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) resp2, err2 := m.GetNamespace(id, "") m.NoError(err2) @@ -1646,7 +1646,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceWithNameConflict() { failoverVersion, ) m.NoError(err1) - m.Equal(id1, resp1.ID) + m.EqualValues(id1, resp1.ID) // Create second namespace resp2, err2 := m.CreateNamespace( @@ -1674,7 +1674,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceWithNameConflict() { failoverVersion, ) m.NoError(err2) - m.Equal(id2, resp2.ID) + m.EqualValues(id2, resp2.ID) // Try to rename namespace1 to the same name as namespace2 (should fail) err3 := m.MetadataManager.RenameNamespace(m.ctx, &p.RenameNamespaceRequest{ @@ -2170,7 +2170,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceCassandra() { failoverVersion, ) m.NoError(err1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) // Verify namespace exists with original name resp2, err2 := m.GetNamespace(id, "") @@ -2188,7 +2188,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceCassandra() { resp4, err4 := m.GetNamespace("", newName) m.NoError(err4) m.NotNil(resp4) - m.Equal(id, resp4.Namespace.Info.Id) + m.EqualValues(id, resp4.Namespace.Info.Id) m.Equal(newName, resp4.Namespace.Info.Name) m.Equal(description, resp4.Namespace.Info.Description) m.Equal(owner, resp4.Namespace.Info.Owner) @@ -2294,7 +2294,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceSQL() { failoverVersion, ) m.NoError(err1) - m.Equal(id, resp1.ID) + m.EqualValues(id, resp1.ID) // Verify namespace exists with original name resp2, err2 := m.GetNamespace(id, "") @@ -2312,7 +2312,7 @@ func (m *MetadataPersistenceSuiteV2) TestRenameNamespaceSQL() { resp4, err4 := m.GetNamespace("", newName) m.NoError(err4) m.NotNil(resp4) - m.Equal(id, resp4.Namespace.Info.Id) + m.EqualValues(id, resp4.Namespace.Info.Id) m.Equal(newName, resp4.Namespace.Info.Name) m.Equal(description, resp4.Namespace.Info.Description) m.Equal(owner, resp4.Namespace.Info.Owner) diff --git a/common/persistence/persistence-tests/queue_persistence.go b/common/persistence/persistence-tests/queue_persistence.go index 1ca9bdc48fb..64895ccdbde 100644 --- a/common/persistence/persistence-tests/queue_persistence.go +++ b/common/persistence/persistence-tests/queue_persistence.go @@ -77,7 +77,7 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationQueue() { for message := range messageChan { err := s.Publish(s.ctx, message) id := message.Attributes.(*replicationspb.ReplicationTask_NamespaceTaskAttributes).NamespaceTaskAttributes.Id - s.NoError(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) + s.Nil(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) } }(i) } @@ -85,7 +85,7 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationQueue() { wg.Wait() result, lastRetrievedMessageID, err := s.GetReplicationMessages(s.ctx, persistence.EmptyQueueMessageID, numMessages) - s.NoError(err, "GetReplicationMessages failed.") + s.Nil(err, "GetReplicationMessages failed.") s.Len(result, numMessages) s.Equal(int64(numMessages-1), lastRetrievedMessageID) } @@ -94,32 +94,32 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationQueue() { func (s *QueuePersistenceSuite) TestQueueMetadataOperations() { clusterAckLevels, err := s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Assert().Empty(clusterAckLevels) + s.Assert().Len(clusterAckLevels, 0) err = s.UpdateAckLevel(s.ctx, 10, "test1") s.Require().NoError(err) clusterAckLevels, err = s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Len(clusterAckLevels, 1) - s.Equal(int64(10), clusterAckLevels["test1"]) + s.Assert().Len(clusterAckLevels, 1) + s.Assert().Equal(int64(10), clusterAckLevels["test1"]) err = s.UpdateAckLevel(s.ctx, 20, "test1") s.Require().NoError(err) clusterAckLevels, err = s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Len(clusterAckLevels, 1) - s.Equal(int64(20), clusterAckLevels["test1"]) + s.Assert().Len(clusterAckLevels, 1) + s.Assert().Equal(int64(20), clusterAckLevels["test1"]) err = s.UpdateAckLevel(s.ctx, 25, "test2") s.Require().NoError(err) clusterAckLevels, err = s.GetAckLevels(s.ctx) s.Require().NoError(err) - s.Len(clusterAckLevels, 2) - s.Equal(int64(20), clusterAckLevels["test1"]) - s.Equal(int64(25), clusterAckLevels["test2"]) + s.Assert().Len(clusterAckLevels, 2) + s.Assert().Equal(int64(20), clusterAckLevels["test1"]) + s.Assert().Equal(int64(25), clusterAckLevels["test2"]) } // TestNamespaceReplicationDLQ tests namespace DLQ operations @@ -154,7 +154,7 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationDLQ() { for message := range messageChan { err := s.PublishToNamespaceDLQ(s.ctx, message) id := message.Attributes.(*replicationspb.ReplicationTask_NamespaceTaskAttributes).NamespaceTaskAttributes.Id - s.NoError(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) + s.Nil(err, "Enqueue message failed when sender %d tried to send %s", senderNum, id) } }(i) } @@ -162,30 +162,30 @@ func (s *QueuePersistenceSuite) TestNamespaceReplicationDLQ() { wg.Wait() result1, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages/2, nil) - s.NoError(err, "GetReplicationMessages failed.") + s.Nil(err, "GetReplicationMessages failed.") s.NotNil(token) result2, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages, token) - s.NoError(err, "GetReplicationMessages failed.") - s.Empty(token) + s.Nil(err, "GetReplicationMessages failed.") + s.Equal(len(token), 0) s.Equal(len(result1)+len(result2), numMessages) _, _, err = s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, 1<<63-1, numMessages, nil) s.NoError(err, "GetReplicationMessages failed.") - s.Empty(token) + s.Equal(len(token), 0) lastMessageID := result2[len(result2)-1].SourceTaskId err = s.DeleteMessageFromNamespaceDLQ(s.ctx, lastMessageID) s.NoError(err) result3, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages, token) - s.NoError(err, "GetReplicationMessages failed.") - s.Empty(token) + s.Nil(err, "GetReplicationMessages failed.") + s.Equal(len(token), 0) s.Equal(len(result3), numMessages-1) err = s.RangeDeleteMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, lastMessageID) s.NoError(err) result4, token, err := s.GetMessagesFromNamespaceDLQ(s.ctx, persistence.EmptyQueueMessageID, maxMessageID, numMessages, token) - s.NoError(err, "GetReplicationMessages failed.") - s.Empty(token) - s.Empty(result4) + s.Nil(err, "GetReplicationMessages failed.") + s.Equal(len(token), 0) + s.Equal(len(result4), 0) } // TestNamespaceDLQMetadataOperations tests queue metadata operations diff --git a/common/persistence/persistence_metrics_clients_test.go b/common/persistence/persistence_metrics_clients_test.go index 51c45b655a8..59b7b96bfb3 100644 --- a/common/persistence/persistence_metrics_clients_test.go +++ b/common/persistence/persistence_metrics_clients_test.go @@ -56,7 +56,7 @@ func TestExecutionPersistenceClient_DataLossMetrics_EmittedOnDataLossError(t *te // Verify error is returned require.Error(t, err) - assert.ErrorIs(t, err, dataLossErr) + assert.True(t, errors.Is(err, dataLossErr)) // Verify data loss metrics are emitted snapshot := capture.Snapshot() @@ -229,7 +229,7 @@ func TestExecutionPersistenceClient_DataLossMetrics_WithWrappedDataLossError(t * tags := recording.Tags assert.Equal(t, "_unknown_", tags[metrics.NamespaceTag("").Key]) assert.Equal(t, "test-workflow-id", tags["workflow_id"]) - assert.Empty(t, tags["run_id"]) // No run ID in GetCurrentExecutionRequest + assert.Equal(t, "", tags["run_id"]) // No run ID in GetCurrentExecutionRequest } func TestExecutionPersistenceClient_DataLossMetrics_WithEmptyWorkflowDetails(t *testing.T) { @@ -283,7 +283,7 @@ func TestExecutionPersistenceClient_DataLossMetrics_WithEmptyWorkflowDetails(t * // Verify tags are set with empty workflow details tags := recording.Tags - assert.Empty(t, tags["workflow_id"]) - assert.Empty(t, tags["run_id"]) + assert.Equal(t, "", tags["workflow_id"]) + assert.Equal(t, "", tags["run_id"]) assert.Equal(t, metrics.PersistenceListConcreteExecutionsScope, tags[metrics.OperationTag("").Key]) } diff --git a/common/persistence/serialization/serializer_test.go b/common/persistence/serialization/serializer_test.go index eb93de6022f..d936d285b3e 100644 --- a/common/persistence/serialization/serializer_test.go +++ b/common/persistence/serialization/serializer_test.go @@ -81,39 +81,39 @@ func (s *temporalSerializerSuite) TestSerializer() { // serialize event nilEvent, err := s.serializer.SerializeEvent(nil) - s.NoError(err) + s.Nil(err) s.Nil(nilEvent) dProto, err := s.serializer.SerializeEvent(event0) - s.NoError(err) + s.Nil(err) s.NotNil(dProto) // serialize batch events nilEvents, err := s.serializer.SerializeEvents(nil) - s.NoError(err) + s.Nil(err) s.NotNil(nilEvents) dsProto, err := s.serializer.SerializeEvents(history0.Events) - s.NoError(err) + s.Nil(err) s.NotNil(dsProto) // deserialize event dNilEvent, err := s.serializer.DeserializeEvent(nilEvent) - s.NoError(err) + s.Nil(err) s.Nil(dNilEvent) event2, err := s.serializer.DeserializeEvent(dProto) - s.NoError(err) + s.Nil(err) s.ProtoEqual(event0, event2) // deserialize events dNilEvents, err := s.serializer.DeserializeEvents(nilEvents) - s.NoError(err) + s.Nil(err) s.Nil(dNilEvents) events, err := s.serializer.DeserializeEvents(dsProto) history2 := &historypb.History{Events: events} - s.NoError(err) + s.Nil(err) s.ProtoEqual(history0, history2) }() } diff --git a/common/persistence/serializer_test.go b/common/persistence/serializer_test.go index 5514796a4ff..5bc8aa58dfb 100644 --- a/common/persistence/serializer_test.go +++ b/common/persistence/serializer_test.go @@ -78,42 +78,42 @@ func (s *temporalSerializerSuite) TestSerializer() { // serialize event nilEvent, err := serializer.SerializeEvent(nil) - s.NoError(err) + s.Nil(err) s.Nil(nilEvent) dProto, err := serializer.SerializeEvent(event0) - s.NoError(err) + s.Nil(err) s.NotNil(dProto) // serialize batch events nilEvents, err := serializer.SerializeEvents(nil) - s.NoError(err) + s.Nil(err) s.NotNil(nilEvents) dsProto, err := serializer.SerializeEvents(history0.Events) - s.NoError(err) + s.Nil(err) s.NotNil(dsProto) // deserialize event dNilEvent, err := serializer.DeserializeEvent(nilEvent) - s.NoError(err) + s.Nil(err) s.Nil(dNilEvent) event2, err := serializer.DeserializeEvent(dProto) - s.NoError(err) + s.Nil(err) s.ProtoEqual(event0, event2) // deserialize events dNilEvents, err := serializer.DeserializeEvents(nilEvents) - s.NoError(err) + s.Nil(err) s.Nil(dNilEvents) events, err := serializer.DeserializeEvents(dsProto) history2 := &historypb.History{Events: events} - s.NoError(err) + s.Nil(err) s.ProtoEqual(history0, history2) }() } diff --git a/common/persistence/sql/sqlplugin/tests/queue_v2.go b/common/persistence/sql/sqlplugin/tests/queue_v2.go index dd6f9865081..32b33ccdfb6 100644 --- a/common/persistence/sql/sqlplugin/tests/queue_v2.go +++ b/common/persistence/sql/sqlplugin/tests/queue_v2.go @@ -277,7 +277,7 @@ func testQueueInsertFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB assert.ErrorContains(t, err, "insert error") require.Len(t, logger.errMsgs, 1) assert.Contains(t, logger.errMsgs[0], "transaction rollback error") - assert.Equal(t, 0, db.commitCalls) + assert.Equal(t, db.commitCalls, 0) } func testCommitTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { @@ -297,7 +297,7 @@ func testCommitTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { _, err = persistencetest.EnqueueMessage(context.Background(), q, queueType, queueName) require.Error(t, err) assert.ErrorContains(t, err, "EnqueueMessage failed") - assert.Equal(t, 1, db.commitCalls) + assert.Equal(t, db.commitCalls, 1) } func testBeginTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { @@ -317,7 +317,7 @@ func testBeginTxFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { _, err = persistencetest.EnqueueMessage(context.Background(), q, queueType, queueName) require.Error(t, err) assert.ErrorContains(t, err, "txBegin error") - assert.Equal(t, 0, db.commitCalls) + assert.Equal(t, db.commitCalls, 0) } func testGetLastMessageIDFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { @@ -338,7 +338,7 @@ func testGetLastMessageIDFails(ctx context.Context, t *testing.T, baseDB sqlplug _, err = persistencetest.EnqueueMessage(context.Background(), q, queueType, queueName) require.Error(t, err) assert.ErrorContains(t, err, "failed to get last messageId") - assert.Equal(t, 0, db.commitCalls) + assert.Equal(t, db.commitCalls, 0) } func testRangeSelectFromQueueV2MessagesFails(ctx context.Context, t *testing.T, baseDB sqlplugin.DB) { diff --git a/common/persistence/tests/queue_v2_test_suite.go b/common/persistence/tests/queue_v2_test_suite.go index 5da6ebfebfb..24f68c11db3 100644 --- a/common/persistence/tests/queue_v2_test_suite.go +++ b/common/persistence/tests/queue_v2_test_suite.go @@ -146,7 +146,7 @@ func testHappyPath( NextPageToken: nil, }) require.NoError(t, err) - assert.Empty(t, response.Messages) + assert.Equal(t, 0, len(response.Messages)) encodingType := enumspb.ENCODING_TYPE_JSON _, err = persistencetest.EnqueueMessage(ctx, queue, queueType, queueName) @@ -325,7 +325,7 @@ func testRangeDeleteMessages(ctx context.Context, t *testing.T, queue persistenc }) require.NoError(t, err) require.Len(t, response.Messages, 1) - require.Equal(t, int64(3), response.Messages[0].MetaData.ID) + require.Equal(t, response.Messages[0].MetaData.ID, int64(3)) }) t.Run("DeleteSameRangeTwice", func(t *testing.T) { @@ -399,7 +399,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Empty(t, response.Queues) + require.Equal(t, 0, len(response.Queues)) // List of all created queues var queueNames []string @@ -418,7 +418,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Len(t, response.Queues, 1) + require.Equal(t, 1, len(response.Queues)) require.Equal(t, queueName, response.Queues[0].QueueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -437,7 +437,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Len(t, response.Queues, 2) + require.Equal(t, 2, len(response.Queues)) require.Contains(t, []string{response.Queues[0].QueueName, response.Queues[1].QueueName}, queueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -461,7 +461,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: nil, }) require.NoError(t, err) - require.Len(t, response.Queues, 1) + require.Equal(t, 1, len(response.Queues)) listedQueueNames = append(listedQueueNames, response.Queues[0].QueueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -471,7 +471,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: response.NextPageToken, }) require.NoError(t, err) - require.Len(t, response.Queues, 1) + require.Equal(t, 1, len(response.Queues)) listedQueueNames = append(listedQueueNames, response.Queues[0].QueueName) require.Equal(t, int64(0), response.Queues[0].MessageCount) require.Equal(t, int64(-1), response.Queues[0].LastMessageID) @@ -481,7 +481,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: response.NextPageToken, }) require.NoError(t, err) - require.Len(t, response.Queues, 3) + require.Equal(t, 3, len(response.Queues)) for _, queue := range response.Queues { listedQueueNames = append(listedQueueNames, queue.QueueName) require.Equal(t, int64(0), queue.MessageCount) @@ -493,7 +493,7 @@ func testListQueues(ctx context.Context, t *testing.T, queue persistence.QueueV2 NextPageToken: response.NextPageToken, }) require.NoError(t, err) - require.Empty(t, response.Queues) + require.Equal(t, 0, len(response.Queues)) require.Empty(t, response.NextPageToken) for _, queueName := range queueNames { require.Contains(t, listedQueueNames, queueName) diff --git a/common/persistence/versionhistory/version_history_test.go b/common/persistence/versionhistory/version_history_test.go index e65ebf99bf3..6d9378f775d 100644 --- a/common/persistence/versionhistory/version_history_test.go +++ b/common/persistence/versionhistory/version_history_test.go @@ -499,17 +499,17 @@ func (s *versionHistoriesSuite) TestAddGetVersionHistory() { s.Equal(int32(0), histories.CurrentVersionHistoryIndex) currentBranchChanged, newVersionHistoryIndex, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.NoError(err) + s.Nil(err) s.True(currentBranchChanged) s.Equal(int32(1), newVersionHistoryIndex) s.Equal(int32(1), histories.CurrentVersionHistoryIndex) resultVersionHistory1, err := GetVersionHistory(histories, 0) - s.NoError(err) + s.Nil(err) s.Equal(versionHistory1, resultVersionHistory1) resultVersionHistory2, err := GetVersionHistory(histories, 1) - s.NoError(err) + s.Nil(err) s.Equal(versionHistory2, resultVersionHistory2) } @@ -529,7 +529,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_LargerEven histories := NewVersionHistories(versionHistory1) _, _, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.NoError(err) + s.Nil(err) versionHistoryIncoming := NewVersionHistory([]byte("branch token incoming"), []*historyspb.VersionHistoryItem{ {EventId: 3, Version: 0}, @@ -539,7 +539,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_LargerEven }) item, index, err := FindLCAVersionHistoryItemAndIndex(histories, versionHistoryIncoming) - s.NoError(err) + s.Nil(err) s.Equal(int32(0), index) s.Equal(NewVersionHistoryItem(7, 6), item) } @@ -559,7 +559,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_SameEventI histories := NewVersionHistories(versionHistory1) _, _, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.NoError(err) + s.Nil(err) versionHistoryIncoming := NewVersionHistory([]byte("branch token incoming"), []*historyspb.VersionHistoryItem{ {EventId: 3, Version: 0}, @@ -569,7 +569,7 @@ func (s *versionHistoriesSuite) TestFindLCAVersionHistoryIndexAndItem_SameEventI }) item, index, err := FindLCAVersionHistoryItemAndIndex(histories, versionHistoryIncoming) - s.NoError(err) + s.Nil(err) s.Equal(int32(1), index) s.Equal(NewVersionHistoryItem(7, 6), item) } @@ -589,7 +589,7 @@ func (s *versionHistoriesSuite) TestFindFirstVersionHistoryIndexByItem() { histories := NewVersionHistories(versionHistory1) _, _, err := AddAndSwitchVersionHistory(histories, versionHistory2) - s.NoError(err) + s.Nil(err) index, err := FindFirstVersionHistoryIndexByVersionHistoryItem(histories, NewVersionHistoryItem(8, 10)) s.NoError(err) diff --git a/common/persistence/visibility/store/elasticsearch/converter_test.go b/common/persistence/visibility/store/elasticsearch/converter_test.go index 2b2b6977b67..0549fba13e3 100644 --- a/common/persistence/visibility/store/elasticsearch/converter_test.go +++ b/common/persistence/visibility/store/elasticsearch/converter_test.go @@ -135,7 +135,7 @@ func TestSupportedSelectWhere(t *testing.T) { actualMap, _ := queryParams.Query.Source() actualJson, _ := json.Marshal(actualMap) - assert.JSONEq(t, expectedJson, string(actualJson), fmt.Sprintf("sql: %s", sql)) + assert.Equal(t, expectedJson, string(actualJson), fmt.Sprintf("sql: %s", sql)) } } @@ -165,7 +165,7 @@ func TestSupportedSelectWhereOrder(t *testing.T) { actualQueryMap, _ := queryParams.Query.Source() actualQueryJson, _ := json.Marshal(actualQueryMap) - assert.JSONEq(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) + assert.Equal(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) var actualSorterMaps []any for _, sorter := range queryParams.Sorter { @@ -173,7 +173,7 @@ func TestSupportedSelectWhereOrder(t *testing.T) { actualSorterMaps = append(actualSorterMaps, actualSorterMap) } actualSorterJson, _ := json.Marshal(actualSorterMaps) - assert.JSONEq(t, expectedJson.sorter, string(actualSorterJson), fmt.Sprintf("sql: %s", sql)) + assert.Equal(t, expectedJson.sorter, string(actualSorterJson), fmt.Sprintf("sql: %s", sql)) } } @@ -187,7 +187,7 @@ func TestSupportedSelectWhereGroupBy(t *testing.T) { if expectedJson.query != "" { actualQueryMap, _ := queryParams.Query.Source() actualQueryJson, _ := json.Marshal(actualQueryMap) - assert.JSONEq(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) + assert.Equal(t, expectedJson.query, string(actualQueryJson), fmt.Sprintf("sql: %s", sql)) } else { assert.Nil(t, queryParams.Query) } diff --git a/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go b/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go index 21d6b465b92..f1389e30b6d 100644 --- a/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go +++ b/common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go @@ -348,37 +348,37 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy() { query := `WorkflowId = 'wid'` queryParams, err := s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `WorkflowId = 'wid' or WorkflowId = 'another-wid'` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"term":{"WorkflowId":"another-wid"}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"term":{"WorkflowId":"another-wid"}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `WorkflowId = 'wid' order by StartTime desc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"StartTime":{"missing":"_last","order":"desc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `WorkflowId = 'wid' and CloseTime is null` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `WorkflowId = 'wid' or CloseTime is null` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"term":{"WorkflowId":"wid"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `CloseTime is null order by CloseTime desc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"must_not":{"exists":{"field":"CloseTime"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"CloseTime":{"missing":"_last","order":"desc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `StartTime = "2018-06-07T15:04:05.123456789-08:00"` @@ -390,56 +390,56 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy() { query = `WorkflowId = 'wid' and StartTime > "2018-06-07T15:04:05+00:00"` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"range":{"StartTime":{"from":"2018-06-07T15:04:05+00:00","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":[{"term":{"WorkflowId":"wid"}},{"range":{"StartTime":{"from":"2018-06-07T15:04:05+00:00","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ExecutionTime < 1000000` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ExecutionTime between 1 and 2` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.000000001Z","include_lower":true,"include_upper":true,"to":"1970-01-01T00:00:00.000000002Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.000000001Z","include_lower":true,"include_upper":true,"to":"1970-01-01T00:00:00.000000002Z"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ExecutionTime < 1000000 or ExecutionTime > 2000000` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}},{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.002Z","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"should":[{"range":{"ExecutionTime":{"from":null,"include_lower":true,"include_upper":false,"to":"1970-01-01T00:00:00.001Z"}}},{"range":{"ExecutionTime":{"from":"1970-01-01T00:00:00.002Z","include_lower":false,"include_upper":true,"to":null}}}]}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `order by ExecutionTime` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"ExecutionTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by StartTime desc, CloseTime asc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"StartTime":{"missing":"_last","order":"desc"}},{"CloseTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by CustomTextField desc` _, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) - s.Equal("invalid query: unable to convert 'order by' column name: unable to sort by field of Text type, use field of type Keyword", err.(*serviceerror.InvalidArgument).Error()) + s.Equal(err.(*serviceerror.InvalidArgument).Error(), "invalid query: unable to convert 'order by' column name: unable to sort by field of Text type, use field of type Keyword") query = `order by CustomIntField asc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"CustomIntField":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `ExecutionTime < "unable to parse"` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.Error(err) s.IsType(&serviceerror.InvalidArgument{}, err) - s.Equal("invalid query: unable to convert filter expression: unable to convert values of comparison expression: invalid value for search attribute ExecutionTime of type Datetime: \"unable to parse\"", err.Error()) + s.Equal(err.Error(), "invalid query: unable to convert filter expression: unable to convert values of comparison expression: invalid value for search attribute ExecutionTime of type Datetime: \"unable to parse\"") s.Nil(queryParams) // invalid union injection @@ -453,19 +453,19 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper() { query := `WorkflowId = 'wid'` queryParams, err := s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = "`AliasForCustomKeywordField` = 'pid'" queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = "`AliasWithHyphenFor-CustomKeywordField` = 'pid'" queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"CustomKeywordField":"pid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `CustomKeywordField = 'pid'` @@ -484,13 +484,13 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper() { query = `order by ExecutionTime` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"ExecutionTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by AliasForCustomKeywordField asc` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"CustomKeywordField":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) query = `order by CustomKeywordField asc` @@ -511,7 +511,7 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper_Error() { query := `WorkflowId = 'wid'` queryParams, err := s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"term":{"WorkflowId":"wid"}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.Nil(queryParams.Sorter) query = `ProductId = 'pid'` @@ -524,7 +524,7 @@ func (s *ESVisibilitySuite) Test_convertQueryLegacy_Mapper_Error() { query = `order by ExecutionTime` queryParams, err = s.visibilityStore.convertQueryLegacy(testNamespace, testNamespaceID, query, nil, chasm.UnspecifiedArchetypeID) s.NoError(err) - s.JSONEq(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) + s.Equal(`{"bool":{"filter":{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query)) s.JSONEq(`[{"ExecutionTime":{"missing":"_last","order":"asc"}}]`, s.sorterToJSON(queryParams.Sorter)) s.visibilityStore.searchAttributesMapperProvider = nil @@ -653,8 +653,8 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { }} resp, err := s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, 1, nil) s.NoError(err) - s.Empty(resp.NextPageToken) - s.Empty(resp.Executions) + s.Equal(0, len(resp.NextPageToken)) + s.Equal(0, len(resp.Executions)) // test for one hits data := []byte(`{"ExecutionStatus": "Running", @@ -678,13 +678,13 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { s.NoError(err) serializedToken, _ := s.visibilityStore.serializePageToken(&visibilityPageToken{SearchAfter: []any{1547596872371234567, "e481009e-14b3-45ae-91af-dce6e2a88365"}}) s.Equal(serializedToken, resp.NextPageToken) - s.Len(resp.Executions, 1) + s.Equal(1, len(resp.Executions)) // test page size > number of results resp, err = s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, 2, nil) s.NoError(err) s.Equal(serializedToken, resp.NextPageToken) - s.Len(resp.Executions, 1) + s.Equal(1, len(resp.Executions)) // test for search after searchResult.Hits.Hits = []*elastic.SearchHit{} @@ -694,7 +694,7 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { numOfHits := len(searchResult.Hits.Hits) resp, err = s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits, nil) s.NoError(err) - s.Len(resp.Executions, numOfHits) + s.Equal(numOfHits, len(resp.Executions)) nextPageToken, err := s.visibilityStore.deserializePageToken(resp.NextPageToken) s.NoError(err) resultSortValue, err := nextPageToken.SearchAfter[0].(json.Number).Int64() @@ -705,7 +705,7 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() { resp, err = s.visibilityStore.GetListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits+1, nil) s.NoError(err) s.Equal(serializedToken, resp.NextPageToken) - s.Len(resp.Executions, numOfHits) + s.Equal(numOfHits, len(resp.Executions)) } func (s *ESVisibilitySuite) TestDeserializePageToken() { @@ -744,7 +744,7 @@ func (s *ESVisibilitySuite) TestSerializePageToken() { newToken := &visibilityPageToken{SearchAfter: []any{sortTime, tieBreaker}} data, err = s.visibilityStore.serializePageToken(newToken) s.NoError(err) - s.Positive(len(data)) + s.True(len(data) > 0) token, err = s.visibilityStore.deserializePageToken(data) s.NoError(err) resultSortValue, err := token.SearchAfter[0].(json.Number).Int64() @@ -1896,7 +1896,7 @@ func (s *ESVisibilitySuite) Test_parsePageTokenValue() { jsonToken, _ := json.Marshal(pageToken) pageToken, err := s.visibilityStore.deserializePageToken(jsonToken) s.NoError(err) - s.Len(pageToken.SearchAfter, len(testCases)) + s.Equal(len(testCases), len(pageToken.SearchAfter)) for i, tc := range testCases { s.T().Run(tc.name, func(t *testing.T) { res, err := parsePageTokenValue(tc.name, pageToken.SearchAfter[i], tc.tp) diff --git a/common/retrypolicy/retry_policy_test.go b/common/retrypolicy/retry_policy_test.go index 9ade5b95c0a..27ec1493f85 100644 --- a/common/retrypolicy/retry_policy_test.go +++ b/common/retrypolicy/retry_policy_test.go @@ -224,10 +224,10 @@ func TestValidateRetryPolicy(t *testing.T) { t.Run(tt.name, func(t *testing.T) { err := Validate(tt.input) if tt.wantErr { - assert.Error(t, err, "expected error - did not get one") - assert.Equal(t, tt.wantErrString, err.Error(), "unexpected error message") + assert.NotNil(t, err, "expected error - did not get one") + assert.Equal(t, err.Error(), tt.wantErrString, "unexpected error message") } else { - assert.NoError(t, err, "unexpected error") + assert.Nil(t, err, "unexpected error") } }) } diff --git a/common/rpc/dial_tracer_test.go b/common/rpc/dial_tracer_test.go index 568a297beef..60cc4890c75 100644 --- a/common/rpc/dial_tracer_test.go +++ b/common/rpc/dial_tracer_test.go @@ -32,7 +32,7 @@ func TestDialTracer_DialSuccess(t *testing.T) { assert.Positive(t, ndt.connectDuration) assert.Equal(t, addr, ndt.connectAddr) - assert.NoError(t, ndt.connectErr) + assert.Nil(t, ndt.connectErr) } func TestDialTracer_DialError(t *testing.T) { @@ -77,7 +77,7 @@ func TestDialTracer_NoConnectStart(t *testing.T) { assert.Zero(t, ndt.connectDuration) assert.Equal(t, addr, ndt.connectAddr) - assert.NoError(t, ndt.connectErr) + assert.Nil(t, ndt.connectErr) } // rewind moves a timestamp back by 1 millisecond to ensure positive durations in tests diff --git a/common/rpc/interceptor/mask_internal_error_test.go b/common/rpc/interceptor/mask_internal_error_test.go index 6a8b4d55219..6f0bfd47677 100644 --- a/common/rpc/interceptor/mask_internal_error_test.go +++ b/common/rpc/interceptor/mask_internal_error_test.go @@ -48,7 +48,7 @@ func testMaskUnknownOrInternalErrors(t *testing.T, st *status.Status, expectRelp assert.Equal(t, expectedMessage, errorMessage.Error()) } else { if err == nil { - assert.NoError(t, errorMessage) + assert.Equal(t, errorMessage, nil) } else { assert.Equal(t, errorMessage.Error(), st.Message()) } diff --git a/common/rpc/interceptor/sdk_version_test.go b/common/rpc/interceptor/sdk_version_test.go index e8bacf6c0de..25ed973100e 100644 --- a/common/rpc/interceptor/sdk_version_test.go +++ b/common/rpc/interceptor/sdk_version_test.go @@ -58,7 +58,7 @@ func TestSDKVersionRecorder(t *testing.T) { sort.SliceStable(info, func(i, j int) bool { return info[i].Name < info[j].Name }) - assert.Len(t, info, 2) + assert.Equal(t, 2, len(info)) assert.Equal(t, headers.ClientNameGoSDK, info[0].Name) assert.Equal(t, sdkVersion, info[0].Version) assert.Equal(t, headers.ClientNameTypeScriptSDK, info[1].Name) diff --git a/common/searchattribute/sadefs/encode_value_test.go b/common/searchattribute/sadefs/encode_value_test.go index cdae137a127..e4b7a53786d 100644 --- a/common/searchattribute/sadefs/encode_value_test.go +++ b/common/searchattribute/sadefs/encode_value_test.go @@ -402,7 +402,7 @@ func Test_ValidateStrings(t *testing.T) { assert.Contains(t, err.Error(), "is not a valid UTF-8 string") value, err := validateStrings("anything here", nil) - assert.NoError(t, err) + assert.Nil(t, err) assert.Equal(t, "anything here", value) _, err = validateStrings([]string{"abc", "\x87\x01"}, nil) diff --git a/common/searchattribute/validator_test.go b/common/searchattribute/validator_test.go index 9e6c3745bf8..2ccbc9cb0dc 100644 --- a/common/searchattribute/validator_test.go +++ b/common/searchattribute/validator_test.go @@ -210,7 +210,7 @@ func (s *searchAttributesValidatorSuite) TestSearchAttributesValidate_Mapper() { var attr *commonpb.SearchAttributes err := saValidator.Validate(attr, namespace) - s.NoError(err) + s.Nil(err) intPayload, err := payload.Encode(1) s.NoError(err) diff --git a/common/util/strings_test.go b/common/util/strings_test.go index 87f18797825..b7d90442cb4 100644 --- a/common/util/strings_test.go +++ b/common/util/strings_test.go @@ -8,7 +8,7 @@ import ( func TestTruncateUTF8(t *testing.T) { s := "hello \u2603!!!" - assert.Len(t, s, 12) + assert.Equal(t, 12, len(s)) assert.Equal(t, "hello \u2603!!!", TruncateUTF8(s, 20)) assert.Equal(t, "hello \u2603!!!", TruncateUTF8(s, 12)) assert.Equal(t, "hello \u2603!!", TruncateUTF8(s, 11)) @@ -18,6 +18,6 @@ func TestTruncateUTF8(t *testing.T) { assert.Equal(t, "hello ", TruncateUTF8(s, 7)) assert.Equal(t, "hello ", TruncateUTF8(s, 6)) assert.Equal(t, "hello", TruncateUTF8(s, 5)) - assert.Empty(t, TruncateUTF8(s, 0)) - assert.Empty(t, TruncateUTF8(s, -3)) + assert.Equal(t, "", TruncateUTF8(s, 0)) + assert.Equal(t, "", TruncateUTF8(s, -3)) } diff --git a/common/worker_versioning/worker_versioning_test.go b/common/worker_versioning/worker_versioning_test.go index 7197e9fe901..dc47f3223b8 100644 --- a/common/worker_versioning/worker_versioning_test.go +++ b/common/worker_versioning/worker_versioning_test.go @@ -1009,10 +1009,10 @@ func TestWorkerDeploymentVersionFromStringV32(t *testing.T) { t.Run(tt.name, func(t *testing.T) { result, err := WorkerDeploymentVersionFromStringV32(tt.input) if tt.expectedErr != "" { - assert.Error(t, err) + assert.NotNil(t, err) assert.EqualError(t, err, tt.expectedErr) } else { - assert.NoError(t, err) + assert.Nil(t, err) assert.Equal(t, tt.expected, result) } }) diff --git a/schema/embed_test.go b/schema/embed_test.go index ae7ac7eee9a..6f07a6345bf 100644 --- a/schema/embed_test.go +++ b/schema/embed_test.go @@ -34,7 +34,7 @@ func TestElasticsearchIndexTemplateIsLatest(t *testing.T) { symlinkPath := "elasticsearch/visibility/index_template_v7.json" symlinkInfo, err := os.Lstat(symlinkPath) require.NoError(t, err, "Failed to get symlink info") - require.NotEqual(t, symlinkInfo.Mode()&os.ModeSymlink, 0, "File is not a symlink") + require.True(t, symlinkInfo.Mode()&os.ModeSymlink != 0, "File is not a symlink") targetPath, err := os.Readlink(symlinkPath) require.NoError(t, err, "Failed to read symlink target") diff --git a/service/frontend/admin_handler_test.go b/service/frontend/admin_handler_test.go index 2344fca5627..27bef7d9510 100644 --- a/service/frontend/admin_handler_test.go +++ b/service/frontend/admin_handler_test.go @@ -1066,9 +1066,9 @@ func (s *adminHandlerSuite) Test_DescribeCluster_CurrentCluster_Success() { s.NoError(err) s.Equal(resp.GetClusterName(), clusterName) s.Equal(resp.GetClusterId(), clusterID) - s.Equal(int32(0), resp.GetHistoryShardCount()) - s.Equal(int64(0), resp.GetFailoverVersionIncrement()) - s.Equal(int64(0), resp.GetInitialFailoverVersion()) + s.Equal(resp.GetHistoryShardCount(), int32(0)) + s.Equal(resp.GetFailoverVersionIncrement(), int64(0)) + s.Equal(resp.GetInitialFailoverVersion(), int64(0)) s.True(resp.GetIsGlobalNamespaceEnabled()) } @@ -1104,9 +1104,9 @@ func (s *adminHandlerSuite) Test_DescribeCluster_NonCurrentCluster_Success() { s.NoError(err) s.Equal(resp.GetClusterName(), clusterName) s.Equal(resp.GetClusterId(), clusterID) - s.Equal(int32(0), resp.GetHistoryShardCount()) - s.Equal(int64(0), resp.GetFailoverVersionIncrement()) - s.Equal(int64(0), resp.GetInitialFailoverVersion()) + s.Equal(resp.GetHistoryShardCount(), int32(0)) + s.Equal(resp.GetFailoverVersionIncrement(), int64(0)) + s.Equal(resp.GetInitialFailoverVersion(), int64(0)) s.True(resp.GetIsGlobalNamespaceEnabled()) } @@ -1127,8 +1127,8 @@ func (s *adminHandlerSuite) Test_ListClusters_Success() { PageSize: pageSize, }) s.NoError(err) - s.Len(resp.Clusters, 1) - s.Empty(resp.GetNextPageToken()) + s.Equal(1, len(resp.Clusters)) + s.Equal(0, len(resp.GetNextPageToken())) } func (s *adminHandlerSuite) TestStreamWorkflowReplicationMessages_ClientToServerBroken() { @@ -1614,7 +1614,7 @@ func (s *adminHandlerSuite) TestDescribeDLQJob() { } s.NoError(err) s.NotNil(response) - s.Equal(tc.expectedResponse, *response) + s.EqualValues(tc.expectedResponse, *response) }) } } @@ -1969,7 +1969,7 @@ func (s *adminHandlerSuite) TestDescribeTaskQueuePartition() { }) s.NoError(err) s.NotNil(resp) - s.Len(resp.VersionsInfoInternal, 2) + s.Equal(2, len(resp.VersionsInfoInternal)) s.validatePhysicalTaskQueueInfo(unversionedPhysicalTaskQueueInfo, resp.VersionsInfoInternal[unversioned].GetPhysicalTaskQueueInfo()) s.validatePhysicalTaskQueueInfo(versionedPhysicalTaskQueueInfo, resp.VersionsInfoInternal[buildID].GetPhysicalTaskQueueInfo()) diff --git a/service/frontend/workflow_handler_test.go b/service/frontend/workflow_handler_test.go index 346ddca294a..8023a71aa61 100644 --- a/service/frontend/workflow_handler_test.go +++ b/service/frontend/workflow_handler_test.go @@ -1670,9 +1670,9 @@ func (s *WorkflowHandlerSuite) TestDescribeNamespace_Success_ArchivalDisabled() s.NotNil(result) s.NotNil(result.Config) s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetHistoryArchivalState()) - s.Empty(result.Config.GetHistoryArchivalUri()) + s.Equal("", result.Config.GetHistoryArchivalUri()) s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetVisibilityArchivalState()) - s.Empty(result.Config.GetVisibilityArchivalUri()) + s.Equal("", result.Config.GetVisibilityArchivalUri()) } func (s *WorkflowHandlerSuite) TestDescribeNamespace_Success_ArchivalEnabled() { @@ -2916,7 +2916,7 @@ func (s *WorkflowHandlerSuite) TestStartBatchOperation_WorkflowExecutions_Reset_ var batchParams batchspb.BatchOperationInput err := payloads.Decode(request.StartRequest.Input, &batchParams) s.NoError(err) - s.Empty(batchParams.Request.Operation.(*workflowservice.StartBatchOperationRequest_ResetOperation).ResetOperation.PostResetOperations) + s.Len(batchParams.Request.Operation.(*workflowservice.StartBatchOperationRequest_ResetOperation).ResetOperation.PostResetOperations, 0) return &historyservice.StartWorkflowExecutionResponse{}, nil }, @@ -3040,7 +3040,7 @@ func (s *WorkflowHandlerSuite) TestStopBatchOperation() { ) (*historyservice.TerminateWorkflowExecutionResponse, error) { s.Equal(namespaceID.String(), request.NamespaceId) s.Equal(jobID, request.TerminateRequest.WorkflowExecution.GetWorkflowId()) - s.Empty(request.TerminateRequest.WorkflowExecution.GetRunId()) + s.Equal("", request.TerminateRequest.WorkflowExecution.GetRunId()) return &historyservice.TerminateWorkflowExecutionResponse{}, nil }, ) @@ -3228,9 +3228,9 @@ func (s *WorkflowHandlerSuite) TestDescribeBatchOperation_RunningStatus() { s.Equal(now, resp.GetCloseTime()) s.Equal(enumspb.BATCH_OPERATION_TYPE_TERMINATE, resp.GetOperationType()) s.Equal(enumspb.BATCH_OPERATION_STATE_RUNNING, resp.GetState()) - s.Equal(int64(5), resp.TotalOperationCount) - s.Equal(int64(3), resp.CompleteOperationCount) - s.Equal(int64(1), resp.FailureOperationCount) + s.Assert().Equal(int64(5), resp.TotalOperationCount) + s.Assert().Equal(int64(3), resp.CompleteOperationCount) + s.Assert().Equal(int64(1), resp.FailureOperationCount) } func (s *WorkflowHandlerSuite) TestDescribeBatchOperation_FailedStatus() { @@ -3338,7 +3338,7 @@ func (s *WorkflowHandlerSuite) TestListBatchOperations() { resp, err := wh.ListBatchOperations(context.Background(), request) s.NoError(err) - s.Len(resp.OperationInfo, 1) + s.Equal(1, len(resp.OperationInfo)) s.Equal(jobID, resp.OperationInfo[0].GetJobId()) s.Equal(now, resp.OperationInfo[0].GetStartTime()) s.Equal(now, resp.OperationInfo[0].GetCloseTime()) @@ -3887,7 +3887,7 @@ func TestContextNearDeadline(t *testing.T) { func TestValidateRequestId(t *testing.T) { req := workflowservice.StartWorkflowExecutionRequest{RequestId: ""} err := validateRequestId(&req.RequestId, 100) - assert.NoError(t, err) + assert.Nil(t, err) assert.Len(t, req.RequestId, 36) // new UUID length } @@ -4204,7 +4204,7 @@ func (s *WorkflowHandlerSuite) TestExecuteMultiOperation() { assertMultiOpsErr := func(expectedErrs []error, actual error) { s.Equal("Update-with-Start could not be executed.", actual.Error()) - s.Equal(expectedErrs, actual.(*serviceerror.MultiOperationExecution).OperationErrors()) + s.EqualValues(expectedErrs, actual.(*serviceerror.MultiOperationExecution).OperationErrors()) } s.Run("operation with different workflow ID as previous operation is invalid", func() { diff --git a/service/history/api/command_attr_validator_test.go b/service/history/api/command_attr_validator_test.go index 2c6d5af06ac..16871f735af 100644 --- a/service/history/api/command_attr_validator_test.go +++ b/service/history/api/command_attr_validator_test.go @@ -353,7 +353,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToLocal( s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.NoError(err) + s.Nil(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToEffectiveLocal_SameCluster() { @@ -376,7 +376,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToEffect s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.NoError(err) + s.Nil(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_LocalToEffectiveLocal_DiffCluster() { @@ -448,7 +448,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLoca s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.NoError(err) + s.Nil(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLocalToLocal_DiffCluster() { @@ -498,7 +498,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLoca s.mockNamespaceCache.EXPECT().GetNamespaceByID(s.testTargetNamespaceID).Return(targetNamespaceEntry, nil) err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", s.testTargetNamespaceID, "test-target-workflow-id") - s.NoError(err) + s.Nil(err) } func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_EffectiveLocalToEffectiveLocal_DiffCluster() { @@ -655,7 +655,7 @@ func (s *commandAttrValidatorSuite) TestValidateCrossNamespaceCall_GlobalToGloba targetNamespaceID := s.testNamespaceID err := s.validator.validateCrossNamespaceCall(s.testNamespaceID, "test-workflow-id", targetNamespaceID, "test-target-workflow-id") - s.NoError(err) + s.Nil(err) } func (s *commandAttrValidatorSuite) TestValidateActivityRetryPolicy() { @@ -741,8 +741,8 @@ func (s *commandAttrValidatorSuite) TestValidateActivityRetryPolicy() { } err := s.validator.validateActivityRetryPolicy(s.testNamespaceID, attr.GetRetryPolicy()) - assert.NoError(s.T(), err, "expected no error") - s.Equal(tt.want, attr.RetryPolicy, "unexpected retry policy") + assert.Nil(s.T(), err, "expected no error") + assert.Equal(s.T(), tt.want, attr.RetryPolicy, "unexpected retry policy") }) } } diff --git a/service/history/api/pollupdate/api_test.go b/service/history/api/pollupdate/api_test.go index e330333dbc0..55c37e01b64 100644 --- a/service/history/api/pollupdate/api_test.go +++ b/service/history/api/pollupdate/api_test.go @@ -190,7 +190,7 @@ func TestPollOutcome(t *testing.T) { } resp, err := pollupdate.Invoke(context.Background(), req, shardContext, wfcc) require.NoError(t, err) - require.Positive(t, len(resp.GetResponse().UpdateRef.GetWorkflowExecution().RunId)) + require.True(t, len(resp.GetResponse().UpdateRef.GetWorkflowExecution().RunId) > 0) require.Nil(t, resp.GetResponse().Outcome) require.Equal(t, enumspb.UPDATE_WORKFLOW_EXECUTION_LIFECYCLE_STAGE_ADMITTED, resp.Response.GetStage()) } diff --git a/service/history/archival_queue_task_executor_test.go b/service/history/archival_queue_task_executor_test.go index 3afc2ab1ffd..416b417bb07 100644 --- a/service/history/archival_queue_task_executor_test.go +++ b/service/history/archival_queue_task_executor_test.go @@ -530,7 +530,7 @@ func TestArchivalQueueTaskExecutor(t *testing.T) { assert.ErrorContains(t, err, s) } } else { - assert.NoError(t, err) + assert.Nil(t, err) } }) } diff --git a/service/history/handler_test.go b/service/history/handler_test.go index 90802ad049f..9b8852d9b0d 100644 --- a/service/history/handler_test.go +++ b/service/history/handler_test.go @@ -2,6 +2,7 @@ package history import ( "context" + "errors" "testing" "github.com/stretchr/testify/assert" @@ -50,7 +51,7 @@ func TestDescribeHistoryHost(t *testing.T) { }) assert.Error(t, err) var sol *serviceerror.ShardOwnershipLost - assert.ErrorAs(t, err, &sol) + assert.True(t, errors.As(err, &sol)) mockShard2 := shard.NewTestContext( ctrl, diff --git a/service/history/history_engine2_test.go b/service/history/history_engine2_test.go index 568725e15cd..bbfdb2e98d6 100644 --- a/service/history/history_engine2_test.go +++ b/service/history/history_engine2_test.go @@ -345,7 +345,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccessStickyEnabled() { expectedResponse.NextPageToken = nil response, err := s.historyEngine.RecordWorkflowTaskStarted(metrics.AddMetricsContext(context.Background()), &request) - s.NoError(err) + s.Nil(err) s.NotNil(response) s.True(response.StartedTime.AsTime().After(expectedResponse.ScheduledTime.AsTime())) expectedResponse.StartedTime = response.StartedTime @@ -455,7 +455,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccessStickyEnabled_WithInt expectedResponse.NextPageToken = nil response, err := s.historyEngine.RecordWorkflowTaskStarted(metrics.AddMetricsContext(context.Background()), &request) - s.NoError(err) + s.Nil(err) s.NotNil(response) s.True(response.StartedTime.AsTime().After(expectedResponse.ScheduledTime.AsTime())) expectedResponse.StartedTime = response.StartedTime @@ -487,7 +487,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfNoExecution() { }, }) s.Nil(response) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -564,7 +564,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfGetExecutionFailed() { }, }) s.Nil(response) - s.Error(err) + s.NotNil(err) s.EqualError(err, "FAILED") } @@ -596,7 +596,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfTaskAlreadyStarted() { }, }) s.Nil(response) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerrors.TaskAlreadyStarted{}, err) s.logger.Error("RecordWorkflowTaskStarted failed with", tag.Error(err)) } @@ -632,7 +632,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedIfTaskAlreadyCompleted() { }, }) s.Nil(response) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) s.logger.Error("RecordWorkflowTaskStarted failed with", tag.Error(err)) } @@ -667,7 +667,7 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedConflictOnUpdate() { }, }) - s.Error(err) + s.NotNil(err) s.Nil(response) s.Equal(&persistence.ConditionFailedError{}, err) } @@ -754,10 +754,10 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccess() { }, }) - s.NoError(err) + s.Nil(err) s.NotNil(response) s.Equal("wType", response.WorkflowType.Name) - s.Equal(response.PreviousStartedEventId, 0) + s.True(response.PreviousStartedEventId == 0) s.Equal(int64(3), response.StartedEventId) expectedQueryMap := map[string]*querypb.WorkflowQuery{ id1: {}, @@ -856,10 +856,10 @@ func (s *engine2Suite) TestRecordWorkflowTaskStartedSuccessWithInternalRawHistor }, }) - s.NoError(err) + s.Nil(err) s.NotNil(response) s.Equal("wType", response.WorkflowType.Name) - s.Equal(response.PreviousStartedEventId, 0) + s.True(response.PreviousStartedEventId == 0) s.Equal(int64(3), response.StartedEventId) expectedQueryMap := map[string]*querypb.WorkflowQuery{ id1: {}, @@ -900,7 +900,7 @@ func (s *engine2Suite) TestRecordActivityTaskStartedIfNoExecution() { s.logger.Error("Unexpected Error", tag.Error(err)) } s.Nil(response) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -953,7 +953,7 @@ func (s *engine2Suite) TestRecordActivityTaskStartedSuccess() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) s.NotNil(response) s.Equal(scheduledEvent, response.ScheduledEvent) s.NotNil(response.Clock, "Clock must be set for shard staleness check") @@ -1054,7 +1054,7 @@ func (s *engine2Suite) TestRequestCancelWorkflowExecution_Running() { Identity: "identity", }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(namespaceID, workflowExecution) s.Equal(int64(4), ms2.GetNextEventID()) @@ -1087,7 +1087,7 @@ func (s *engine2Suite) TestRequestCancelWorkflowExecution_Finished() { Identity: "identity", }, }) - s.NoError(err) + s.Nil(err) } func (s *engine2Suite) TestRequestCancelWorkflowExecution_NotFound() { @@ -1109,7 +1109,7 @@ func (s *engine2Suite) TestRequestCancelWorkflowExecution_NotFound() { Identity: "identity", }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1281,7 +1281,7 @@ func (s *engine2Suite) TestRespondWorkflowTaskCompletedRecordMarkerCommand() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(namespaceID, we) s.Equal(int64(6), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -1360,7 +1360,7 @@ func (s *engine2Suite) TestRespondWorkflowTaskCompleted_StartChildWithSearchAttr Identity: identity, }, }) - s.NoError(err) + s.Nil(err) } func (s *engine2Suite) TestRespondWorkflowTaskCompleted_StartChildWorkflow_ExceedsLimit() { @@ -1480,7 +1480,7 @@ func (s *engine2Suite) TestStartWorkflowExecution_BrandNew() { RequestId: requestID, }, }) - s.NoError(err) + s.Nil(err) s.NotNil(resp.RunId) s.True(resp.Started) s.Nil(resp.EagerWorkflowTask) @@ -1523,7 +1523,7 @@ func (s *engine2Suite) TestStartWorkflowExecution_BrandNew_SearchAttributes() { "Keyword01": sadefs.MustEncodeValue("test", enumspb.INDEXED_VALUE_TYPE_KEYWORD), }}}, }) - s.NoError(err) + s.Nil(err) s.NotNil(resp.RunId) s.True(resp.Started) s.Nil(resp.EagerWorkflowTask) @@ -1994,7 +1994,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_JustSignal() { s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.UpdateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) - s.NoError(err) + s.Nil(err) s.Equal(runID, resp.GetRunId()) } @@ -2039,7 +2039,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_WorkflowNotExist() { s.mockExecutionMgr.EXPECT().CreateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.CreateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) - s.NoError(err) + s.Nil(err) s.NotNil(resp.GetRunId()) } @@ -2106,7 +2106,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_WorkflowNotRunning() s.mockExecutionMgr.EXPECT().CreateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.CreateWorkflowExecutionResponse, nil) resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) - s.NoError(err) + s.Nil(err) s.NotNil(resp.GetRunId()) s.NotEqual(runID, resp.GetRunId()) } @@ -2255,7 +2255,7 @@ func (s *engine2Suite) TestSignalWithStartWorkflowExecution_Start_WorkflowAlread resp, err := s.historyEngine.SignalWithStartWorkflowExecution(metrics.AddMetricsContext(context.Background()), sRequest) s.Nil(resp) - s.Error(err) + s.NotNil(err) } func (s *engine2Suite) TestRecordChildExecutionCompleted() { diff --git a/service/history/history_engine_test.go b/service/history/history_engine_test.go index eb766b318c2..8095f54f681 100644 --- a/service/history/history_engine_test.go +++ b/service/history/history_engine_test.go @@ -271,7 +271,7 @@ func (s *engineSuite) TestGetMutableStateSync() { NamespaceId: tests.NamespaceID.String(), Execution: &execution, }) - s.NoError(err) + s.Nil(err) s.Equal(int64(4), response.GetNextEventId()) s.Equal(tests.RunID, response.GetFirstExecutionRunId()) } @@ -352,7 +352,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) waitGroup.Done() // right now the next event ID is 5 } @@ -363,7 +363,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll() { Execution: &execution, ExpectedNextEventId: 3, }) - s.NoError(err) + s.Nil(err) s.Equal(int64(4), response.NextEventId) // long poll, new event happen before long poll timeout @@ -375,7 +375,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll() { ExpectedNextEventId: 4, }) s.True(time.Now().UTC().After(start.Add(time.Second))) - s.NoError(err) + s.Nil(err) s.Equal(int64(5), pollResponse.GetNextEventId()) waitGroup.Wait() } @@ -430,7 +430,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll_CurrentBranchChanged() { Execution: execution, ExpectedNextEventId: 3, }) - s.NoError(err) + s.Nil(err) s.Equal(int64(4), response0.GetNextEventId()) // long poll, new event happen before long poll timeout @@ -442,7 +442,7 @@ func (s *engineSuite) TestGetMutableStateLongPoll_CurrentBranchChanged() { ExpectedNextEventId: 10, }) s.True(time.Now().UTC().After(start.Add(time.Second))) - s.NoError(err) + s.Nil(err) s.Equal(response0.GetCurrentBranchToken(), response1.GetCurrentBranchToken()) } @@ -474,7 +474,7 @@ func (s *engineSuite) TestGetMutableStateLongPollTimeout() { Execution: &execution, ExpectedNextEventId: 4, }) - s.NoError(err) + s.Nil(err) s.Equal(int64(4), response.GetNextEventId()) } @@ -775,7 +775,7 @@ func (s *engineSuite) TestQueryWorkflow_ConsistentQueryBufferFull() { // verify that after last query error, the previous pending query is still in the buffer pendingBufferedQueries := qr.GetBufferedIDs() - s.Len(pendingBufferedQueries, 1) + s.Equal(1, len(pendingBufferedQueries)) s.Equal(queryId, pendingBufferedQueries[0]) } @@ -950,7 +950,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedInvalidToken() { }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -975,7 +975,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedIfNoExecution() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1041,7 +1041,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedUpdateExecutionFailed() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.EqualError(err, "FAILED") } @@ -1081,7 +1081,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedIfTaskCompleted() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1118,7 +1118,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedIfTaskNotStarted() { TaskToken: taskToken, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -1651,7 +1651,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedSingleActivityScheduledAtt s.Equal(int64(5), updatedWorkflowMutation.NextEventID, iVar) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId, iVar) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State, iVar) - s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID, iVar) + s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID, iVar) } s.TearDownTest() s.SetupTest() @@ -1718,7 +1718,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedBadBinary() { s.Equal(int64(5), updatedWorkflowMutation.NextEventID) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State) - s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID) + s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID) } func (s *engineSuite) TestRespondWorkflowTaskCompletedSingleActivityScheduledWorkflowTask() { @@ -2051,7 +2051,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_ActivityEagerExecution_Ca _, ok := ms2.GetActivityByActivityID("activity1") s.False(ok) - s.Empty(resp.ActivityTasks) + s.Len(resp.ActivityTasks, 0) s.NotNil(resp.StartedResponse) s.Equal(int64(10), resp.StartedResponse.NextEventId) s.Equal(int64(3), resp.StartedResponse.PreviousStartedEventId) @@ -2135,7 +2135,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_ActivityEagerExecution_Wo s.Equal(int64(5), activityInfo.ScheduledEventId) // activity scheduled s.Equal(common.EmptyEventID, activityInfo.StartedEventId) // activity not started - s.Empty(resp.ActivityTasks) + s.Len(resp.ActivityTasks, 0) s.Nil(resp.StartedResponse) } @@ -2224,7 +2224,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_WorkflowTaskHeartbeatNotT Identity: identity, }, }) - s.NoError(err) + s.Nil(err) } func (s *engineSuite) TestRespondWorkflowTaskCompleted_WorkflowTaskHeartbeatNotTimeout_ZeroOrignalScheduledTime() { @@ -2268,7 +2268,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompleted_WorkflowTaskHeartbeatNotT Identity: identity, }, }) - s.NoError(err) + s.Nil(err) } func (s *engineSuite) TestRespondWorkflowTaskCompletedCompleteWorkflowSuccess() { @@ -2490,7 +2490,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedStartChildWorkflowWithAban ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(6), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) - s.Len(ms2.GetPendingChildExecutionInfos(), 1) + s.Equal(1, len(ms2.GetPendingChildExecutionInfos())) var childID int64 for c := range ms2.GetPendingChildExecutionInfos() { childID = c @@ -2557,7 +2557,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedStartChildWorkflowWithTerm ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(6), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) - s.Len(ms2.GetPendingChildExecutionInfos(), 1) + s.Equal(1, len(ms2.GetPendingChildExecutionInfos())) var childID int64 for c := range ms2.GetPendingChildExecutionInfos() { childID = c @@ -2621,7 +2621,7 @@ func (s *engineSuite) TestRespondWorkflowTaskCompletedSignalExternalWorkflowFail }, }) - s.Error(err) + s.NotNil(err) } func (s *engineSuite) TestRespondActivityTaskCompletedInvalidToken() { @@ -2638,7 +2638,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedInvalidToken() { }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -2663,7 +2663,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfNoExecution() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -2687,7 +2687,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfNoRunID() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -2884,7 +2884,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfTaskCompleted() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -2930,7 +2930,7 @@ func (s *engineSuite) TestRespondActivityTaskCompletedIfTaskNotStarted() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3113,7 +3113,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedInvalidToken() { }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.InvalidArgument{}, err) } @@ -3139,7 +3139,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfNoExecution() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3164,7 +3164,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfNoRunID() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3359,7 +3359,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfTaskCompleted() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3403,7 +3403,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfTaskNotStarted() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3496,7 +3496,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedSuccess() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(9), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3560,7 +3560,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedWithHeartbeatSuccess() { LastHeartbeatDetails: details, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(9), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3623,7 +3623,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedByIdSuccess() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(9), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3682,7 +3682,7 @@ func (s *engineSuite) TestRecordActivityTaskHeartBeatSuccess_NoTimer() { Details: detais, }, }) - s.NoError(err) + s.Nil(err) } func (s *engineSuite) TestRecordActivityTaskHeartBeatSuccess_TimerRunning() { @@ -3731,7 +3731,7 @@ func (s *engineSuite) TestRecordActivityTaskHeartBeatSuccess_TimerRunning() { Details: detais, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(7), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3785,7 +3785,7 @@ func (s *engineSuite) TestRecordActivityTaskHeartBeatByIDSuccess() { Details: detais, }, }) - s.NoError(err) + s.Nil(err) } func (s *engineSuite) TestRespondActivityTaskCanceled_Scheduled() { @@ -3829,7 +3829,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceled_Scheduled() { Details: payloads.EncodeString("details"), }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -3862,7 +3862,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceled_Started() { activityScheduledEvent, _ := addActivityTaskScheduledEvent(ms, workflowTaskCompletedEvent.EventId, activityID, activityType, tl, activityInput, 100*time.Second, 10*time.Second, 1*time.Second, 1*time.Second) addActivityTaskStartedEvent(ms, activityScheduledEvent.EventId, identity) _, _, err := ms.AddActivityTaskCancelRequestedEvent(workflowTaskCompletedEvent.EventId, activityScheduledEvent.EventId, identity) - s.NoError(err) + s.Nil(err) wfMs := workflow.TestCloneToProto(context.Background(), ms) gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs} @@ -3878,7 +3878,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceled_Started() { Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3921,7 +3921,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceledById_Started() { activityScheduledEvent, _ := addActivityTaskScheduledEvent(ms, workflowTaskCompletedEvent.EventId, activityID, activityType, tl, activityInput, 100*time.Second, 10*time.Second, 1*time.Second, 1*time.Second) addActivityTaskStartedEvent(ms, activityScheduledEvent.EventId, identity) _, _, err := ms.AddActivityTaskCancelRequestedEvent(workflowTaskCompletedEvent.EventId, activityScheduledEvent.EventId, identity) - s.NoError(err) + s.Nil(err) wfMs := workflow.TestCloneToProto(context.Background(), ms) gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs} @@ -3939,7 +3939,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceledById_Started() { Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) s.Equal(int64(3), ms2.GetExecutionInfo().LastCompletedWorkflowTaskStartedEventId) @@ -3973,7 +3973,7 @@ func (s *engineSuite) TestRespondActivityTaskCanceledIfNoRunID() { Identity: identity, }, }) - s.Error(err) + s.NotNil(err) s.IsType(&serviceerror.NotFound{}, err) } @@ -4113,7 +4113,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NotSchedule s.Equal(int64(5), updatedWorkflowMutation.NextEventID) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State) - s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID) + s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID) } func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Scheduled() { @@ -4167,7 +4167,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Scheduled() Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(12), ms2.GetNextEventID()) @@ -4232,7 +4232,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Started() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4300,7 +4300,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Completed() Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4361,7 +4361,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NoHeartBeat Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4389,7 +4389,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NoHeartBeat Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) s.NotNil(hbResponse) s.True(hbResponse.CancelRequested) @@ -4404,7 +4404,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_NoHeartBeat Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) ms2 = s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(13), ms2.GetNextEventID()) @@ -4465,7 +4465,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Success() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4493,7 +4493,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Success() { Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) s.NotNil(hbResponse) s.True(hbResponse.CancelRequested) @@ -4508,7 +4508,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_Success() { Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) ms2 = s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(13), ms2.GetNextEventID()) @@ -4600,7 +4600,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith QueryResults: queryResults, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(11), ms2.GetNextEventID()) @@ -4610,14 +4610,14 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith s.Len(qr.GetCompletedIDs(), 2) succeeded1, err := qr.GetCompletionState(id1) s.NoError(err) - s.Equal(succeeded1.Result, result1) + s.EqualValues(succeeded1.Result, result1) s.Equal(workflow.QueryCompletionTypeSucceeded, succeeded1.Type) succeeded2, err := qr.GetCompletionState(id2) s.NoError(err) - s.Equal(succeeded2.Result, result2) + s.EqualValues(succeeded2.Result, result2) s.Equal(workflow.QueryCompletionTypeSucceeded, succeeded2.Type) - s.Empty(qr.GetBufferedIDs()) - s.Empty(qr.GetFailedIDs()) + s.Len(qr.GetBufferedIDs(), 0) + s.Len(qr.GetFailedIDs(), 0) s.Len(qr.GetUnblockedIDs(), 1) unblocked1, err := qr.GetCompletionState(id3) s.NoError(err) @@ -4644,7 +4644,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) s.NotNil(hbResponse) s.True(hbResponse.CancelRequested) @@ -4659,7 +4659,7 @@ func (s *engineSuite) TestRequestCancel_RespondWorkflowTaskCompleted_SuccessWith Details: payloads.EncodeString("details"), }, }) - s.NoError(err) + s.Nil(err) ms2 = s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(13), ms2.GetNextEventID()) @@ -4715,7 +4715,7 @@ func (s *engineSuite) TestStarTimer_DuplicateTimerID() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, ms2.GetExecutionState().State) @@ -4820,7 +4820,7 @@ func (s *engineSuite) TestUserTimer_RespondWorkflowTaskCompleted() { Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) @@ -4891,7 +4891,7 @@ func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_NoStartTimer( s.Equal(int64(5), updatedWorkflowMutation.NextEventID) s.Equal(common.EmptyEventID, updatedWorkflowMutation.ExecutionInfo.LastCompletedWorkflowTaskStartedEventId) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, updatedWorkflowMutation.ExecutionState.State) - s.NotEqual(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId, common.EmptyEventID) + s.True(updatedWorkflowMutation.ExecutionInfo.WorkflowTaskScheduledEventId != common.EmptyEventID) } func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_TimerFired() { @@ -4924,11 +4924,11 @@ func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_TimerFired() addWorkflowTaskStartedEvent(ms, wt2.ScheduledEventID, tl, identity) addTimerFiredEvent(ms, timerID) _, _, err := ms.CloseTransactionAsMutation(context.Background(), historyi.TransactionPolicyActive) - s.NoError(err) + s.Nil(err) wfMs := workflow.TestCloneToProto(context.Background(), ms) gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs} - s.Positive(len(gwmsResponse.State.BufferedEvents)) + s.True(len(gwmsResponse.State.BufferedEvents) > 0) commands := []*commandpb.Command{{ CommandType: enumspb.COMMAND_TYPE_CANCEL_TIMER, @@ -4952,7 +4952,7 @@ func (s *engineSuite) TestCancelTimer_RespondWorkflowTaskCompleted_TimerFired() Identity: identity, }, }) - s.NoError(err) + s.Nil(err) ms2 := s.getMutableState(tests.NamespaceID, &we) s.Equal(int64(10), ms2.GetNextEventID()) @@ -5002,7 +5002,7 @@ func (s *engineSuite) TestSignalWorkflowExecution() { s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.UpdateWorkflowExecutionResponse, nil) _, err = s.historyEngine.SignalWorkflowExecution(context.Background(), signalRequest) - s.NoError(err) + s.Nil(err) } // Test signal workflow task by adding request ID @@ -5281,7 +5281,7 @@ func (s *engineSuite) TestSignalWorkflowExecution_WorkflowTaskBackoff() { }) _, err = s.historyEngine.SignalWorkflowExecution(context.Background(), signalRequest) - s.NoError(err) + s.Nil(err) } func (s *engineSuite) TestRemoveSignalMutableState() { @@ -5316,7 +5316,7 @@ func (s *engineSuite) TestRemoveSignalMutableState() { s.mockExecutionMgr.EXPECT().UpdateWorkflowExecution(gomock.Any(), gomock.Any()).Return(tests.UpdateWorkflowExecutionResponse, nil) _, err = s.historyEngine.RemoveSignalMutableState(context.Background(), removeRequest) - s.NoError(err) + s.Nil(err) } func (s *engineSuite) TestReapplyEvents_ReturnSuccess() { @@ -5575,7 +5575,7 @@ func (s *engineSuite) TestEagerWorkflowStart_FromCron_SkipsEager() { }) s.NoError(err) s.Nil(response.(*historyservice.StartWorkflowExecutionResponse).EagerWorkflowTask) - s.Empty(recordedTasks) + s.Equal(len(recordedTasks), 0) } func (s *engineSuite) TestEagerWorkflowStart_WithSearchAttributes() { diff --git a/service/history/historybuilder/history_builder_test.go b/service/history/historybuilder/history_builder_test.go index 065ac2f0ebe..8248c176519 100644 --- a/service/history/historybuilder/history_builder_test.go +++ b/service/history/historybuilder/history_builder_test.go @@ -2320,8 +2320,9 @@ func (s *historyBuilderSuite) TestBufferEvent() { } commandsWithEventsCount++ } - s.Len( - commandEvents, commandsWithEventsCount, + s.Equal( + commandsWithEventsCount, + len(commandEvents), "This assertion is broken when a new command is added and no corresponding logic for corresponding command event is added to HistoryBuilder.bufferEvent", ) } @@ -2369,8 +2370,8 @@ func (s *historyBuilderSuite) TestReorder() { } func (s *historyBuilderSuite) TestBufferSize_Memory() { - s.Zero(s.historyBuilder.NumBufferedEvents()) - s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) + s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) s.historyBuilder.AddWorkflowExecutionSignaledEvent( "signal-name", &commonpb.Payloads{}, @@ -2380,30 +2381,30 @@ func (s *historyBuilderSuite) TestBufferSize_Memory() { "", nil, ) - s.Equal(1, s.historyBuilder.NumBufferedEvents()) + s.Assert().Equal(1, s.historyBuilder.NumBufferedEvents()) // the size of the proto is non-deterministic, so just assert that it's non-zero, and it isn't really high - s.Assert().Positive(s.historyBuilder.SizeInBytesOfBufferedEvents()) - s.Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) + s.Assert().Greater(s.historyBuilder.SizeInBytesOfBufferedEvents(), 0) + s.Assert().Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) s.flush() - s.Zero(s.historyBuilder.NumBufferedEvents()) - s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) + s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) } func (s *historyBuilderSuite) TestBufferSize_DB() { - s.Zero(s.historyBuilder.NumBufferedEvents()) - s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) + s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) s.historyBuilder.dbBufferBatch = []*historypb.HistoryEvent{{ EventType: enumspb.EVENT_TYPE_TIMER_FIRED, EventId: common.BufferedEventID, TaskId: common.EmptyEventTaskID, }} - s.Equal(1, s.historyBuilder.NumBufferedEvents()) + s.Assert().Equal(1, s.historyBuilder.NumBufferedEvents()) // the size of the proto is non-deterministic, so just assert that it's non-zero, and it isn't really high - s.Assert().Positive(s.historyBuilder.SizeInBytesOfBufferedEvents()) - s.Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) + s.Assert().Greater(s.historyBuilder.SizeInBytesOfBufferedEvents(), 0) + s.Assert().Less(s.historyBuilder.SizeInBytesOfBufferedEvents(), 100) s.flush() - s.Zero(s.historyBuilder.NumBufferedEvents()) - s.Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) + s.Assert().Zero(s.historyBuilder.NumBufferedEvents()) + s.Assert().Zero(s.historyBuilder.SizeInBytesOfBufferedEvents()) } func (s *historyBuilderSuite) TestLastEventVersion() { @@ -2659,13 +2660,13 @@ func (s *historyBuilderSuite) flush() *historypb.HistoryEvent { s.Equal(make(map[int64]int64), historyMutation.ScheduledIDToStartedID) if !hasBufferEvents { - s.Len(historyMutation.DBEventsBatches, 1) - s.Len(historyMutation.DBEventsBatches[0], 1) + s.Equal(1, len(historyMutation.DBEventsBatches)) + s.Equal(1, len(historyMutation.DBEventsBatches[0])) return historyMutation.DBEventsBatches[0][0] } if len(historyMutation.MemBufferBatch) > 0 { - s.Len(historyMutation.MemBufferBatch, 1) + s.Equal(1, len(historyMutation.MemBufferBatch)) return historyMutation.MemBufferBatch[0] } diff --git a/service/history/queues/queue_base_test.go b/service/history/queues/queue_base_test.go index fed4784cecf..56da45d2b0e 100644 --- a/service/history/queues/queue_base_test.go +++ b/service/history/queues/queue_base_test.go @@ -111,7 +111,7 @@ func (s *queueBaseSuite) TestNewProcessBase_NoPreviousState() { base := s.newQueueBase(mockShard, tasks.CategoryTransfer, nil) - s.Empty(base.readerGroup.Readers()) + s.Len(base.readerGroup.Readers(), 0) s.Equal(int64(1), base.nonReadableScope.Range.InclusiveMin.TaskID) } @@ -266,9 +266,9 @@ func (s *queueBaseSuite) TestProcessNewRange() { s.True(ok) scopes := defaultReader.Scopes() s.Len(scopes, 1) - s.Equal(scopes[0].Range.InclusiveMin.CompareTo(tasks.MinimumKey), 0) + s.True(scopes[0].Range.InclusiveMin.CompareTo(tasks.MinimumKey) == 0) s.True(scopes[0].Predicate.Equals(predicates.Universal[tasks.Task]())) - s.LessOrEqual(time.Since(scopes[0].Range.ExclusiveMax.FireTime), time.Second) + s.True(time.Since(scopes[0].Range.ExclusiveMax.FireTime) <= time.Second) s.True(base.nonReadableScope.Range.Equals(NewRange(scopes[0].Range.ExclusiveMax, tasks.MaximumKey))) } @@ -306,7 +306,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_PerformRangeCompletion( base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) // set to a smaller value so that delete will be triggered currentLowWatermark := tasks.MinimumKey @@ -321,8 +321,8 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_PerformRangeCompletion( s.True(request.InclusiveMinTaskKey.FireTime.Equal(currentLowWatermark.FireTime)) s.True(request.ExclusiveMaxTaskKey.FireTime.Equal(scopeMinKey.FireTime)) } else { - s.Equal(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark), 0) - s.Equal(request.ExclusiveMaxTaskKey.CompareTo(scopeMinKey), 0) + s.True(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark) == 0) + s.True(request.ExclusiveMaxTaskKey.CompareTo(scopeMinKey) == 0) } return nil @@ -338,7 +338,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_PerformRangeCompletion( base.checkpoint() - s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) } func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_SkipRangeCompletion() { @@ -375,7 +375,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_SkipRangeCompletion() { base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) // set to a smaller value so that delete will be triggered currentLowWatermark := tasks.MinimumKey @@ -390,7 +390,7 @@ func (s *queueBaseSuite) TestCheckPoint_WithPendingTasks_SkipRangeCompletion() { base.checkpoint() - s.Equal(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(scopeMinKey.CompareTo(base.exclusiveDeletionHighWatermark) == 0) } func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { @@ -418,7 +418,7 @@ func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.Equal(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark) == 0) // set to a smaller value so that delete will be triggered currentLowWatermark := tasks.MinimumKey @@ -429,13 +429,13 @@ func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { func(ctx context.Context, request *persistence.RangeCompleteHistoryTasksRequest) error { s.Equal(mockShard.GetShardID(), request.ShardID) s.Equal(base.category, request.TaskCategory) - s.Equal(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark), 0) + s.True(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark) == 0) if base.category.Type() == tasks.CategoryTypeScheduled { s.True(request.InclusiveMinTaskKey.FireTime.Equal(currentLowWatermark.FireTime)) s.True(request.ExclusiveMaxTaskKey.FireTime.Equal(exclusiveReaderHighWatermark.FireTime)) } else { - s.Equal(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark), 0) - s.Equal(request.ExclusiveMaxTaskKey.CompareTo(exclusiveReaderHighWatermark), 0) + s.True(request.InclusiveMinTaskKey.CompareTo(currentLowWatermark) == 0) + s.True(request.ExclusiveMaxTaskKey.CompareTo(exclusiveReaderHighWatermark) == 0) } return nil @@ -451,7 +451,7 @@ func (s *queueBaseSuite) TestCheckPoint_NoPendingTasks() { base.checkpoint() - s.Equal(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(exclusiveReaderHighWatermark.CompareTo(base.exclusiveDeletionHighWatermark) == 0) } func (s *queueBaseSuite) TestCheckPoint_SlicePredicateAction() { @@ -492,7 +492,7 @@ func (s *queueBaseSuite) TestCheckPoint_SlicePredicateAction() { base := s.newQueueBase(mockShard, tasks.CategoryTimer, nil) base.checkpointTimer = time.NewTimer(s.options.CheckpointInterval()) - s.Equal(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark) == 0) // set to a smaller value so that delete will be triggered base.exclusiveDeletionHighWatermark = tasks.MinimumKey @@ -512,7 +512,7 @@ func (s *queueBaseSuite) TestCheckPoint_SlicePredicateAction() { base.checkpoint() - s.Equal(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark), 0) + s.True(scopes[0].Range.InclusiveMin.CompareTo(base.exclusiveDeletionHighWatermark) == 0) } func (s *queueBaseSuite) TestCheckPoint_MoveTaskGroupAction() { diff --git a/service/history/queues/slice_test.go b/service/history/queues/slice_test.go index 5df414b4842..3277fff5237 100644 --- a/service/history/queues/slice_test.go +++ b/service/history/queues/slice_test.go @@ -417,7 +417,7 @@ func (s *sliceSuite) TestShrinkScope_ShrinkPredicate() { }) pendingNamespaceID := []string{uuid.NewString(), uuid.NewString()} - s.LessOrEqual(len(pendingNamespaceID), shrinkPredicateMaxPendingKeys) + s.True(len(pendingNamespaceID) <= shrinkPredicateMaxPendingKeys) for _, executable := range executables { mockExecutable := executable.(*MockExecutable) @@ -441,7 +441,7 @@ func (s *sliceSuite) TestShrinkScope_ShrinkPredicate() { namespacePredicate, ok := slice.Scope().Predicate.(*tasks.NamespacePredicate) s.True(ok) for namespaceID := range namespacePredicate.NamespaceIDs { - s.NotEqual(slices.Index(pendingNamespaceID, namespaceID), -1) + s.True(slices.Index(pendingNamespaceID, namespaceID) != -1) } } @@ -705,7 +705,7 @@ func (s *sliceSuite) validateSliceState( currentRange := iterator.Range() previousRange := slice.iterators[idx-1].Range() s.False(currentRange.CanMerge(previousRange)) - s.Negative(previousRange.ExclusiveMax.CompareTo(currentRange.InclusiveMin)) + s.True(previousRange.ExclusiveMax.CompareTo(currentRange.InclusiveMin) < 0) } } diff --git a/service/history/replication/executable_history_task_test.go b/service/history/replication/executable_history_task_test.go index b9c5aa102a0..398962a1413 100644 --- a/service/history/replication/executable_history_task_test.go +++ b/service/history/replication/executable_history_task_test.go @@ -319,11 +319,11 @@ func (s *executableHistoryTaskSuite) TestHandleErr_Other() { s.Equal(err, s.task.HandleErr(err)) err = serviceerror.NewNotFound("") - s.NoError(s.task.HandleErr(err)) + s.Equal(nil, s.task.HandleErr(err)) err = consts.ErrDuplicate s.executableTask.EXPECT().MarkTaskDuplicated().Times(1) - s.NoError(s.task.HandleErr(err)) + s.Equal(nil, s.task.HandleErr(err)) err = serviceerror.NewUnavailable("") s.Equal(err, s.task.HandleErr(err)) @@ -473,7 +473,7 @@ func (s *executableHistoryTaskSuite) TestNewExecutableHistoryTask() { if s.processToolBox.Config.ReplicationMultipleBatches() { s.Equal(s.eventsBlobs, s.task.eventsBlobs) } else { - s.Equal(1, len(s.task.eventsBlobs)) + s.Equal(len(s.task.eventsBlobs), 1) s.Equal(s.eventsBlob, s.task.eventsBlobs[0]) } } @@ -840,7 +840,7 @@ func (s *executableHistoryTaskSuite) generateTwoBatchableTasks() (*ExecutableHis s.Equal(incomingVersionHistoryItems, resultHistoryTask.versionHistoryItems) expectedBatchedEvents := append(currentEvent, incomingEvent...) - s.Equal(len(expectedBatchedEvents), len(resultHistoryTask.eventsDesResponse.events)) + s.Equal(len(resultHistoryTask.eventsDesResponse.events), len(expectedBatchedEvents)) for i := range expectedBatchedEvents { protorequire.ProtoSliceEqual(s.T(), expectedBatchedEvents[i], resultHistoryTask.eventsDesResponse.events[i]) } diff --git a/service/history/replication/stream_sender_flow_controller_test.go b/service/history/replication/stream_sender_flow_controller_test.go index dd18e1d6a9d..ff42b345860 100644 --- a/service/history/replication/stream_sender_flow_controller_test.go +++ b/service/history/replication/stream_sender_flow_controller_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" enumsspb "go.temporal.io/server/api/enums/v1" replicationspb "go.temporal.io/server/api/replication/v1" @@ -143,7 +144,7 @@ func (s *senderFlowControllerSuite) TestPauseToResume() { }) // Ensure the goroutine has time to start and block - s.Eventually(func() bool { + assert.Eventually(s.T(), func() bool { state.mu.Lock() defer state.mu.Unlock() return state.waiters == 1 diff --git a/service/history/timer_queue_active_task_executor_test.go b/service/history/timer_queue_active_task_executor_test.go index 0f34a332e95..9fe23ca39d6 100644 --- a/service/history/timer_queue_active_task_executor_test.go +++ b/service/history/timer_queue_active_task_executor_test.go @@ -1137,7 +1137,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowTaskTimeout_Fire() { workflowTask := s.getMutableStateFromCache(workflowKey).GetPendingWorkflowTask() s.NotNil(workflowTask) - s.NotEqual(workflowTask.ScheduledEventID, common.EmptyEventID) + s.True(workflowTask.ScheduledEventID != common.EmptyEventID) s.Equal(common.EmptyEventID, workflowTask.StartedEventID) s.Equal(int32(2), workflowTask.Attempt) } @@ -1289,7 +1289,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowBackoffTimer_Fire() { workflowTask := s.getMutableStateFromCache(workflowKey).GetPendingWorkflowTask() s.NotNil(workflowTask) - s.NotEqual(workflowTask.ScheduledEventID, common.EmptyEventID) + s.True(workflowTask.ScheduledEventID != common.EmptyEventID) s.Equal(common.EmptyEventID, workflowTask.StartedEventID) s.Equal(int32(1), workflowTask.Attempt) } @@ -1640,7 +1640,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_Retry() { state, status := s.getMutableStateFromCache(workflowKey).GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) } func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_Cron() { @@ -1701,7 +1701,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_Cron() { state, status := s.getMutableStateFromCache(workflowKey).GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) } func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_WorkflowExpired() { @@ -1756,7 +1756,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowRunTimeout_WorkflowExpir state, status := s.getMutableStateFromCache(workflowKey).GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) } func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowExecutionTimeout_Fire() { @@ -1833,7 +1833,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowExecutionTimeout_Fire() s.False(mutableState.IsWorkflowExecutionRunning()) state, status := mutableState.GetWorkflowStateStatus() s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, state) - s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) + s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT, status) s.clearMutableStateFromCache(workflowKey) } @@ -2034,7 +2034,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestExecuteChasmSideEffectTimerTask_ // Execution should succeed. resp := timerQueueActiveTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) s.NotNil(resp) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *timerQueueActiveTaskExecutorSuite) TestExecuteChasmPureTimerTask_ExecutesAllPureTimers() { @@ -2107,7 +2107,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestExecuteChasmPureTimerTask_Execut // Execution should succeed. resp := timerQueueActiveTaskExecutor.Execute(context.Background(), s.newTaskExecutable(timerTask)) s.NotNil(resp) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } // TestExecuteChasmPureTimerTask_ClosesTransactionWhenInvalid verifies that the @@ -2309,7 +2309,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestExecuteStateMachineTimerTask_Exe err = timerQueueActiveTaskExecutor.executeStateMachineTimerTask(context.Background(), task) s.NoError(err) s.Equal(2, numInvocations) // two valid tasks within the deadline. - s.Len(info.StateMachineTimers, 1) + s.Equal(1, len(info.StateMachineTimers)) s.Equal(futureDeadline, info.StateMachineTimers[0].Deadline.AsTime()) } diff --git a/service/history/workflow/mutable_state_impl_test.go b/service/history/workflow/mutable_state_impl_test.go index 8ae8df20184..6f5b9be7b79 100644 --- a/service/history/workflow/mutable_state_impl_test.go +++ b/service/history/workflow/mutable_state_impl_test.go @@ -437,8 +437,8 @@ func (s *mutableStateSuite) TestRedirectInfoValidation_Sticky() { 0, ) s.NoError(err) - s.Empty(wft.BuildId) - s.Empty(e.GetWorkflowTaskStartedEventAttributes().GetWorkerVersion().GetBuildId()) + s.Equal("", wft.BuildId) + s.Equal("", e.GetWorkflowTaskStartedEventAttributes().GetWorkerVersion().GetBuildId()) s.Equal("b1", s.mutableState.GetAssignedBuildId()) s.Equal(int64(0), wft.BuildIdRedirectCounter) s.Equal(int64(0), s.mutableState.GetExecutionInfo().GetBuildIdRedirectCounter()) @@ -571,7 +571,7 @@ func (s *mutableStateSuite) TestPopulateDeleteTasks_WithWorkflowTaskTimeouts() { // Verify that BestEffortDeleteTasks contains the timeout task keys del := s.mutableState.BestEffortDeleteTasks s.Contains(del, tasks.CategoryTimer) - s.Len(del[tasks.CategoryTimer], 2, "Should have both ScheduleToStart and StartToClose timeout tasks") + s.Equal(2, len(del[tasks.CategoryTimer]), "Should have both ScheduleToStart and StartToClose timeout tasks") s.Contains(del[tasks.CategoryTimer], mockScheduleToStartTask.GetKey()) s.Contains(del[tasks.CategoryTimer], mockStartToCloseTask.GetKey()) } @@ -645,7 +645,7 @@ func (s *mutableStateSuite) TestPopulateDeleteTasks_LongTimeout_NotIncluded() { // Verify that BestEffortDeleteTasks does NOT contain the long timeout task del := s.mutableState.BestEffortDeleteTasks if timerTasks, exists := del[tasks.CategoryTimer]; exists { - s.Empty(timerTasks, "Tasks with timeout > 120s should not be added to BestEffortDeleteTasks") + s.Equal(0, len(timerTasks), "Tasks with timeout > 120s should not be added to BestEffortDeleteTasks") } } @@ -1389,14 +1389,14 @@ func (s *mutableStateSuite) TestChecksum() { s.mutableState, err = NewMutableStateFromDB(s.mockShard, s.mockEventsCache, s.logger, tests.LocalNamespaceEntry, dbState, 123) s.NoError(err) s.Equal(loadErrors, loadErrorsFunc()) // no errors expected - s.Equal(dbState.Checksum, s.mutableState.checksum) + s.EqualValues(dbState.Checksum, s.mutableState.checksum) s.mutableState.namespaceEntry = s.newNamespaceCacheEntry() csum, err := tc.closeTxFunc(s.mutableState) - s.NoError(err) + s.Nil(err) s.NotNil(csum.Value) s.Equal(enumsspb.CHECKSUM_FLAVOR_IEEE_CRC32_OVER_PROTO3_BINARY, csum.Flavor) s.Equal(mutableStateChecksumPayloadV1, csum.Version) - s.Equal(csum, s.mutableState.checksum) + s.EqualValues(csum, s.mutableState.checksum) // verify checksum is verified on Load dbState.Checksum = csum @@ -1406,7 +1406,7 @@ func (s *mutableStateSuite) TestChecksum() { // generate checksum again and verify its the same csum, err = tc.closeTxFunc(s.mutableState) - s.NoError(err) + s.Nil(err) s.NotNil(csum.Value) s.Equal(dbState.Checksum.Value, csum.Value) @@ -1415,7 +1415,7 @@ func (s *mutableStateSuite) TestChecksum() { s.mutableState, err = NewMutableStateFromDB(s.mockShard, s.mockEventsCache, s.logger, tests.LocalNamespaceEntry, dbState, 123) s.NoError(err) s.Equal(loadErrors+1, loadErrorsFunc()) - s.Equal(dbState.Checksum, s.mutableState.checksum) + s.EqualValues(dbState.Checksum, s.mutableState.checksum) // test checksum is invalidated loadErrors = loadErrorsFunc() @@ -1904,20 +1904,20 @@ func (s *mutableStateSuite) TestContinueAsNewMinBackoff() { // with no backoff, verify min backoff is in [3s, 5s] minBackoff := s.mutableState.ContinueAsNewMinBackoff(nil).AsDuration() s.NotZero(minBackoff) - s.GreaterOrEqual(minBackoff, 3*time.Second) - s.LessOrEqual(minBackoff, 5*time.Second) + s.True(minBackoff >= 3*time.Second) + s.True(minBackoff <= 5*time.Second) // with 2s backoff, verify min backoff is in [3s, 5s] minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(time.Second * 2)).AsDuration() s.NotZero(minBackoff) - s.GreaterOrEqual(minBackoff, 3*time.Second) - s.LessOrEqual(minBackoff, 5*time.Second) + s.True(minBackoff >= 3*time.Second) + s.True(minBackoff <= 5*time.Second) // with 6s backoff, verify min backoff unchanged backoff := time.Second * 6 minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(backoff)).AsDuration() s.NotZero(minBackoff) - s.Equal(minBackoff, backoff) + s.True(minBackoff == backoff) // set start time to be 3s ago startTime := timestamppb.New(time.Now().Add(-time.Second * 3)) @@ -1927,13 +1927,13 @@ func (s *mutableStateSuite) TestContinueAsNewMinBackoff() { // with no backoff, verify min backoff is in [0, 2s] minBackoff = s.mutableState.ContinueAsNewMinBackoff(nil).AsDuration() s.NotNil(minBackoff) - s.GreaterOrEqual(minBackoff, 0) - s.LessOrEqual(minBackoff, 2*time.Second, "%v\n", minBackoff) + s.True(minBackoff >= 0) + s.True(minBackoff <= 2*time.Second, "%v\n", minBackoff) // with 2s backoff, verify min backoff not changed backoff = time.Second * 2 minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(backoff)).AsDuration() - s.Equal(minBackoff, backoff) + s.True(minBackoff == backoff) // set start time to be 5s ago startTime = timestamppb.New(time.Now().Add(-time.Second * 5)) @@ -1947,7 +1947,7 @@ func (s *mutableStateSuite) TestContinueAsNewMinBackoff() { // with 2s backoff, verify backoff unchanged backoff = time.Second * 2 minBackoff = s.mutableState.ContinueAsNewMinBackoff(durationpb.New(backoff)).AsDuration() - s.Equal(minBackoff, backoff) + s.True(minBackoff == backoff) } func (s *mutableStateSuite) TestEventReapplied() { @@ -2049,8 +2049,8 @@ func (s *mutableStateSuite) TestTransientWorkflowTaskStart_CurrentVersionChanged mutation, err := s.mutableState.hBuilder.Finish(true) s.NoError(err) - s.Len(mutation.DBEventsBatches, 1) - s.Len(mutation.DBEventsBatches[0], 2) + s.Equal(1, len(mutation.DBEventsBatches)) + s.Equal(2, len(mutation.DBEventsBatches[0])) attrs := mutation.DBEventsBatches[0][0].GetWorkflowTaskScheduledEventAttributes() s.NotNil(attrs) s.Equal("tq", attrs.TaskQueue.Name) @@ -2229,7 +2229,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl uuid.NewString(), workflowStartEvent, ) - s.NoError(err) + s.Nil(err) // setup transient workflow task wt, err := s.mutableState.ApplyWorkflowTaskScheduledEvent( @@ -2242,7 +2242,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl nil, enumsspb.WORKFLOW_TASK_TYPE_NORMAL, ) - s.NoError(err) + s.Nil(err) s.NotNil(wt) wt, err = s.mutableState.ApplyWorkflowTaskStartedEvent( @@ -2258,11 +2258,11 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl int64(0), nil, ) - s.NoError(err) + s.Nil(err) s.NotNil(wt) err = s.mutableState.ApplyWorkflowTaskFailedEvent() - s.NoError(err) + s.Nil(err) workflowTaskAttempt = int32(123) newWorkflowTaskScheduleEvent := &historypb.HistoryEvent{ @@ -2300,7 +2300,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl nil, enumsspb.WORKFLOW_TASK_TYPE_NORMAL, ) - s.NoError(err) + s.Nil(err) s.NotNil(wt) wt, err = s.mutableState.ApplyWorkflowTaskStartedEvent( @@ -2316,7 +2316,7 @@ func (s *mutableStateSuite) prepareTransientWorkflowTaskCompletionFirstBatchAppl int64(0), nil, ) - s.NoError(err) + s.Nil(err) s.NotNil(wt) s.mutableState.SetHistoryBuilder(historybuilder.NewImmutable([]*historypb.HistoryEvent{ @@ -2576,8 +2576,8 @@ func (s *mutableStateSuite) TestUpdateInfos() { numAccepted++ } }) - s.Equal(1, numCompleted, "expected 1 completed") - s.Equal(1, numAccepted, "expected 1 accepted") + s.Equal(numCompleted, 1, "expected 1 completed") + s.Equal(numAccepted, 1, "expected 1 accepted") s.mockShard.Resource.ClusterMetadata.EXPECT().ClusterNameForFailoverVersion( namespaceEntry.IsGlobalNamespace(), @@ -2632,12 +2632,12 @@ func (s *mutableStateSuite) TestApplyActivityTaskStartedEvent() { }, }) s.NoError(err) - s.Equal(version, ai.Version) - s.Equal(eventID, ai.StartedEventId) + s.Assert().Equal(version, ai.Version) + s.Assert().Equal(eventID, ai.StartedEventId) s.NotNil(ai.StartedTime) - s.Equal(now, ai.StartedTime.AsTime()) - s.Equal(requestID, ai.RequestId) - s.Nil(ai.LastHeartbeatDetails) + s.Assert().Equal(now, ai.StartedTime.AsTime()) + s.Assert().Equal(requestID, ai.RequestId) + s.Assert().Nil(ai.LastHeartbeatDetails) } func (s *mutableStateSuite) TestAddContinueAsNewEvent_Default() { @@ -2841,7 +2841,7 @@ func (s *mutableStateSuite) TestSpeculativeWorkflowTaskNotPersisted() { // Normal WT is persisted as is. execInfo, err := tc.closeTxFunc(s.mutableState) - s.NoError(err) + s.Nil(err) s.Equal(enumsspb.WORKFLOW_TASK_TYPE_NORMAL, execInfo.WorkflowTaskType) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskScheduledEventId) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskStartedEventId) @@ -2850,7 +2850,7 @@ func (s *mutableStateSuite) TestSpeculativeWorkflowTaskNotPersisted() { // Speculative WT is converted to normal. execInfo, err = tc.closeTxFunc(s.mutableState) - s.NoError(err) + s.Nil(err) s.Equal(enumsspb.WORKFLOW_TASK_TYPE_NORMAL, execInfo.WorkflowTaskType) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskScheduledEventId) s.NotEqual(common.EmptyEventID, execInfo.WorkflowTaskStartedEventId) @@ -2873,7 +2873,7 @@ func (s *mutableStateSuite) TestRetryWorkflowTask_WithNextRetryDelay() { duration, retryState := s.mutableState.GetRetryBackoffDuration(applicationFailure) s.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState) - s.Equal(expectedDelayDuration, duration) + s.Equal(duration, expectedDelayDuration) } func (s *mutableStateSuite) TestRetryActivity_TruncateRetryableFailure() { s.mockEventsCache.EXPECT().PutEvent(gomock.Any(), gomock.Any()).AnyTimes() @@ -3441,7 +3441,7 @@ func (s *mutableStateSuite) TestCloseTransactionUpdateTransition() { } execInfo, err := tc.txFunc(s.mutableState) - s.NoError(err) + s.Nil(err) protorequire.ProtoSliceEqual(t, expectedTransitionHistory, execInfo.TransitionHistory) }) @@ -3936,7 +3936,7 @@ func (s *mutableStateSuite) TestCloseTransactionHandleUnknownVersionedTransition execInfo, err := tc.txFunc(s.mutableState) s.NotNil(execInfo.PreviousTransitionHistory) s.Nil(execInfo.TransitionHistory) - s.NoError(err) + s.Nil(err) }) } } @@ -4121,7 +4121,7 @@ func (s *mutableStateSuite) TestCollapseVisibilityTasks() { ms.AddTasks(tc.tasks...) ms.closeTransactionCollapseVisibilityTasks() visTasks := ms.InsertTasks[tasks.CategoryVisibility] - s.Len(visTasks, len(tc.res)) + s.Equal(len(tc.res), len(visTasks)) for i, expectTaskType := range tc.res { s.Equal(expectTaskType, visTasks[i].GetType()) } @@ -4391,7 +4391,7 @@ func (s *mutableStateSuite) TestCloseTransactionPrepareReplicationTasks_HistoryT s.Fail("closeTransactionPrepareReplicationTasks failed", err) } repicationTasks := ms.InsertTasks[tasks.CategoryReplication] - s.Len(repicationTasks, len(tc.tasks)) + s.Equal(len(tc.tasks), len(repicationTasks)) for i, task := range tc.tasks { s.Equal(task, repicationTasks[i]) } @@ -4457,7 +4457,7 @@ func (s *mutableStateSuite) TestCloseTransactionPrepareReplicationTasks_SyncVers err := ms.closeTransactionPrepareReplicationTasks(historyi.TransactionPolicyActive, eventBatches, false) s.NoError(err) replicationTasks := ms.InsertTasks[tasks.CategoryReplication] - s.Len(replicationTasks, 1) + s.Equal(1, len(replicationTasks)) historyTasks := []tasks.Task{ &tasks.HistoryReplicationTask{ WorkflowKey: s.mutableState.GetWorkflowKey(), @@ -4487,7 +4487,7 @@ func (s *mutableStateSuite) TestCloseTransactionPrepareReplicationTasks_SyncVers s.Equal(expectedTask.WorkflowKey, actualTask.WorkflowKey) s.Equal(expectedTask.VersionedTransition, actualTask.VersionedTransition) s.Equal(expectedTask.ArchetypeID, actualTask.ArchetypeID) - s.Len(actualTask.TaskEquivalents, 3) + s.Equal(3, len(actualTask.TaskEquivalents)) s.Equal(historyTasks[0], actualTask.TaskEquivalents[0]) s.Equal(historyTasks[1], actualTask.TaskEquivalents[1]) s.Equal(enumsspb.TASK_TYPE_REPLICATION_SYNC_ACTIVITY, actualTask.TaskEquivalents[2].GetType()) @@ -4992,7 +4992,7 @@ func (s *mutableStateSuite) TestCloseTransactionTrackTombstones_CapIfLargerThanL s.NoError(err) tombstoneBatches := mutableState.GetExecutionInfo().SubStateMachineTombstoneBatches - s.Empty(tombstoneBatches) + s.Len(tombstoneBatches, 0) } func (s *mutableStateSuite) TestCloseTransactionTrackTombstones_OnlyTrackFirstEmpty() { @@ -5162,7 +5162,7 @@ func (s *mutableStateSuite) TestExecutionInfoClone() { &info.NamespaceId, } }) - s.NoError(err) + s.Nil(err) } func (s *mutableStateSuite) addChangesForStateReplication(state *persistencespb.WorkflowMutableState) { @@ -5190,14 +5190,14 @@ func (s *mutableStateSuite) addChangesForStateReplication(state *persistencespb. } func compareMapOfProto[K comparable, V proto.Message](s *mutableStateSuite, expected, actual map[K]V) { - s.Len(actual, len(expected)) + s.Equal(len(expected), len(actual)) for k, v := range expected { s.True(proto.Equal(v, actual[k])) } } func (s *mutableStateSuite) verifyChildExecutionInfos(expectedMap, actualMap, originMap map[int64]*persistencespb.ChildExecutionInfo) { - s.Len(actualMap, len(expectedMap)) + s.Equal(len(expectedMap), len(actualMap)) for k, expected := range expectedMap { actual, ok := actualMap[k] s.True(ok) @@ -5224,7 +5224,7 @@ func (s *mutableStateSuite) verifyChildExecutionInfos(expectedMap, actualMap, or } func (s *mutableStateSuite) verifyActivityInfos(expectedMap, actualMap map[int64]*persistencespb.ActivityInfo) { - s.Len(actualMap, len(expectedMap)) + s.Equal(len(expectedMap), len(actualMap)) for k, expected := range expectedMap { actual, ok := actualMap[k] s.True(ok) diff --git a/service/history/workflow/query_test.go b/service/history/workflow/query_test.go index 60b81dac02e..6715d8469e2 100644 --- a/service/history/workflow/query_test.go +++ b/service/history/workflow/query_test.go @@ -196,7 +196,7 @@ func (s *QuerySuite) assertCompletionStateEqual(expected *historyi.QueryCompleti s.Equal(expected.Err.Error(), actual.Err.Error()) } if expected.Result != nil { - s.EqualValues(expected.Result, actual.Result) + s.EqualValues(actual.Result, expected.Result) } } diff --git a/service/matching/fair_level_test.go b/service/matching/fair_level_test.go index d9240841320..b99f6021863 100644 --- a/service/matching/fair_level_test.go +++ b/service/matching/fair_level_test.go @@ -20,7 +20,7 @@ func TestFairLevelComparator(t *testing.T) { m.Put(b, nil) m.Put(c, nil) m.Put(d, nil) - assert.Equal(t, []any{d, b, a, c}, m.Keys()) + assert.Equal(t, m.Keys(), []any{d, b, a, c}) } func TestFairLevelMax(t *testing.T) { diff --git a/service/matching/matcher_data_test.go b/service/matching/matcher_data_test.go index 9aeeeff4989..41a2521d83e 100644 --- a/service/matching/matcher_data_test.go +++ b/service/matching/matcher_data_test.go @@ -154,7 +154,7 @@ func (s *MatcherDataSuite) TestMatchBacklogTask() { ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond) defer cancel() pres := s.md.EnqueuePollerAndWait([]context.Context{ctx}, poller) - s.ErrorIs(context.DeadlineExceeded, pres.ctxErr) + s.Error(context.DeadlineExceeded, pres.ctxErr) s.Equal(0, pres.ctxErrIdx) // add a task @@ -181,7 +181,7 @@ func (s *MatcherDataSuite) TestMatchBacklogTask() { ctx, cancel = context.WithTimeout(context.Background(), time.Millisecond) defer cancel() pres = s.md.EnqueuePollerAndWait([]context.Context{context.Background(), ctx}, poller) - s.ErrorIs(context.DeadlineExceeded, pres.ctxErr) + s.Error(context.DeadlineExceeded, pres.ctxErr) s.Equal(1, pres.ctxErrIdx, "deadline context was index 1") } @@ -264,7 +264,7 @@ func (s *MatcherDataSuite) TestQueryForwardNil() { resp := <-respC s.True(resp.forwarded) s.NoError(resp.forwardErr) - s.NotEqual(resp.forwardRes, nil) // typed nil + s.True(resp.forwardRes != nil) // typed nil s.Nil(resp.forwardRes.(*matchingservice.QueryWorkflowResponse)) } @@ -525,9 +525,9 @@ func (s *MatcherDataSuite) TestReprocessTasks() { return t.event.TaskId%4 == 0 }) - s.Len(removed, 25) + s.Equal(25, len(removed)) for _, t := range removed { - s.Equal(t.event.TaskId%4, 0) + s.True(t.event.TaskId%4 == 0) s.NotNil(t.matchResult) s.Equal(errReprocessTask, t.matchResult.ctxErr) } @@ -537,7 +537,7 @@ func (s *MatcherDataSuite) TestReprocessTasks() { for range 75 { t := s.pollRealTime(time.Microsecond).task s.NotNil(t) - s.NotEqual(t.event.TaskId%4, 0) + s.False(t.event.TaskId%4 == 0) s.Greater(t.event.TaskId, prev) prev = t.event.TaskId } @@ -971,7 +971,7 @@ func TestSimpleLimiterLowToHigh(t *testing.T) { 1e-8, // 1 per 1000+ days } { pLow := makeSimpleLimiterParams(lowRate, time.Second) - require.Equal(t, pLow.never(), (lowRate == 0)) + require.True(t, pLow.never() == (lowRate == 0)) now := time.Now().UnixNano() var ready simpleLimiter diff --git a/service/matching/matcher_test.go b/service/matching/matcher_test.go index 4d35fef6dbd..d4801d8a436 100644 --- a/service/matching/matcher_test.go +++ b/service/matching/matcher_test.go @@ -75,7 +75,7 @@ func (t *MatcherTestSuite) SetupTest() { cfg.MaxWaitForPollerBeforeFwd = dynamicconfig.GetDurationPropertyFnFilteredByTaskQueue(10 * time.Millisecond) f, err := tqid.NewTaskQueueFamily("", "tl0") - t.NoError(err) + t.Assert().NoError(err) prtn := f.TaskQueue(enumspb.TASK_QUEUE_TYPE_WORKFLOW).NormalPartition(1) t.queue = UnversionedQueueKey(prtn) tlCfg := newTaskQueueConfig(prtn.TaskQueue(), cfg, "test-namespace") @@ -87,7 +87,7 @@ func (t *MatcherTestSuite) SetupTest() { } t.childConfig = tlCfg t.fwdr, err = newForwarder(&t.childConfig.forwarderConfig, t.queue, t.client) - t.NoError(err) + t.Assert().NoError(err) t.childMatcher = newTaskMatcher(tlCfg, t.fwdr, metrics.NoopMetricsHandler, t.newDefaultRateLimiter()) t.childMatcher.Start() @@ -249,7 +249,7 @@ func (t *MatcherTestSuite) TestRejectSyncMatchWhenBacklog() { } t.False(happened) - t.NoError(err) + t.Nil(err) newCtxCancel() // poll old task which is from the backlog @@ -278,7 +278,7 @@ func (t *MatcherTestSuite) TestForwardingWhenBacklogIsYoung() { ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) // poll forwarding attempt happens when there is no backlog _, err := t.childMatcher.Poll(ctx, &pollMetadata{}) - t.NoError(err) + t.Assert().NoError(err) cancel() }() // This ensures that the poll request has been forwarded to the parent partition before the offer is made. @@ -291,7 +291,7 @@ func (t *MatcherTestSuite) TestForwardingWhenBacklogIsYoung() { // task is not forwarded because there is a local poller waiting err := t.childMatcher.MustOffer(ctx, historyTask, intruptC) - t.NoError(err) + t.Nil(err) cancel() // young task is forwarded @@ -426,19 +426,19 @@ func (t *MatcherTestSuite) TestBacklogAge() { youngBacklogTask := newInternalTaskFromBacklog(randomTaskInfoWithAge(time.Second), nil) go t.rootMatcher.MustOffer(ctx, youngBacklogTask, intruptC) //nolint:errcheck time.Sleep(time.Millisecond * 10) //nolint:forbidigo - t.InDelta(time.Second, t.rootMatcher.getBacklogAge(), float64(100*time.Millisecond)) + t.InDelta(t.rootMatcher.getBacklogAge(), time.Second, float64(100*time.Millisecond)) middleBacklogTask := newInternalTaskFromBacklog(randomTaskInfoWithAge(time.Second), nil) // offering a task with the exact creation to make sure of correct counting for each creation time middleBacklogTask.event.Data.CreateTime = youngBacklogTask.event.Data.CreateTime go t.rootMatcher.MustOffer(ctx, middleBacklogTask, intruptC) //nolint:errcheck time.Sleep(time.Millisecond * 10) //nolint:forbidigo - t.InDelta(time.Second, t.rootMatcher.getBacklogAge(), float64(100*time.Millisecond)) + t.InDelta(t.rootMatcher.getBacklogAge(), time.Second, float64(100*time.Millisecond)) oldBacklogTask := newInternalTaskFromBacklog(randomTaskInfoWithAge(time.Minute), nil) go t.rootMatcher.MustOffer(ctx, oldBacklogTask, intruptC) //nolint:errcheck time.Sleep(time.Millisecond * 10) //nolint:forbidigo - t.InDelta(time.Minute, t.rootMatcher.getBacklogAge(), float64(100*time.Millisecond)) + t.InDelta(t.rootMatcher.getBacklogAge(), time.Minute, float64(100*time.Millisecond)) task, _ := t.rootMatcher.Poll(ctx, &pollMetadata{}) time.Sleep(time.Millisecond * 10) //nolint:forbidigo @@ -478,7 +478,7 @@ func (t *MatcherTestSuite) TestQueryNoCurrentPollersButRecentPollers() { t.client.EXPECT().PollWorkflowTaskQueue(gomock.Any(), gomock.Any(), gomock.Any()).Do( func(arg0 context.Context, arg1 *matchingservice.PollWorkflowTaskQueueRequest, arg2 ...any) { _, err := t.rootMatcher.PollForQuery(arg0, &pollMetadata{}) - t.ErrorIs(err, errNoTasks) + t.Assert().ErrorIs(err, errNoTasks) }, ).Return(emptyClientPollWorkflowTaskQueueResponse, nil).AnyTimes() @@ -495,7 +495,7 @@ func (t *MatcherTestSuite) TestQueryNoCurrentPollersButRecentPollers() { task.forwardInfo = req.GetForwardInfo() resp, err := t.rootMatcher.OfferQuery(ctx, task) t.Nil(resp) - t.ErrorIs(err, context.DeadlineExceeded) + t.Assert().ErrorIs(err, context.DeadlineExceeded) }, ).Return(nil, context.DeadlineExceeded) @@ -509,7 +509,7 @@ func (t *MatcherTestSuite) TestQueryNoRecentPoller() { t.client.EXPECT().PollWorkflowTaskQueue(gomock.Any(), gomock.Any(), gomock.Any()).Do( func(arg0 context.Context, arg1 *matchingservice.PollWorkflowTaskQueueRequest, arg2 ...any) { _, err := t.rootMatcher.PollForQuery(arg0, &pollMetadata{}) - t.ErrorIs(err, errNoTasks) + t.Assert().ErrorIs(err, errNoTasks) }, ).Return(emptyClientPollWorkflowTaskQueueResponse, nil).AnyTimes() @@ -533,7 +533,7 @@ func (t *MatcherTestSuite) TestQueryNoRecentPoller() { task.forwardInfo = req.GetForwardInfo() resp, err := t.rootMatcher.OfferQuery(ctx, task) t.Nil(resp) - t.ErrorIs(err, errNoRecentPoller) + t.Assert().ErrorIs(err, errNoRecentPoller) }, ).Return(nil, errNoRecentPoller) @@ -551,7 +551,7 @@ func (t *MatcherTestSuite) TestQueryNoPollerAtAll() { task.forwardInfo = req.GetForwardInfo() resp, err := t.rootMatcher.OfferQuery(ctx, task) t.Nil(resp) - t.ErrorIs(err, errNoRecentPoller) + t.Assert().ErrorIs(err, errNoRecentPoller) }, ).Return(nil, errNoRecentPoller) @@ -629,7 +629,7 @@ func (t *MatcherTestSuite) TestQueryRemoteSyncMatch() { close(pollSigC) time.Sleep(10 * time.Millisecond) _, err := t.rootMatcher.OfferQuery(ctx, task) - t.NoError(err) + t.Assert().NoError(err) }, ).Return(&matchingservice.QueryWorkflowResponse{QueryResult: payloads.EncodeString("answer")}, nil) @@ -739,7 +739,7 @@ func (t *MatcherTestSuite) TestMustOfferRemoteMatch() { go func() { ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second) _, err := t.childMatcher.Poll(ctx, &pollMetadata{}) - t.NoError(err) + t.Assert().NoError(err) cancel() }() diff --git a/service/matching/matching_engine_test.go b/service/matching/matching_engine_test.go index 876fe5a204f..cefe36afc57 100644 --- a/service/matching/matching_engine_test.go +++ b/service/matching/matching_engine_test.go @@ -438,7 +438,7 @@ func (s *matchingEngineSuite) PollForTasksEmptyResultTest(callContext context.Co }, }) s.NoError(err) - s.Len(descResp.DescResponse.Pollers, 1) + s.Equal(1, len(descResp.DescResponse.Pollers)) s.Equal(identity, descResp.DescResponse.Pollers[0].GetIdentity()) s.NotEmpty(descResp.DescResponse.Pollers[0].GetLastAccessTime()) s.Nil(descResp.DescResponse.GetTaskQueueStatus()) @@ -560,7 +560,7 @@ func (s *matchingEngineSuite) testFailAddTaskWithHistoryError( if expectedError != nil { s.ErrorAs(err, &expectedError) } else { - s.NoError(err) + s.Nil(err) } wg.Wait() } @@ -661,7 +661,7 @@ func (s *matchingEngineSuite) TestPollWorkflowTaskQueues() { NextPageToken: nil, } - s.NoError(err) + s.Nil(err) s.Equal(expectedResp, resp) } @@ -1300,7 +1300,7 @@ func (s *matchingEngineSuite) TestAddWorkflowTaskDoesNotLoadSticky() { // check loaded queues s.matchingEngine.partitionsLock.RLock() defer s.matchingEngine.partitionsLock.RUnlock() - s.Empty(s.matchingEngine.partitions) + s.Equal(0, len(s.matchingEngine.partitions)) } func (s *matchingEngineSuite) TestQueryWorkflowDoesNotLoadSticky() { @@ -1318,7 +1318,7 @@ func (s *matchingEngineSuite) TestQueryWorkflowDoesNotLoadSticky() { // check loaded queues s.matchingEngine.partitionsLock.RLock() defer s.matchingEngine.partitionsLock.RUnlock() - s.Empty(s.matchingEngine.partitions) + s.Equal(0, len(s.matchingEngine.partitions)) } func (s *matchingEngineSuite) TestAddThenConsumeActivities() { @@ -1359,7 +1359,7 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() { _, _, err := s.matchingEngine.AddActivityTask(context.Background(), &addRequest) s.NoError(err) } - s.Equal(taskCount, s.taskManager.getTaskCount(tlID)) + s.EqualValues(taskCount, s.taskManager.getTaskCount(tlID)) activityTypeName := "activity1" activityID := "activityId1" @@ -1410,15 +1410,15 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() { s.logger.Debug("empty poll returned") continue } - s.Equal(activityID, result.ActivityId) - s.Equal(activityType, result.ActivityType) - s.Equal(activityInput, result.Input) - s.Equal(workflowExecution, result.WorkflowExecution) - s.True(validateTimeRange(result.ScheduledTime.AsTime(), time.Minute)) - s.Equal(time.Second*100, result.ScheduleToCloseTimeout.AsDuration()) - s.True(validateTimeRange(result.StartedTime.AsTime(), time.Minute)) - s.Equal(time.Second*50, result.StartToCloseTimeout.AsDuration()) - s.Equal(time.Second*10, result.HeartbeatTimeout.AsDuration()) + s.EqualValues(activityID, result.ActivityId) + s.EqualValues(activityType, result.ActivityType) + s.EqualValues(activityInput, result.Input) + s.EqualValues(workflowExecution, result.WorkflowExecution) + s.Equal(true, validateTimeRange(result.ScheduledTime.AsTime(), time.Minute)) + s.EqualValues(time.Second*100, result.ScheduleToCloseTimeout.AsDuration()) + s.Equal(true, validateTimeRange(result.StartedTime.AsTime(), time.Minute)) + s.EqualValues(time.Second*50, result.StartToCloseTimeout.AsDuration()) + s.EqualValues(time.Second*10, result.HeartbeatTimeout.AsDuration()) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -1430,10 +1430,10 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() { } serializedToken, _ := s.matchingEngine.tokenSerializer.Serialize(taskToken) - s.Equal(serializedToken, result.TaskToken) + s.EqualValues(serializedToken, result.TaskToken) i++ } - s.Equal(0, s.taskManager.getTaskCount(tlID)) + s.EqualValues(0, s.taskManager.getTaskCount(tlID)) expectedRange := int64((taskCount + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -1558,13 +1558,13 @@ func (s *matchingEngineSuite) TestSyncMatchActivities() { s.NoError(err) s.NoError(pollErr) s.NotNil(result) - s.Positive(len(result.TaskToken)) + s.True(len(result.TaskToken) > 0) } - s.Equal(activityID, result.ActivityId) - s.Equal(activityType, result.ActivityType) - s.Equal(activityInput, result.Input) - s.Equal(workflowExecution, result.WorkflowExecution) + s.EqualValues(activityID, result.ActivityId) + s.EqualValues(activityType, result.ActivityType) + s.EqualValues(activityInput, result.Input) + s.EqualValues(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, @@ -1576,12 +1576,12 @@ func (s *matchingEngineSuite) TestSyncMatchActivities() { ActivityType: activityTypeName, } serializedToken, _ := s.matchingEngine.tokenSerializer.Serialize(taskToken) - s.Equal(serializedToken, result.TaskToken) + s.EqualValues(serializedToken, result.TaskToken) } s.EventuallyWithT(func(collect *assert.CollectT) { - assert.Equal(collect, 1, s.taskManager.getCreateTaskCount(dbq)) // Check times zero rps is set = Tasks stored in persistence - assert.Equal(collect, 0, s.taskManager.getTaskCount(dbq)) + assert.EqualValues(collect, 1, s.taskManager.getCreateTaskCount(dbq)) // Check times zero rps is set = Tasks stored in persistence + assert.EqualValues(collect, 0, s.taskManager.getTaskCount(dbq)) }, 2*time.Second, 100*time.Millisecond) syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count+namespace="+matchingTestNamespace+",namespace_state=active,operation=TaskQueueMgr,partition=0,service_name=matching,task_type=Activity,taskqueue=makeToast,worker_build_id=,worker_deployment_name=,worker_version=__unversioned__"] @@ -1601,7 +1601,7 @@ func (s *matchingEngineSuite) TestSyncMatchActivities() { }, }) s.NoError(err) - s.Len(descResp.DescResponse.Pollers, 1) + s.Equal(1, len(descResp.DescResponse.Pollers)) s.Equal(identity, descResp.DescResponse.Pollers[0].GetIdentity()) s.NotEmpty(descResp.DescResponse.Pollers[0].GetLastAccessTime()) s.Equal(defaultTaskDispatchRPS, descResp.DescResponse.Pollers[0].GetRatePerSecond()) @@ -1937,11 +1937,11 @@ func (s *matchingEngineSuite) concurrentPublishConsumeActivities( s.logger.Debug("empty poll returned") continue } - s.Equal(activityID, result.ActivityId) - s.Equal(activityType, result.ActivityType) - s.Equal(activityInput, result.Input) - s.Equal(activityHeader, result.Header) - s.Equal(workflowExecution, result.WorkflowExecution) + s.EqualValues(activityID, result.ActivityId) + s.EqualValues(activityType, result.ActivityType) + s.EqualValues(activityInput, result.Input) + s.EqualValues(activityHeader, result.Header) + s.EqualValues(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -1961,11 +1961,11 @@ func (s *matchingEngineSuite) concurrentPublishConsumeActivities( wg.Wait() totalTasks := int(taskCount) * workerCount persisted := s.taskManager.getCreateTaskCount(dbq) - s.Less(persisted, totalTasks) + s.True(persisted < totalTasks) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(dbq).rangeID) - s.Equal(0, s.taskManager.getTaskCount(dbq)) + s.EqualValues(0, s.taskManager.getTaskCount(dbq)) syncCtr := scope.Snapshot().Counters()["test.sync_throttle_count+namespace="+matchingTestNamespace+",operation=TaskQueueMgr,taskqueue=makeToast"] bufCtr := scope.Snapshot().Counters()["test.buffer_throttle_count+namespace="+matchingTestNamespace+",operation=TaskQueueMgr,taskqueue=makeToast"] @@ -2063,10 +2063,10 @@ func (s *matchingEngineSuite) TestConcurrentPublishConsumeWorkflowTasks() { s.logger.Debug("empty poll returned") continue } - s.Equal(workflowExecution, result.WorkflowExecution) - s.Equal(workflowType, result.WorkflowType) - s.Equal(startedEventID, result.StartedEventId) - s.Equal(workflowExecution, result.WorkflowExecution) + s.EqualValues(workflowExecution, result.WorkflowExecution) + s.EqualValues(workflowType, result.WorkflowType) + s.EqualValues(startedEventID, result.StartedEventId) + s.EqualValues(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -2086,10 +2086,10 @@ func (s *matchingEngineSuite) TestConcurrentPublishConsumeWorkflowTasks() { }() } wg.Wait() - s.Equal(0, s.taskManager.getTaskCount(tlID)) + s.EqualValues(0, s.taskManager.getTaskCount(tlID)) totalTasks := taskCount * workerCount persisted := s.taskManager.getCreateTaskCount(tlID) - s.Less(persisted, totalTasks) + s.True(persisted < totalTasks) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -2128,7 +2128,7 @@ func (s *matchingEngineSuite) TestPollWithExpiredContext() { Identity: identity, }, }, metrics.NoopMetricsHandler) - s.NoError(err) + s.Nil(err) s.Equal(emptyPollActivityTaskQueueResponse, resp) } @@ -2158,7 +2158,7 @@ func (s *matchingEngineSuite) TestForceUnloadTaskQueue() { Identity: identity, }}, metrics.NoopMetricsHandler) - s.NoError(err) + s.Nil(err) s.NotNil(pollResp) // Sanity check: adding a task should succeed with the queue loaded @@ -2241,7 +2241,7 @@ func (s *matchingEngineSuite) TestMultipleEnginesActivitiesRangeStealing() { } } - s.Equal(iterations*engineCount*taskCount, s.taskManager.getCreateTaskCount(tlID)) + s.EqualValues(iterations*engineCount*taskCount, s.taskManager.getCreateTaskCount(tlID)) activityTypeName := "activity1" activityID := "activityId1" @@ -2299,10 +2299,10 @@ func (s *matchingEngineSuite) TestMultipleEnginesActivitiesRangeStealing() { s.logger.Debug("empty poll returned") continue } - s.Equal(activityID, result.ActivityId) - s.Equal(activityType, result.ActivityType) - s.Equal(activityInput, result.Input) - s.Equal(workflowExecution, result.WorkflowExecution) + s.EqualValues(activityID, result.ActivityId) + s.EqualValues(activityType, result.ActivityType) + s.EqualValues(activityInput, result.Input) + s.EqualValues(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -2328,11 +2328,11 @@ func (s *matchingEngineSuite) TestMultipleEnginesActivitiesRangeStealing() { e.Stop() } - s.Equal(0, s.taskManager.getTaskCount(tlID)) + s.EqualValues(0, s.taskManager.getTaskCount(tlID)) totalTasks := taskCount * engineCount * iterations persisted := s.taskManager.getCreateTaskCount(tlID) // No sync matching as all messages are published first - s.Equal(totalTasks, persisted) + s.EqualValues(totalTasks, persisted) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -2444,10 +2444,10 @@ func (s *matchingEngineSuite) TestMultipleEnginesWorkflowTasksRangeStealing() { s.logger.Debug("empty poll returned") continue } - s.Equal(workflowExecution, result.WorkflowExecution) - s.Equal(workflowType, result.WorkflowType) - s.Equal(startedEventID, result.StartedEventId) - s.Equal(workflowExecution, result.WorkflowExecution) + s.EqualValues(workflowExecution, result.WorkflowExecution) + s.EqualValues(workflowType, result.WorkflowType) + s.EqualValues(startedEventID, result.StartedEventId) + s.EqualValues(workflowExecution, result.WorkflowExecution) taskToken := &tokenspb.Task{ Attempt: 1, NamespaceId: namespaceID, @@ -2472,11 +2472,11 @@ func (s *matchingEngineSuite) TestMultipleEnginesWorkflowTasksRangeStealing() { e.Stop() } - s.Equal(0, s.taskManager.getTaskCount(tlID)) + s.EqualValues(0, s.taskManager.getTaskCount(tlID)) totalTasks := taskCount * engineCount * iterations persisted := s.taskManager.getCreateTaskCount(tlID) // No sync matching as all messages are published first - s.Equal(totalTasks, persisted) + s.EqualValues(totalTasks, persisted) expectedRange := int64((persisted + 1) / rangeSize) // Due to conflicts some ids are skipped and more real ranges are used. s.LessOrEqual(expectedRange, s.taskManager.getQueueDataByKey(tlID).rangeID) @@ -2506,7 +2506,7 @@ func (s *matchingEngineSuite) TestAddTaskAfterStartFailure() { ScheduleToStartTimeout: timestamp.DurationFromSeconds(100), }) s.NoError(err) - s.Equal(1, s.taskManager.getTaskCount(dbq)) + s.EqualValues(1, s.taskManager.getTaskCount(dbq)) task1, _, err := s.matchingEngine.pollTask(context.Background(), dbq.partition, &pollMetadata{}) s.NoError(err) @@ -2562,7 +2562,7 @@ func (s *matchingEngineSuite) TestTaskQueueManagerGetTaskBatch() { } tlMgr := s.getPhysicalTaskQueueManagerImplFromKey(dbq) - s.Equal(taskCount, s.taskManager.getTaskCount(dbq)) + s.EqualValues(taskCount, s.taskManager.getTaskCount(dbq)) // wait until all tasks are read by the task pump and enqueued into the in-memory buffer // at the end of this step, ackManager readLevel will also be equal to the buffer size @@ -2579,15 +2579,15 @@ func (s *matchingEngineSuite) TestTaskQueueManagerGetTaskBatch() { // This is only for unit test purpose blm.taskAckManager.setReadLevel(blm.getDB().GetMaxReadLevel(0)) batch, err := blm.taskReader.getTaskBatch(context.Background()) - s.NoError(err) - s.Empty(batch.tasks) - s.Equal(blm.getDB().GetMaxReadLevel(0), batch.readLevel) + s.Nil(err) + s.EqualValues(0, len(batch.tasks)) + s.EqualValues(blm.getDB().GetMaxReadLevel(0), batch.readLevel) s.True(batch.isReadBatchDone) blm.taskAckManager.setReadLevel(0) batch, err = blm.taskReader.getTaskBatch(context.Background()) - s.NoError(err) - s.Len(batch.tasks, rangeSize) + s.Nil(err) + s.EqualValues(rangeSize, len(batch.tasks)) s.EqualValues(rangeSize, batch.readLevel) s.True(batch.isReadBatchDone) @@ -2617,9 +2617,9 @@ func (s *matchingEngineSuite) TestTaskQueueManagerGetTaskBatch() { continue } } - s.Equal(taskCount-rangeSize, s.taskManager.getTaskCount(dbq)) + s.EqualValues(taskCount-rangeSize, s.taskManager.getTaskCount(dbq)) batch, err = blm.taskReader.getTaskBatch(context.Background()) - s.NoError(err) + s.Nil(err) s.True(0 < len(batch.tasks) && len(batch.tasks) <= rangeSize) s.True(batch.isReadBatchDone) } @@ -2696,7 +2696,7 @@ func (s *matchingEngineSuite) TestTaskExpiryAndCompletion() { } tlMgr := s.getPhysicalTaskQueueManagerImplFromKey(dbq) - s.Equal(taskCount, s.taskManager.getTaskCount(dbq)) + s.EqualValues(taskCount, s.taskManager.getTaskCount(dbq)) blm := tlMgr.backlogMgr.(*backlogManagerImpl) // wait until all tasks are loaded by into in-memory buffers by task queue manager @@ -2841,7 +2841,7 @@ func (s *matchingEngineSuite) TestGetVersioningData() { s.Equal("9", curDefault.GetBuildIds()[0]) lastNode = curDefault.GetBuildIds()[len(curDefault.GetBuildIds())-1] s.Equal("9.79", lastNode) - s.Len(majorSets, 1) + s.Equal(1, len(majorSets)) res, err = s.matchingEngine.GetWorkerBuildIdCompatibility(context.Background(), &matchingservice.GetWorkerBuildIdCompatibilityRequest{ NamespaceId: namespaceID.String(), @@ -3207,7 +3207,7 @@ func (s *matchingEngineSuite) TestDemotedMatch() { }, }, }) - s.NoError(err) + s.Assert().NoError(err) // add a task for build0, will get spooled in its set _, _, err = s.matchingEngine.AddWorkflowTask(ctx, &matchingservice.AddWorkflowTaskRequest{ @@ -3323,7 +3323,7 @@ func (s *matchingEngineSuite) TestUnloadOnMembershipChange() { _, _, err = e.getTaskQueuePartitionManager(context.Background(), p2, true, loadCauseUnspecified) s.NoError(err) - s.Len(e.getTaskQueuePartitions(1000), 2) + s.Equal(2, len(e.getTaskQueuePartitions(1000))) s.mockServiceResolver.EXPECT().Lookup(nexusEndpointsTablePartitionRoutingKey).Return(self, nil).AnyTimes() @@ -3334,7 +3334,7 @@ func (s *matchingEngineSuite) TestUnloadOnMembershipChange() { s.mockServiceResolver.EXPECT().LookupN(p2key, p2n+1).Return([]membership.HostInfo{self}) e.membershipChangedCh <- nil time.Sleep(50 * time.Millisecond) - s.Len(e.getTaskQueuePartitions(1000), 2, "nothing should be unloaded yet") + s.Equal(2, len(e.getTaskQueuePartitions(1000)), "nothing should be unloaded yet") // signal again but p2 doesn't belong to us anymore s.mockServiceResolver.EXPECT().LookupN(p1key, p1n+1).Return([]membership.HostInfo{self}) @@ -3468,7 +3468,7 @@ func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_UnVersioned() { partitionType: prtn.Kind(), versioned: "unversioned", } - assert.Equal(s.T(), 2, s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters]) + assert.Equal(s.T(), s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters], 2) } @@ -3511,7 +3511,7 @@ func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_VersionSet() { partitionType: dbq.Partition().Kind(), versioned: "versionSet", } - assert.Equal(s.T(), 2, s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters]) + assert.Equal(s.T(), s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters], 2) } func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_BuildID() { @@ -3552,7 +3552,7 @@ func (s *matchingEngineSuite) TestUpdatePhysicalTaskQueueGauge_BuildID() { partitionType: dbq.Partition().Kind(), versioned: "buildId", } - assert.Equal(s.T(), 2, s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters]) + assert.Equal(s.T(), s.matchingEngine.gaugeMetrics.loadedPhysicalTaskQueueCount[physicalTaskQueueParameters], 2) } @@ -3756,12 +3756,12 @@ func (s *matchingEngineSuite) resetBacklogCounter(numWorkers int, taskCount int, s.NoError(err) pqMgr := s.getPhysicalTaskQueueManagerImplFromKey(ptq) - s.Equal(taskCount*numWorkers, s.taskManager.getTaskCount(ptq)) + s.EqualValues(taskCount*numWorkers, s.taskManager.getTaskCount(ptq)) // Check the maxReadLevel with the value of task stored in db maxTaskId, ok := s.taskManager.maxTaskID(ptq) s.True(ok) - s.Equal(maxTaskId, pqMgr.backlogMgr.getDB().GetMaxReadLevel(0)) + s.EqualValues(maxTaskId, pqMgr.backlogMgr.getDB().GetMaxReadLevel(0)) // validate the approximateBacklogCounter s.EqualValues(taskCount*numWorkers, totalApproximateBacklogCount(pqMgr.backlogMgr)) @@ -3782,7 +3782,7 @@ func (s *matchingEngineSuite) resetBacklogCounter(numWorkers int, taskCount int, } _, err = s.taskManager.CompleteTasksLessThan(context.Background(), request) s.NoError(err) - s.Equal((taskCount*numWorkers)-1, s.taskManager.getTaskCount(ptq)) + s.EqualValues((taskCount*numWorkers)-1, s.taskManager.getTaskCount(ptq)) // Add pollers which shall also load the fresher version of tqMgr s.pollWorkflowTasks(workflowType, (taskCount*numWorkers)-1, ptq, taskQueue) @@ -3794,7 +3794,7 @@ func (s *matchingEngineSuite) resetBacklogCounter(numWorkers int, taskCount int, // stopped (which would not result in resetting). pqMgr.backlogMgr.getDB().setMaxReadLevelForTesting(subqueueZero, maxTaskId) - s.Equal(0, s.taskManager.getTaskCount(ptq)) + s.EqualValues(0, s.taskManager.getTaskCount(ptq)) s.EventuallyWithT(func(collect *assert.CollectT) { require.Equal(collect, int64(0), totalApproximateBacklogCount(pqMgr.backlogMgr)) }, 4*time.Second, 10*time.Millisecond, "backlog counter should have been reset") diff --git a/service/matching/reachability_test.go b/service/matching/reachability_test.go index 6cf382be232..8e01a6d390e 100644 --- a/service/matching/reachability_test.go +++ b/service/matching/reachability_test.go @@ -126,7 +126,7 @@ func TestIsReachableAssignmentRuleTarget(t *testing.T) { func TestGetDefaultBuildId(t *testing.T) { t.Parallel() - assert.Empty(t, getDefaultBuildId([]*persistencespb.AssignmentRule{})) + assert.Equal(t, "", getDefaultBuildId([]*persistencespb.AssignmentRule{})) createTs := hlc.Zero(1) deleteTs := hlc.Next(createTs, commonclock.NewRealTimeSource()) @@ -303,17 +303,17 @@ func checkReachability(ctx context.Context, metricsCapture := metricsHandler.StartCapture() logger := log.NewTestLogger() reachability, err := getBuildIdTaskReachability(ctx, rc, metricsHandler, logger, buildId) - assert.NoError(t, err) + assert.Nil(t, err) assert.Equal(t, expectedReachability, reachability) snapshot := metricsCapture.Snapshot() counterRecordings := snapshot[metrics.ReachabilityExitPointCounter.Name()] - assert.Equal(t, 1, len(counterRecordings)) + assert.Equal(t, len(counterRecordings), 1) assert.Equal(t, int64(1), counterRecordings[0].Value.(int64)) assert.Equal(t, reachabilityExitPoint2TagValue[expectedExitPoint], counterRecordings[0].Tags[reachabilityExitPointTagName]) // check that rc.run works (don't check exit point this time because cache will be warm) reachability, _, err = rc.run(ctx, buildId) - assert.NoError(t, err) + assert.Nil(t, err) assert.Equal(t, expectedReachability, reachability) } diff --git a/service/matching/task_queue_partition_manager_test.go b/service/matching/task_queue_partition_manager_test.go index d0c18e31d55..9092f47b4bb 100644 --- a/service/matching/task_queue_partition_manager_test.go +++ b/service/matching/task_queue_partition_manager_test.go @@ -154,7 +154,7 @@ func (s *PartitionManagerTestSuite) TestDescribeTaskQueuePartition_MultipleBuild // validating TQ Stats resp, err := s.partitionMgr.Describe(ctx, buildIds, false, true, true, false) s.NoError(err) - s.Len(resp.VersionsInfoInternal, 2) + s.Equal(2, len(resp.VersionsInfoInternal)) // validate PhysicalTaskQueueInfo structures info1 := resp.VersionsInfoInternal[bld1].GetPhysicalTaskQueueInfo() @@ -217,10 +217,10 @@ func (s *PartitionManagerTestSuite) TestDescribeTaskQueuePartition_MultipleBuild } status1 := resp.VersionsInfoInternal[bld1].PhysicalTaskQueueInfo.GetInternalTaskQueueStatus() - s.Len(status1, 1) + s.Equal(1, len(status1)) s.ProtoEqual(status0, status1[0]) status2 := resp.VersionsInfoInternal[bld2].PhysicalTaskQueueInfo.GetInternalTaskQueueStatus() - s.Len(status2, 1) + s.Equal(1, len(status2)) s.ProtoEqual(status0, status2[0]) } @@ -1081,22 +1081,22 @@ func (s *PartitionManagerTestSuite) TestAddTaskWithAssignmentRulesAndVersionSets func (s *PartitionManagerTestSuite) TestGetAllPollerInfo() { // no pollers pollers := s.partitionMgr.GetAllPollerInfo() - s.Equal(len(pollers), 0) + s.True(len(pollers) == 0) // one unversioned poller s.pollWithIdentity("uv", "", false, false) pollers = s.partitionMgr.GetAllPollerInfo() - s.Equal(len(pollers), 1) + s.True(len(pollers) == 1) // one versioned poller s.pollWithIdentity("v", "bid", true, false) pollers = s.partitionMgr.GetAllPollerInfo() - s.Equal(len(pollers), 2) + s.True(len(pollers) == 2) // one unversioned poller with deployment options s.pollWithIdentity("uvdo", "bid", false, true) pollers = s.partitionMgr.GetAllPollerInfo() - s.Equal(len(pollers), 3) + s.True(len(pollers) == 3) for _, p := range pollers { //nolint:staticcheck // SA1019 deprecated GetWorkerVersionCapabilities @@ -1172,19 +1172,19 @@ func (s *PartitionManagerTestSuite) TestLegacyDescribeTaskQueue() { // no pollers resp, err := s.partitionMgr.LegacyDescribeTaskQueue(false) s.NoError(err) - s.Empty(resp.DescResponse.GetPollers()) + s.Equal(0, len(resp.DescResponse.GetPollers())) // one unversioned poller s.pollWithIdentity("uv", "", false, false) resp, err = s.partitionMgr.LegacyDescribeTaskQueue(false) s.NoError(err) - s.Len(resp.DescResponse.GetPollers(), 1) + s.Equal(1, len(resp.DescResponse.GetPollers())) // one versioned poller s.pollWithIdentity("v", "bid", true, false) resp, err = s.partitionMgr.LegacyDescribeTaskQueue(false) s.NoError(err) - s.Len(resp.DescResponse.GetPollers(), 2) + s.Equal(2, len(resp.DescResponse.GetPollers())) for _, p := range resp.DescResponse.GetPollers() { //nolint:staticcheck // SA1019 deprecated GetWorkerVersionCapabilities diff --git a/service/matching/task_validation_test.go b/service/matching/task_validation_test.go index 70b0f5850d2..a16f7e09672 100644 --- a/service/matching/task_validation_test.go +++ b/service/matching/task_validation_test.go @@ -98,7 +98,7 @@ func (s *taskValidatorSuite) TestPreValidateActive_NewTask_Skip_WithoutCreationT shouldValidate := s.taskValidator.preValidateActive(s.task) s.False(shouldValidate) s.Equal(s.task.TaskId, s.taskValidator.lastValidatedTaskInfo.taskID) - s.Less(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime), time.Second) + s.True(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime) < time.Second) } func (s *taskValidatorSuite) TestPreValidateActive_ExistingTask_Validate() { @@ -161,7 +161,7 @@ func (s *taskValidatorSuite) TestPreValidatePassive_NewTask_Skip_WithoutCreation shouldValidate := s.taskValidator.preValidatePassive(s.task) s.False(shouldValidate) s.Equal(s.task.TaskId, s.taskValidator.lastValidatedTaskInfo.taskID) - s.Less(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime), time.Second) + s.True(time.Now().Sub(s.taskValidator.lastValidatedTaskInfo.validationTime) < time.Second) } func (s *taskValidatorSuite) TestPreValidatePassive_ExistingTask_Validate() { diff --git a/service/matching/version_rule_helper_test.go b/service/matching/version_rule_helper_test.go index fefab033ba5..a32cc128f81 100644 --- a/service/matching/version_rule_helper_test.go +++ b/service/matching/version_rule_helper_test.go @@ -11,7 +11,7 @@ import ( func TestFindAssignmentBuildId_NoRules(t *testing.T) { b := FindAssignmentBuildId(nil, "") - assert.Empty(t, b) + assert.Equal(t, "", b) } func TestFindAssignmentBuildId_OneFullRule(t *testing.T) { diff --git a/service/matching/version_rule_test.go b/service/matching/version_rule_test.go index 64c36f54286..ad9444bf249 100644 --- a/service/matching/version_rule_test.go +++ b/service/matching/version_rule_test.go @@ -851,7 +851,7 @@ func TestDeleteRedirectRuleBasic(t *testing.T) { data, err = deleteRedirectRule("1", data, clock1) assert.NoError(t, err) deleted := getDeletedRedirectRuleBySrc("1", data) - assert.Len(t, deleted, 1) + assert.Equal(t, 1, len(deleted)) assert.Equal(t, clock1.GetWallClock(), deleted[0].GetDeleteTimestamp().GetWallClock()) assert.Equal(t, "1", deleted[0].GetRule().GetSourceBuildId()) assert.Equal(t, "2", deleted[0].GetRule().GetTargetBuildId()) @@ -860,7 +860,7 @@ func TestDeleteRedirectRuleBasic(t *testing.T) { data, err = deleteRedirectRule("2", data, clock2) assert.NoError(t, err) deleted = getDeletedRedirectRuleBySrc("2", data) - assert.Len(t, deleted, 1) + assert.Equal(t, 1, len(deleted)) assert.Equal(t, clock2.GetWallClock(), deleted[0].GetDeleteTimestamp().GetWallClock()) assert.Equal(t, "2", deleted[0].GetRule().GetSourceBuildId()) assert.Equal(t, "3", deleted[0].GetRule().GetTargetBuildId()) @@ -913,7 +913,7 @@ func TestGetWorkerVersioningRules(t *testing.T) { // check assignment rules assignmentRules := resp.GetResponse().GetAssignmentRules() - assert.Len(t, assignmentRules, 3) + assert.Equal(t, 3, len(assignmentRules)) protoassert.ProtoEqual(t, &taskqueuepb.TimestampedBuildIdAssignmentRule{ Rule: mkAssignmentRuleWithoutRamp("1"), CreateTime: hlc.ProtoTimestamp(clock1), @@ -929,7 +929,7 @@ func TestGetWorkerVersioningRules(t *testing.T) { // check redirect rules, no ordering guarantee redirectRules := resp.GetResponse().GetCompatibleRedirectRules() - assert.Len(t, redirectRules, 3) + assert.Equal(t, 3, len(redirectRules)) contains := func(expected *taskqueuepb.TimestampedCompatibleBuildIdRedirectRule) bool { for _, r := range redirectRules { if proto.Equal(expected, r) { @@ -1197,8 +1197,8 @@ func TestFindTerminalBuildId(t *testing.T) { mkRedirectRulePersistence(mkRedirectRule("1", "2"), createTs, nil), mkRedirectRulePersistence(mkRedirectRule("2", "1"), createTs, nil), } - assert.Empty(t, findTerminalBuildId("1", redirectRules)) - assert.Empty(t, findTerminalBuildId("2", redirectRules)) + assert.Equal(t, "", findTerminalBuildId("1", redirectRules)) + assert.Equal(t, "", findTerminalBuildId("2", redirectRules)) } func TestGetUpstreamBuildIds_NoCycle(t *testing.T) { diff --git a/service/worker/migration/activities_test.go b/service/worker/migration/activities_test.go index c09dbe61fd9..4ca1d7492c9 100644 --- a/service/worker/migration/activities_test.go +++ b/service/worker/migration/activities_test.go @@ -226,7 +226,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_Success() { s.NoError(err) s.Equal(len(request.Executions), int(output.VerifiedWorkflowCount)) - s.NotEmpty(iceptor.replicationRecordedHeartbeats) + s.Greater(len(iceptor.replicationRecordedHeartbeats), 0) lastHeartBeat := iceptor.replicationRecordedHeartbeats[len(iceptor.replicationRecordedHeartbeats)-1] s.Equal(len(request.Executions), lastHeartBeat.NextIndex) s.Equal(execution2, lastHeartBeat.LastNotVerifiedWorkflowExecution) @@ -290,7 +290,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_SkipWorkflowExecution() { })).Return(t.resp, t.err).Times(1) _, err := env.ExecuteActivity(s.a.VerifyReplicationTasks, &request) - s.NotEmpty(iceptor.replicationRecordedHeartbeats) + s.Greater(len(iceptor.replicationRecordedHeartbeats), 0) lastHeartBeat := iceptor.replicationRecordedHeartbeats[len(iceptor.replicationRecordedHeartbeats)-1] if t.expectedErr == nil { s.NoError(err) @@ -346,7 +346,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_FailedNotFound() { s.Error(err) s.ErrorContains(err, "verifyReplicationTasks was not able to make progress") - s.NotEmpty(iceptor.replicationRecordedHeartbeats) + s.Greater(len(iceptor.replicationRecordedHeartbeats), 0) lastHeartBeat := iceptor.replicationRecordedHeartbeats[len(iceptor.replicationRecordedHeartbeats)-1] s.Equal(0, lastHeartBeat.NextIndex) s.Equal(execution1, lastHeartBeat.LastNotVerifiedWorkflowExecution) @@ -370,7 +370,7 @@ func (s *activitiesSuite) TestVerifyReplicationTasks_AlreadyVerified() { _, err := env.ExecuteActivity(s.a.VerifyReplicationTasks, &request) s.NoError(err) - s.Equal(1, len(iceptor.replicationRecordedHeartbeats)) + s.Equal(len(iceptor.replicationRecordedHeartbeats), 1) } func (s *activitiesSuite) Test_verifySingleReplicationTask() { @@ -757,7 +757,7 @@ func (s *activitiesSuite) TestGenerateReplicationTasks_Success() { _, err := env.ExecuteActivity(s.a.GenerateReplicationTasks, &request) s.NoError(err) - s.NotEmpty(iceptor.generateReplicationRecordedHeartbeats) + s.Greater(len(iceptor.generateReplicationRecordedHeartbeats), 0) lastIdx := len(iceptor.generateReplicationRecordedHeartbeats) - 1 lastHeartBeat := iceptor.generateReplicationRecordedHeartbeats[lastIdx] s.Equal(lastIdx, lastHeartBeat) @@ -794,7 +794,7 @@ func (s *activitiesSuite) TestGenerateReplicationTasks_Failed() { _, err := env.ExecuteActivity(s.a.GenerateReplicationTasks, &request) s.Error(err) - s.NotEmpty(iceptor.generateReplicationRecordedHeartbeats) + s.Greater(len(iceptor.generateReplicationRecordedHeartbeats), 0) lastIdx := len(iceptor.generateReplicationRecordedHeartbeats) - 1 lastHeartBeat := iceptor.generateReplicationRecordedHeartbeats[lastIdx] // Only the generation of 1st execution suceeded. diff --git a/service/worker/migration/force_replication_workflow_test.go b/service/worker/migration/force_replication_workflow_test.go index c913713bc05..bf0ea3ebba0 100644 --- a/service/worker/migration/force_replication_workflow_test.go +++ b/service/worker/migration/force_replication_workflow_test.go @@ -125,7 +125,7 @@ func (s *ForceReplicationWorkflowTestSuite) TestForceReplicationWorkflow() { s.Equal(startTime, status.LastStartTime) s.Equal(closeTime, status.LastCloseTime) s.True(status.TaskQueueUserDataReplicationStatus.Done) - s.Empty(status.TaskQueueUserDataReplicationStatus.FailureMessage) + s.Equal("", status.TaskQueueUserDataReplicationStatus.FailureMessage) s.Equal(int64(4), status.TotalWorkflowCount) s.Equal(int64(4), status.ReplicatedWorkflowCount) s.Equal([]byte(nil), status.PageTokenForRestart) @@ -269,7 +269,7 @@ func (s *ForceReplicationWorkflowTestSuite) testRunForceReplicationForContinueAs s.NoError(err) } else { s.Error(err) - s.ErrorAs(err, &continueAsNewErr) + s.True(errors.As(err, &continueAsNewErr)) var params ForceReplicationParams payloads := continueAsNewErr.Input.GetPayloads() @@ -689,7 +689,7 @@ func TestSeedReplicationQueueWithUserDataEntries_Heartbeats(t *testing.T) { } _, err := env.ExecuteActivity(a.SeedReplicationQueueWithUserDataEntries, params) assert.Error(t, err) - assert.Equal(t, 2, len(iceptor.seedRecordedHeartbeats)) + assert.Equal(t, len(iceptor.seedRecordedHeartbeats), 2) assert.Equal(t, []byte(nil), iceptor.seedRecordedHeartbeats[1].NextPageToken) assert.Equal(t, 1, iceptor.seedRecordedHeartbeats[1].IndexInPage) env.SetHeartbeatDetails(iceptor.seedRecordedHeartbeats[1]) diff --git a/service/worker/scanner/history/scavenger_test.go b/service/worker/scanner/history/scavenger_test.go index 48acaab189b..d9e7e45e52c 100644 --- a/service/worker/scanner/history/scavenger_test.go +++ b/service/worker/scanner/history/scavenger_test.go @@ -160,12 +160,12 @@ func (s *ScavengerTestSuite) TestAllSkipTasksTwoPages() { }, nil) hbd, err := s.scavenger.Run(context.Background()) - s.NoError(err) + s.Nil(err) s.Equal(4, hbd.SkipCount) s.Equal(0, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Empty(hbd.NextPageToken) + s.Equal(0, len(hbd.NextPageToken)) } func (s *ScavengerTestSuite) TestAllErrorSplittingTasksTwoPages() { @@ -218,12 +218,12 @@ func (s *ScavengerTestSuite) TestAllErrorSplittingTasksTwoPages() { }, nil) hbd, err := s.scavenger.Run(context.Background()) - s.NoError(err) + s.Nil(err) s.Equal(0, hbd.SkipCount) s.Equal(0, hbd.SuccessCount) s.Equal(4, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Empty(hbd.NextPageToken) + s.Equal(0, len(hbd.NextPageToken)) } func (s *ScavengerTestSuite) TestNoGarbageTwoPages() { @@ -323,12 +323,12 @@ func (s *ScavengerTestSuite) TestNoGarbageTwoPages() { })).Return(ms, nil) hbd, err := s.scavenger.Run(context.Background()) - s.NoError(err) + s.Nil(err) s.Equal(0, hbd.SkipCount) s.Equal(4, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Empty(hbd.NextPageToken) + s.Equal(0, len(hbd.NextPageToken)) } func (s *ScavengerTestSuite) TestDeletingBranchesTwoPages() { @@ -412,37 +412,37 @@ func (s *ScavengerTestSuite) TestDeletingBranchesTwoPages() { ArchetypeId: chasm.WorkflowArchetypeID, })).Return(nil, serviceerror.NewNotFound("")) branchToken1, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID1, &branchID1, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.NoError(err) + s.Nil(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken1, ShardID: common.WorkflowIDToHistoryShard("namespaceID1", "workflowID1", s.numShards), })).Return(nil) branchToken2, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID2, &branchID2, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.NoError(err) + s.Nil(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken2, ShardID: common.WorkflowIDToHistoryShard("namespaceID2", "workflowID2", s.numShards), })).Return(nil) branchToken3, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID3, &branchID3, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.NoError(err) + s.Nil(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken3, ShardID: common.WorkflowIDToHistoryShard("namespaceID3", "workflowID3", s.numShards), })).Return(nil) branchToken4, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID4, &branchID4, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.NoError(err) + s.Nil(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken4, ShardID: common.WorkflowIDToHistoryShard("namespaceID4", "workflowID4", s.numShards), })).Return(nil) hbd, err := s.scavenger.Run(context.Background()) - s.NoError(err) + s.Nil(err) s.Equal(0, hbd.SkipCount) s.Equal(4, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Empty(hbd.NextPageToken) + s.Equal(0, len(hbd.NextPageToken)) } func (s *ScavengerTestSuite) TestMixesTwoPages() { @@ -548,26 +548,26 @@ func (s *ScavengerTestSuite) TestMixesTwoPages() { })).Return(ms, nil) branchToken3, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID3, &branchID3, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.NoError(err) + s.Nil(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken3, ShardID: common.WorkflowIDToHistoryShard("namespaceID3", "workflowID3", s.numShards), })).Return(nil) branchToken4, err := s.historyBranchUtil.NewHistoryBranch(uuid.NewString(), uuid.NewString(), uuid.NewString(), treeID4, &branchID4, []*persistencespb.HistoryBranchRange{}, 0, 0, 0) - s.NoError(err) + s.Nil(err) s.mockExecutionManager.EXPECT().DeleteHistoryBranch(gomock.Any(), protomock.Eq(&persistence.DeleteHistoryBranchRequest{ BranchToken: branchToken4, ShardID: common.WorkflowIDToHistoryShard("namespaceID4", "workflowID4", s.numShards), })).Return(fmt.Errorf("failed to delete history")) hbd, err := s.scavenger.Run(context.Background()) - s.NoError(err) + s.Nil(err) s.Equal(1, hbd.SkipCount) s.Equal(2, hbd.SuccessCount) s.Equal(2, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Empty(hbd.NextPageToken) + s.Equal(0, len(hbd.NextPageToken)) } func (s *ScavengerTestSuite) TestDeleteWorkflowAfterRetention() { @@ -737,10 +737,10 @@ func (s *ScavengerTestSuite) TestDeleteWorkflowAfterRetention() { })).Return(nil, nil).Times(1) hbd, err := s.scavenger.Run(context.Background()) - s.NoError(err) + s.Nil(err) s.Equal(0, hbd.SkipCount) s.Equal(5, hbd.SuccessCount) s.Equal(0, hbd.ErrorCount) s.Equal(2, hbd.CurrentPage) - s.Empty(hbd.NextPageToken) + s.Equal(0, len(hbd.NextPageToken)) } diff --git a/tools/cassandra/handler_test.go b/tools/cassandra/handler_test.go index 1ab2fc21918..4cfc062e4a3 100644 --- a/tools/cassandra/handler_test.go +++ b/tools/cassandra/handler_test.go @@ -25,26 +25,26 @@ func (s *HandlerTestSuite) SetupTest() { func (s *HandlerTestSuite) TestValidateCQLClientConfig() { config := new(CQLClientConfig) - s.Error(validateCQLClientConfig(config)) + s.NotNil(validateCQLClientConfig(config)) config.Hosts = environment.GetCassandraAddress() - s.Error(validateCQLClientConfig(config)) + s.NotNil(validateCQLClientConfig(config)) config.Keyspace = "foobar" - s.NoError(validateCQLClientConfig(config)) + s.Nil(validateCQLClientConfig(config)) } func (s *HandlerTestSuite) TestParsingOfOptionsMap() { parsedMap := parseOptionsMap("key1=value1 ,key2= value2,key3=value3") - s.Equal("value1", parsedMap["key1"]) - s.Equal("value2", parsedMap["key2"]) - s.Equal("value3", parsedMap["key3"]) - s.Assert().Empty(parsedMap["key4"]) + s.Assert().Equal("value1", parsedMap["key1"]) + s.Assert().Equal("value2", parsedMap["key2"]) + s.Assert().Equal("value3", parsedMap["key3"]) + s.Assert().Equal("", parsedMap["key4"]) parsedMap2 := parseOptionsMap("key1=,=value2") - s.Assert().Empty(parsedMap2) + s.Assert().Equal(0, len(parsedMap2)) } func (s *HandlerTestSuite) TestDropKeyspaceError() { @@ -57,7 +57,7 @@ func (s *HandlerTestSuite) TestDropKeyspaceError() { args := []string{"./tool", "drop-keyspace", "-f", "--keyspace", ""} app := buildCLIOptions() err := app.Run(args) - s.NoError(err) + s.Nil(err) } func (s *HandlerTestSuite) TestCreateKeyspaceError() { @@ -70,5 +70,5 @@ func (s *HandlerTestSuite) TestCreateKeyspaceError() { args := []string{"./tool", "create-keyspace", "--keyspace", ""} app := buildCLIOptions() err := app.Run(args) - s.NoError(err) + s.Nil(err) } diff --git a/tools/common/schema/test/dbtest.go b/tools/common/schema/test/dbtest.go index 3c1176d389b..e139352b7d0 100644 --- a/tools/common/schema/test/dbtest.go +++ b/tools/common/schema/test/dbtest.go @@ -88,67 +88,67 @@ func (tb *DBTestBase) RunParseFileTest(content string) { _, err := cqlFile.WriteString(content) tb.NoError(err) stmts, err := persistence.LoadAndSplitQuery([]string{cqlFile.Name()}) - tb.NoError(err) - tb.Len(stmts, 2, "wrong number of sql statements") + tb.Nil(err) + tb.Equal(2, len(stmts), "wrong number of sql statements") } // RunCreateTest tests schema version table creation func (tb *DBTestBase) RunCreateTest(db DB) { tables, err := db.ListTables() - tb.NoError(err) - tb.Empty(tables) + tb.Nil(err) + tb.Equal(0, len(tables)) err = db.CreateSchemaVersionTables() - tb.NoError(err) + tb.Nil(err) expectedTables := make(map[string]struct{}) expectedTables["schema_version"] = struct{}{} expectedTables["schema_update_history"] = struct{}{} tables, err = db.ListTables() - tb.NoError(err) - tb.Len(tables, len(expectedTables)) + tb.Nil(err) + tb.Equal(len(expectedTables), len(tables)) for _, t := range tables { _, ok := expectedTables[t] tb.True(ok) delete(expectedTables, t) } - tb.Empty(expectedTables) + tb.Equal(0, len(expectedTables)) } // RunUpdateTest tests update of schema and schema version tables func (tb *DBTestBase) RunUpdateTest(db DB) { err := db.UpdateSchemaVersion("10.0", "5.0") - tb.NoError(err) + tb.Nil(err) err = db.WriteSchemaUpdateLog("9.0", "10.0", "abc", "test") - tb.NoError(err) + tb.Nil(err) ver, err := db.ReadSchemaVersion() - tb.NoError(err) + tb.Nil(err) tb.Equal("10.0", ver) err = db.UpdateSchemaVersion("12.0", "5.0") - tb.NoError(err) + tb.Nil(err) ver, err = db.ReadSchemaVersion() - tb.NoError(err) + tb.Nil(err) tb.Equal("12.0", ver) } // RunDropTest tests the drop methods in DB implementation func (tb *DBTestBase) RunDropTest(db DB) { tables, err := db.ListTables() - tb.NoError(err) - tb.Positive(len(tables)) + tb.Nil(err) + tb.True(len(tables) > 0) err = db.DropAllTables() - tb.NoError(err) + tb.Nil(err) tables, err = db.ListTables() - tb.NoError(err) - tb.Empty(tables) + tb.Nil(err) + tb.Equal(0, len(tables)) _, err = db.ReadSchemaVersion() - tb.Error(err) + tb.NotNil(err) } diff --git a/tools/common/schema/updatetask_test.go b/tools/common/schema/updatetask_test.go index da0fba67480..28d9628bb8e 100644 --- a/tools/common/schema/updatetask_test.go +++ b/tools/common/schema/updatetask_test.go @@ -61,12 +61,12 @@ func (s *UpdateTaskTestSuite) TestReadSchemaDir() { // Start version found, no later versions. Return nothing. ans, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "10.2", "", s.logger) s.NoError(err) - s.Empty(ans) + s.Equal(0, len(ans)) // Start version not found, no later versions. Return nothing. ans, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "10.3", "", s.logger) s.NoError(err) - s.Empty(ans) + s.Equal(0, len(ans)) ans, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "2.5.2", "", s.logger) s.NoError(err) @@ -96,35 +96,35 @@ func (s *UpdateTaskTestSuite) TestReadSchemaDirEFS() { func (s *UpdateTaskTestSuite) TestSortAndFilterVersionsWithEndLessThanStart_ReturnsError() { _, err := sortAndFilterVersions(updateTaskTestData.versions, "1.5", "0.5", s.logger) s.Error(err) - s.Containsf(err.Error(), "less than end version", "Unexpected error message") + assert.Containsf(s.T(), err.Error(), "less than end version", "Unexpected error message") } func (s *UpdateTaskTestSuite) TestReadSchemaDirWithEndVersion_ReturnsErrorWhenNotFound() { // No versions in range _, err := readSchemaDir(os.DirFS(s.versionsDir), ".", "11.0", "11.2", s.logger) s.Error(err) - s.Containsf(err.Error(), "specified but not found", "Unexpected error message") + assert.Containsf(s.T(), err.Error(), "specified but not found", "Unexpected error message") // Versions in range, but nothing for v10.3 _, err = readSchemaDir(os.DirFS(s.versionsDir), ".", "0.5", "10.3", s.logger) s.Error(err) - s.Containsf(err.Error(), "specified but not found", "Unexpected error message") + assert.Containsf(s.T(), err.Error(), "specified but not found", "Unexpected error message") } func (s *UpdateTaskTestSuite) TestReadSchemaDirWithSameStartAndEnd_ReturnsEmptyList() { ans, err := readSchemaDir(os.DirFS(s.versionsDir), ".", "1.7", "1.7", s.logger) s.NoError(err) - assert.Empty(s.T(), ans) + assert.Equal(s.T(), 0, len(ans)) } func (s *UpdateTaskTestSuite) TestReadSchemaDirWithEmptyDir_ReturnsError() { _, err := readSchemaDir(os.DirFS(s.emptyDir), ".", "11.0", "", s.logger) s.Error(err) - s.Containsf(err.Error(), "contains no subDirs", "Unexpected error message") + assert.Containsf(s.T(), err.Error(), "contains no subDirs", "Unexpected error message") _, err = readSchemaDir(os.DirFS(s.emptyDir), ".", "10.1", "", s.logger) s.Error(err) - s.Containsf(err.Error(), "contains no subDirs", "Unexpected error message") + assert.Containsf(s.T(), err.Error(), "contains no subDirs", "Unexpected error message") } func (s *UpdateTaskTestSuite) TestReadManifest() { @@ -206,7 +206,7 @@ func (s *UpdateTaskTestSuite) runReadManifestTest( file := dir + "/manifest.json" err := os.WriteFile(file, []byte(input), os.FileMode(0644)) - s.NoError(err) + s.Nil(err) m, err := readManifest(os.DirFS(dir), ".") if isErr { @@ -217,6 +217,6 @@ func (s *UpdateTaskTestSuite) runReadManifestTest( s.Equal(currVer, m.CurrVersion) s.Equal(minVer, m.MinCompatibleVersion) s.Equal(desc, m.Description) - s.Positive(len(m.md5)) + s.True(len(m.md5) > 0) s.Equal(files, m.SchemaUpdateCqlFiles) } From 4ae8ddb300677dce85070433d4bb7ce9333df0f2 Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Sun, 21 Jun 2026 11:15:54 -0700 Subject: [PATCH 4/7] Keep only server-owned testifylint changes --- chasm/fields_iterator_test.go | 2 +- chasm/registry_test.go | 44 +++---- chasm/tree_test.go | 2 +- chasm/visibility_value_test.go | 2 +- .../archiver/filestore/query_parser_test.go | 2 +- common/archiver/filestore/util_test.go | 8 +- .../archiver/gcloud/connector/client_test.go | 4 +- common/archiver/gcloud/util_test.go | 10 +- common/archiver/history_iterator_test.go | 6 +- common/archiver/s3store/util_test.go | 6 +- common/persistence/client/quotas_test.go | 2 +- common/persistence/history_node_util_test.go | 2 +- .../fixed_address_translator_test.go | 2 +- common/persistence/query_util_test.go | 2 +- .../serialization/task_serializers_test.go | 12 +- .../sqlplugin/mysql/session/session_test.go | 2 +- .../sqlplugin/tests/history_transfer_task.go | 2 +- .../tests/history_visibility_task.go | 2 +- .../tests/execution_mutable_state.go | 2 +- .../tests/execution_mutable_state_task.go | 6 +- .../persistence/tests/nexus_endpoint_suite.go | 4 +- .../tests/visibility_persistence_suite.go | 118 +++++++++--------- .../store/elasticsearch/processor_test.go | 8 +- .../visibility_store_write_test.go | 10 +- .../store/sql/pagination_token_legacy_test.go | 6 +- .../workflow_state_status_validator_test.go | 4 +- common/searchattribute/manager_test.go | 12 +- common/searchattribute/stringify_test.go | 2 +- common/tasks/group_by_scheduler_test.go | 6 +- common/tqid/task_queue_id_test.go | 5 +- components/callbacks/statemachine_test.go | 14 +-- components/nexusoperations/executors_test.go | 30 ++--- .../nexusoperations/statemachine_test.go | 46 +++---- .../nexusoperations/workflow/commands_test.go | 42 +++---- .../ndc/activity_state_replicator_test.go | 12 +- service/history/ndc/branch_manager_test.go | 2 +- service/history/ndc/conflict_resolver_test.go | 6 +- service/history/ndc/events_reapplier_test.go | 16 +-- service/history/ndc/replication_task_test.go | 8 +- service/history/ndc/resetter_test.go | 2 +- .../history/ndc/transaction_manager_test.go | 2 +- .../ndc/workflow_state_replicator_test.go | 6 +- service/history/ndc/workflow_test.go | 2 +- service/history/queues/reader_group_test.go | 2 +- service/history/queues/reader_test.go | 2 +- .../history/replication/ack_manager_test.go | 8 +- .../replication/batchable_task_test.go | 4 +- .../eager_namespace_refresher_test.go | 4 +- .../eventhandler/event_importer_test.go | 2 +- .../history_events_handler_test.go | 10 +- .../remote_history_paginated_fetcher_test.go | 8 +- .../eventhandler/resend_handler_test.go | 10 +- .../executable_activity_state_task_test.go | 6 +- .../replication/executable_task_test.go | 6 +- .../replication/progress_cache_test.go | 8 +- .../stream_receiver_monitor_test.go | 24 ++-- .../replication/stream_receiver_test.go | 22 ++-- .../history/replication/stream_sender_test.go | 4 +- .../replication/sync_state_retriever_test.go | 16 +-- .../replication/task_processor_test.go | 4 +- service/history/shard/context_test.go | 20 +-- service/history/shard/controller_test.go | 8 +- service/history/shard/ownership_test.go | 2 +- .../history/shard/task_key_generator_test.go | 2 +- .../visibility_queue_task_executor_test.go | 28 ++--- service/matching/ack_manager_test.go | 4 +- service/matching/configs/quotas_test.go | 2 +- service/matching/forwarder_test.go | 12 +- .../matching/physical_task_queue_key_test.go | 12 +- .../physical_task_queue_manager_test.go | 10 +- .../worker/deletenamespace/activities_test.go | 2 +- .../deleteexecutions/workflow_test.go | 5 +- .../reclaimresources/workflow_test.go | 13 +- .../worker/deletenamespace/workflow_test.go | 4 +- service/worker/dlq/workflow_test.go | 2 +- .../migration/handover_workflow_test.go | 3 +- .../worker/scanner/executions/task_test.go | 5 +- .../scanner/taskqueue/scavenger_test.go | 12 +- service/worker/scheduler/calendar_test.go | 10 +- service/worker/scheduler/query_test.go | 2 +- service/worker/scheduler/workflow_test.go | 22 ++-- 81 files changed, 405 insertions(+), 398 deletions(-) diff --git a/chasm/fields_iterator_test.go b/chasm/fields_iterator_test.go index 4d7737ffe79..261ca0ff68a 100644 --- a/chasm/fields_iterator_test.go +++ b/chasm/fields_iterator_test.go @@ -211,7 +211,7 @@ func (s *fieldsIteratorSuite) TestUnmanagedFieldsOf() { for r := range unmanagedFieldsOf(reflect.TypeFor[unmanagedFields]()) { result = append(result, r.name) } - s.Len(result, 2) + s.Equal(2, len(result)) s.ElementsMatch([]string{"unmanaged", "anotherPtr"}, result) } diff --git a/chasm/registry_test.go b/chasm/registry_test.go index 5ace693f07c..8429f03eb17 100644 --- a/chasm/registry_test.go +++ b/chasm/registry_test.go @@ -57,29 +57,29 @@ func (s *RegistryTestSuite) TestRegistry_RegisterComponents_Success() { lib.EXPECT().NexusServiceProcessors().Return(nil) err := r.Register(lib) - s.Require().NoError(err) + require.NoError(s.T(), err) rc1, ok := r.Component("TestLibrary.Component1") - s.Require().True(ok) - s.Require().Equal("TestLibrary.Component1", rc1.FqType()) + require.True(s.T(), ok) + require.Equal(s.T(), "TestLibrary.Component1", rc1.FqType()) missingRC, ok := r.Component("TestLibrary.Component2") - s.Require().False(ok) - s.Require().Nil(missingRC) + require.False(s.T(), ok) + require.Nil(s.T(), missingRC) cInstance1 := chasm.NewMockComponent(ctrl) rc2, ok := r.ComponentFor(cInstance1) - s.Require().True(ok) - s.Require().Equal("TestLibrary.Component1", rc2.FqType()) + require.True(s.T(), ok) + require.Equal(s.T(), "TestLibrary.Component1", rc2.FqType()) rc2, ok = r.ComponentOf(reflect.TypeOf(cInstance1)) - s.Require().True(ok) - s.Require().Equal("TestLibrary.Component1", rc2.FqType()) + require.True(s.T(), ok) + require.Equal(s.T(), "TestLibrary.Component1", rc2.FqType()) cInstance2 := "invalid component instance" rc3, ok := r.ComponentFor(cInstance2) - s.Require().False(ok) - s.Require().Nil(rc3) + require.False(s.T(), ok) + require.Nil(s.T(), rc3) } func (s *RegistryTestSuite) TestRegistry_RegisterComponents_WithDetached() { @@ -129,31 +129,31 @@ func (s *RegistryTestSuite) TestRegistry_RegisterTasks_Success() { }) err := r.Register(lib) - s.Require().NoError(err) + require.NoError(s.T(), err) rt1, ok := r.Task("TestLibrary.Task1") - s.Require().True(ok) - s.Require().Equal("TestLibrary.Task1", rt1.FqType()) + require.True(s.T(), ok) + require.Equal(s.T(), "TestLibrary.Task1", rt1.FqType()) s.Require().Equal("test-task-group", rt1.TaskGroup()) missingRT, ok := r.Task("TestLibrary.TaskMissing") - s.Require().False(ok) - s.Require().Nil(missingRT) + require.False(s.T(), ok) + require.Nil(s.T(), missingRT) tInstance1 := testTask2{} rt2, ok := r.TaskFor(tInstance1) - s.Require().True(ok) - s.Require().Equal("TestLibrary.Task2", rt2.FqType()) + require.True(s.T(), ok) + require.Equal(s.T(), "TestLibrary.Task2", rt2.FqType()) s.Require().Equal(rt2.FqType(), rt2.TaskGroup()) rt2, ok = r.TaskOf(reflect.TypeOf(tInstance1)) - s.Require().True(ok) - s.Require().Equal("TestLibrary.Task2", rt2.FqType()) + require.True(s.T(), ok) + require.Equal(s.T(), "TestLibrary.Task2", rt2.FqType()) tInstance2 := "invalid task instance" rt3, ok := r.TaskFor(tInstance2) - s.Require().False(ok) - s.Require().Nil(rt3) + require.False(s.T(), ok) + require.Nil(s.T(), rt3) } func (s *RegistryTestSuite) TestRegistry_Register_LibraryError() { diff --git a/chasm/tree_test.go b/chasm/tree_test.go index 72c9bd2e310..0cb36f65926 100644 --- a/chasm/tree_test.go +++ b/chasm/tree_test.go @@ -752,7 +752,7 @@ func (s *nodeSuite) TestDeserializeNode_ComponentAttributes() { s.IsType(&TestComponent{}, node.value) tc := node.value.(*TestComponent) s.Equal(tc.SubComponent1.Internal.node, node.children["SubComponent1"]) - s.Equal("component-data", tc.ComponentData.CreateRequestId) + s.Equal(tc.ComponentData.CreateRequestId, "component-data") s.Equal(valueStateSynced, node.valueState) s.Nil(tc.SubComponent1.Internal.value()) diff --git a/chasm/visibility_value_test.go b/chasm/visibility_value_test.go index 1bdd77c2efd..fd6bb8d6feb 100644 --- a/chasm/visibility_value_test.go +++ b/chasm/visibility_value_test.go @@ -46,7 +46,7 @@ func TestVisibilityValue(t *testing.T) { var out bool err := payload.Decode(p, &out) require.NoError(t, err) - require.True(t, out) + require.Equal(t, true, out) require.True(t, v.Equal(VisibilityValueBool(true))) require.False(t, v.Equal(VisibilityValueBool(false))) diff --git a/common/archiver/filestore/query_parser_test.go b/common/archiver/filestore/query_parser_test.go index ed1939cb5b7..1b5c8ab607b 100644 --- a/common/archiver/filestore/query_parser_test.go +++ b/common/archiver/filestore/query_parser_test.go @@ -221,7 +221,7 @@ func (s *queryParserSuite) TestParseCloseStatus() { s.NoError(err) s.Equal(tc.parsedQuery.emptyResult, parsedQuery.emptyResult) if !tc.parsedQuery.emptyResult { - s.Equal(tc.parsedQuery.status, parsedQuery.status) + s.EqualValues(tc.parsedQuery.status, parsedQuery.status) } } } diff --git a/common/archiver/filestore/util_test.go b/common/archiver/filestore/util_test.go index 5a9901e3fc3..ff994157f50 100644 --- a/common/archiver/filestore/util_test.go +++ b/common/archiver/filestore/util_test.go @@ -147,7 +147,7 @@ func (s *UtilSuite) TestListFilesByPrefix() { } actualFileNames, err := listFilesByPrefix(dir, "file_") s.NoError(err) - s.Len(actualFileNames, len(expectedFileNames)) + s.Equal(len(expectedFileNames), len(actualFileNames)) } func (s *UtilSuite) TestEncodeDecodeHistoryBatches() { @@ -398,16 +398,16 @@ func (s *UtilSuite) TestSerializeDeserializeGetHistoryToken() { } serializedToken, err := serializeToken(token) - s.NoError(err) + s.Nil(err) deserializedToken, err := deserializeGetHistoryToken(serializedToken) - s.NoError(err) + s.Nil(err) s.Equal(token, deserializedToken) } func (s *UtilSuite) createFile(dir string, filename string) { err := os.WriteFile(filepath.Join(dir, filename), []byte("file contents"), testFileMode) - s.NoError(err) + s.Nil(err) } func (s *UtilSuite) assertFileExists(filepath string) { diff --git a/common/archiver/gcloud/connector/client_test.go b/common/archiver/gcloud/connector/client_test.go index 87278fccf8c..10c32a9dfc4 100644 --- a/common/archiver/gcloud/connector/client_test.go +++ b/common/archiver/gcloud/connector/client_test.go @@ -240,7 +240,7 @@ func (s *clientSuite) TestQuery() { s.Require().NoError(err) fileNames, err = storageWrapper.Query(ctx, URI, "7478875943689868082123907395549832634615673687049942026838") s.Require().NoError(err) - s.Equal("fileName_01", strings.Join(fileNames, ", ")) + s.Equal(strings.Join(fileNames, ", "), "fileName_01") } func (s *clientSuite) TestQueryWithFilter() { @@ -277,7 +277,7 @@ func (s *clientSuite) TestQueryWithFilter() { fileNames, _, _, err = storageWrapper.QueryWithFilters(ctx, URI, "closeTimeout_2020-02-27T09:42:28Z", 0, 0, []connector.Precondition{newWorkflowIDPrecondition("4418294404690464320")}) s.Require().NoError(err) - s.Equal("closeTimeout_2020-02-27T09:42:28Z_12851121011173788097_4418294404690464320_15619178330501475177.visibility", strings.Join(fileNames, ", ")) + s.Equal(strings.Join(fileNames, ", "), "closeTimeout_2020-02-27T09:42:28Z_12851121011173788097_4418294404690464320_15619178330501475177.visibility") } func newWorkflowIDPrecondition(workflowID string) connector.Precondition { diff --git a/common/archiver/gcloud/util_test.go b/common/archiver/gcloud/util_test.go index 232562c8e60..26f335d182e 100644 --- a/common/archiver/gcloud/util_test.go +++ b/common/archiver/gcloud/util_test.go @@ -92,10 +92,10 @@ func (s *utilSuite) TestSerializeDeserializeGetHistoryToken() { } serializedToken, err := serializeToken(token) - s.NoError(err) + s.Nil(err) deserializedToken, err := deserializeGetHistoryToken(serializedToken) - s.NoError(err) + s.Nil(err) s.Equal(token, deserializedToken) } @@ -144,7 +144,7 @@ func (s *utilSuite) TestWorkflowIdPrecondition() { } for _, testCase := range testCases { - s.Equal(testCase.expectedResult, newWorkflowIDPrecondition(testCase.workflowID)(testCase.fileName)) + s.Equal(newWorkflowIDPrecondition(testCase.workflowID)(testCase.fileName), testCase.expectedResult) } } @@ -177,7 +177,7 @@ func (s *utilSuite) TestRunIdPrecondition() { } for _, testCase := range testCases { - s.Equal(testCase.expectedResult, newRunIDPrecondition(testCase.runID)(testCase.fileName)) + s.Equal(newRunIDPrecondition(testCase.runID)(testCase.fileName), testCase.expectedResult) } } @@ -214,7 +214,7 @@ func (s *utilSuite) TestWorkflowTypeNamePrecondition() { } for _, testCase := range testCases { - s.Equal(testCase.expectedResult, newWorkflowTypeNamePrecondition(testCase.workflowTypeName)(testCase.fileName)) + s.Equal(newWorkflowTypeNamePrecondition(testCase.workflowTypeName)(testCase.fileName), testCase.expectedResult) } } diff --git a/common/archiver/history_iterator_test.go b/common/archiver/history_iterator_test.go index 2765c546a5d..be1e86f1ab6 100644 --- a/common/archiver/history_iterator_test.go +++ b/common/archiver/history_iterator_test.go @@ -99,7 +99,7 @@ func (s *HistoryIteratorSuite) TestReadHistory_Success_EventsV2() { itr := s.constructTestHistoryIterator(s.mockExecutionMgr, testDefaultTargetHistoryBlobSize, nil) history, err := itr.readHistory(context.Background(), common.FirstEventID) s.NoError(err) - s.Empty(history) + s.Len(history, 0) } // In the following test: @@ -325,7 +325,7 @@ func (s *HistoryIteratorSuite) TestNext_Fail_IteratorDepleted() { // set target history batches such that a single call to next will read all of history itr := s.constructTestHistoryIterator(s.mockExecutionMgr, 16*testDefaultHistoryEventSize, nil) blob, err := itr.Next(context.Background()) - s.NoError(err) + s.Nil(err) expectedIteratorState := historyIteratorState{ // when iteration is finished page token is not advanced @@ -561,7 +561,7 @@ func (s *HistoryIteratorSuite) TestNext_Success_SameHistoryDifferentPage() { s.NoError(err) s.Equal(history1.Header, history2.Header) - s.Len(history2.Body, len(history1.Body)) + s.Equal(len(history1.Body), len(history2.Body)) s.Equal(expectedFirstEventID[i], history1.Body[0].Events[0].GetEventId()) s.Equal(expectedFirstEventID[i], history2.Body[0].Events[0].GetEventId()) } diff --git a/common/archiver/s3store/util_test.go b/common/archiver/s3store/util_test.go index 9b5b831c8d4..34d5a629254 100644 --- a/common/archiver/s3store/util_test.go +++ b/common/archiver/s3store/util_test.go @@ -10,10 +10,11 @@ func TestConstructVisibilitySearchPrefix(t *testing.T) { t.Parallel() assert.Equal( t, - "path/namespaceID/visibility", constructVisibilitySearchPrefix( + constructVisibilitySearchPrefix( "path", "namespaceID", ), + "path/namespaceID/visibility", ) } @@ -21,12 +22,13 @@ func TestConstructIndexedVisibilitySearchPrefix(t *testing.T) { t.Parallel() assert.Equal( t, - "path/namespaceID/visibility/primaryIndexKey/primaryIndexValue/secondaryIndexType", constructIndexedVisibilitySearchPrefix( + constructIndexedVisibilitySearchPrefix( "/path", "namespaceID", "primaryIndexKey", "primaryIndexValue", "secondaryIndexType", ), + "path/namespaceID/visibility/primaryIndexKey/primaryIndexValue/secondaryIndexType", ) } diff --git a/common/persistence/client/quotas_test.go b/common/persistence/client/quotas_test.go index 6063089b398..874fdcf4413 100644 --- a/common/persistence/client/quotas_test.go +++ b/common/persistence/client/quotas_test.go @@ -62,7 +62,7 @@ func (s *quotasSuite) TestBackgroundTypeAPIPriorityOverrideMapping() { func (s *quotasSuite) TestRequestPrioritiesOrdered() { for idx := range RequestPrioritiesOrdered[1:] { - s.Less(RequestPrioritiesOrdered[idx], RequestPrioritiesOrdered[idx+1]) + s.True(RequestPrioritiesOrdered[idx] < RequestPrioritiesOrdered[idx+1]) } } diff --git a/common/persistence/history_node_util_test.go b/common/persistence/history_node_util_test.go index 10cd187c72d..af82a63c149 100644 --- a/common/persistence/history_node_util_test.go +++ b/common/persistence/history_node_util_test.go @@ -65,7 +65,7 @@ func (s *historyNodeMetadataSuite) TestIndexNodeIDToNode() { for nodeID := common.FirstEventID; nodeID < int64(numNodeIDs+1); nodeID++ { nodes := nodeIDToNode[int64(nodeID)] for i := 1; i < nodePerNodeID; i++ { - s.GreaterOrEqual(nodes[i-1].transactionID, nodes[i].transactionID) + s.True(nodes[i-1].transactionID >= nodes[i].transactionID) } } } diff --git a/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go b/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go index 44e3bcf26f5..1a6481cd60f 100644 --- a/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go +++ b/common/persistence/nosql/nosqlplugin/cassandra/translator/fixed_address_translator_test.go @@ -60,5 +60,5 @@ func (s *fixedTranslatorPluginTestSuite) TestFixedAddressTranslator() { s.Equal(ipToExpect, translatedHost) s.Equal(6001, translatedPort) - s.NoError(err) + s.Equal(nil, err) } diff --git a/common/persistence/query_util_test.go b/common/persistence/query_util_test.go index 7f17fc79801..0d7d0dbb845 100644 --- a/common/persistence/query_util_test.go +++ b/common/persistence/query_util_test.go @@ -61,7 +61,7 @@ func (s *queryUtilSuite) TestLoadAndSplitQueryFromReaders() { ` statements, err := LoadAndSplitQueryFromReaders([]io.Reader{bytes.NewBufferString(input)}) s.NoError(err) - s.Len(statements, 4) + s.Equal(4, len(statements)) s.Equal( `DO LANGUAGE 'plpgsql' $$ BEGIN diff --git a/common/persistence/serialization/task_serializers_test.go b/common/persistence/serialization/task_serializers_test.go index 44d1ae034b9..61014fcaae5 100644 --- a/common/persistence/serialization/task_serializers_test.go +++ b/common/persistence/serialization/task_serializers_test.go @@ -475,8 +475,8 @@ func (s *taskSerializerSuite) TestArchiveExecutionTask() { TaskID: rand.Int63(), Version: rand.Int63(), } - s.Equal(tasks.CategoryArchival, task.GetCategory()) - s.Equal(enumsspb.TASK_TYPE_ARCHIVAL_ARCHIVE_EXECUTION, task.GetType()) + s.Assert().Equal(tasks.CategoryArchival, task.GetCategory()) + s.Assert().Equal(enumsspb.TASK_TYPE_ARCHIVAL_ARCHIVE_EXECUTION, task.GetType()) s.assertEqualTasks(task) } @@ -534,8 +534,8 @@ func (s *taskSerializerSuite) TestStateMachineOutboundTask() { Destination: "foo", } - s.Equal(tasks.CategoryOutbound, task.GetCategory()) - s.Equal(enumsspb.TASK_TYPE_STATE_MACHINE_OUTBOUND, task.GetType()) + s.Assert().Equal(tasks.CategoryOutbound, task.GetCategory()) + s.Assert().Equal(enumsspb.TASK_TYPE_STATE_MACHINE_OUTBOUND, task.GetType()) blob, err := s.serializer.SerializeTask(task) s.NoError(err) @@ -585,8 +585,8 @@ func (s *taskSerializerSuite) TestStateMachineTimerTask() { Version: rand.Int63(), } - s.Equal(tasks.CategoryTimer, task.GetCategory()) - s.Equal(enumsspb.TASK_TYPE_STATE_MACHINE_TIMER, task.GetType()) + s.Assert().Equal(tasks.CategoryTimer, task.GetCategory()) + s.Assert().Equal(enumsspb.TASK_TYPE_STATE_MACHINE_TIMER, task.GetType()) blob, err := s.serializer.SerializeTask(task) s.NoError(err) diff --git a/common/persistence/sql/sqlplugin/mysql/session/session_test.go b/common/persistence/sql/sqlplugin/mysql/session/session_test.go index 2026b79e4b5..185a2990ef9 100644 --- a/common/persistence/sql/sqlplugin/mysql/session/session_test.go +++ b/common/persistence/sql/sqlplugin/mysql/session/session_test.go @@ -135,7 +135,7 @@ func (s *sessionTestSuite) TestBuildDSN() { } s.True(strings.HasPrefix(out, tc.outURLPath), "invalid url path") tokens := strings.Split(out, "?") - s.Len(tokens, 2, "invalid url") + s.Equal(2, len(tokens), "invalid url") qry, err := url.Parse("?" + tokens[1]) s.NoError(err) wantAttrs := buildExpectedURLParams(dbKind, tc.in.ConnectAttributes, tc.outIsolationKey, tc.outIsolationVal) diff --git a/common/persistence/sql/sqlplugin/tests/history_transfer_task.go b/common/persistence/sql/sqlplugin/tests/history_transfer_task.go index 237943b81d9..18e638dcf56 100644 --- a/common/persistence/sql/sqlplugin/tests/history_transfer_task.go +++ b/common/persistence/sql/sqlplugin/tests/history_transfer_task.go @@ -170,7 +170,7 @@ func (s *historyHistoryTransferTaskSuite) TestInsertSelect_Multiple() { rows, err := s.store.RangeSelectFromTransferTasks(newExecutionContext(), filter) s.NoError(err) s.NotEmpty(rows) - s.LessOrEqual(len(rows), filter.PageSize) + s.True(len(rows) <= filter.PageSize) for index := range rows { rows[index].ShardID = shardID } diff --git a/common/persistence/sql/sqlplugin/tests/history_visibility_task.go b/common/persistence/sql/sqlplugin/tests/history_visibility_task.go index 8d7e232db63..21ae5614e68 100644 --- a/common/persistence/sql/sqlplugin/tests/history_visibility_task.go +++ b/common/persistence/sql/sqlplugin/tests/history_visibility_task.go @@ -170,7 +170,7 @@ func (s *historyHistoryVisibilityTaskSuite) TestInsertSelect_Multiple() { rows, err := s.store.RangeSelectFromVisibilityTasks(newExecutionContext(), filter) s.NoError(err) s.NotEmpty(rows) - s.LessOrEqual(len(rows), filter.PageSize) + s.True(len(rows) <= filter.PageSize) for index := range rows { rows[index].ShardID = shardID } diff --git a/common/persistence/tests/execution_mutable_state.go b/common/persistence/tests/execution_mutable_state.go index 7ab9fb7a4a5..ccb415a7c0c 100644 --- a/common/persistence/tests/execution_mutable_state.go +++ b/common/persistence/tests/execution_mutable_state.go @@ -2728,7 +2728,7 @@ func (s *ExecutionMutableStateSuite) assertHEWithDB( if !assertPrefix { s.Nil(resp.NextPageToken) } - s.Len(resp.HistoryEvents, len(historyEvents)) + s.Equal(len(historyEvents), len(resp.HistoryEvents)) for i, event := range historyEvents { s.ProtoEqual(event, resp.HistoryEvents[i]) } diff --git a/common/persistence/tests/execution_mutable_state_task.go b/common/persistence/tests/execution_mutable_state_task.go index 9b87eb0323f..62b7f25ba6d 100644 --- a/common/persistence/tests/execution_mutable_state_task.go +++ b/common/persistence/tests/execution_mutable_state_task.go @@ -474,7 +474,7 @@ func (s *ExecutionMutableStateTaskSuite) TestGetTimerTasksOrdered() { 10, ) s.Len(loadedTasks, 2) - s.Negative(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey())) + s.True(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey()) < 0) } func (s *ExecutionMutableStateTaskSuite) TestGetScheduledTasksOrdered() { @@ -516,7 +516,7 @@ func (s *ExecutionMutableStateTaskSuite) TestGetScheduledTasksOrdered() { 10, ) s.Len(loadedTasks, 2) - s.Negative(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey())) + s.True(loadedTasks[0].GetKey().CompareTo(loadedTasks[1].GetKey()) < 0) err = s.ExecutionManager.RangeCompleteHistoryTasks(s.Ctx, &p.RangeCompleteHistoryTasksRequest{ ShardID: s.ShardID, @@ -584,7 +584,7 @@ func (s *ExecutionMutableStateTaskSuite) PaginateTasks( for { response, err := s.ExecutionManager.GetHistoryTasks(s.Ctx, request) s.NoError(err) - s.LessOrEqual(len(response.Tasks), batchSize) + s.True(len(response.Tasks) <= batchSize) loadedTasks = append(loadedTasks, response.Tasks...) if len(response.NextPageToken) == 0 { break diff --git a/common/persistence/tests/nexus_endpoint_suite.go b/common/persistence/tests/nexus_endpoint_suite.go index b924a169231..45e6305125e 100644 --- a/common/persistence/tests/nexus_endpoint_suite.go +++ b/common/persistence/tests/nexus_endpoint_suite.go @@ -57,7 +57,7 @@ func testNexusEndpointsStoreSteadyState(t *testing.T, store persistence.NexusEnd // List when table is empty resp, err := store.ListNexusEndpoints(ctx, &persistence.ListNexusEndpointsRequest{PageSize: 10}) require.NoError(t, err) - require.Empty(t, resp.Endpoints) + require.Len(t, resp.Endpoints, 0) require.Equal(t, tableVersion.Load(), resp.TableVersion) // Create an endpoint @@ -172,7 +172,7 @@ func testNexusEndpointsStoreSteadyState(t *testing.T, store persistence.NexusEnd LastKnownTableVersion: tableVersion.Load(), }) require.NoError(t, err) - require.Empty(t, resp.Endpoints) + require.Len(t, resp.Endpoints, 0) }) } diff --git a/common/persistence/tests/visibility_persistence_suite.go b/common/persistence/tests/visibility_persistence_suite.go index 4fda1f6d026..15e77be9f89 100644 --- a/common/persistence/tests/visibility_persistence_suite.go +++ b/common/persistence/tests/visibility_persistence_suite.go @@ -137,8 +137,8 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibility() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.NoError(err1) - s.Len(resp.Executions, 1) + s.Nil(err1) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(startReq, resp.Executions[0]) closeReq := s.createClosedWorkflowRecord( @@ -160,8 +160,8 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibility() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.NoError(err3) - s.Empty(resp.Executions) + s.Nil(err3) + s.Equal(0, len(resp.Executions)) // ListClosedWorkflowExecutions resp, err4 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -176,8 +176,8 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibility() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.NoError(err4) - s.Len(resp.Executions, 1) + s.Nil(err4) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closeReq, resp.Executions[0]) } @@ -209,7 +209,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityTimeSkew() { ), }) s.NoError(err1) - s.Len(resp.Executions, 1) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord, resp.Executions[0]) closedRecord := s.createClosedWorkflowRecord( @@ -232,7 +232,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityTimeSkew() { ), }) s.NoError(err3) - s.Empty(resp.Executions) + s.Equal(0, len(resp.Executions)) // ListClosedWorkflowExecutions resp, err4 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -248,7 +248,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityTimeSkew() { ), }) s.NoError(err4) - s.Len(resp.Executions, 1) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closedRecord, resp.Executions[0]) } @@ -284,7 +284,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityShortWorkflow() { ), }) s.NoError(err3) - s.Empty(resp.Executions) + s.Equal(0, len(resp.Executions)) // ListClosedWorkflowExecutions resp, err4 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -300,7 +300,7 @@ func (s *VisibilityPersistenceSuite) TestBasicVisibilityShortWorkflow() { ), }) s.NoError(err4) - s.Len(resp.Executions, 1) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closedRecord, resp.Executions[0]) } @@ -342,8 +342,8 @@ func (s *VisibilityPersistenceSuite) TestVisibilityPagination() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.NoError(err2) - s.Len(resp.Executions, 1) + s.Nil(err2) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord2, resp.Executions[0]) // Use token to get the second one @@ -360,8 +360,8 @@ func (s *VisibilityPersistenceSuite) TestVisibilityPagination() { ), NextPageToken: resp.NextPageToken, }) - s.NoError(err3) - s.Len(resp.Executions, 1) + s.Nil(err3) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // It is possible to not return non empty token which is going to return empty result @@ -380,8 +380,8 @@ func (s *VisibilityPersistenceSuite) TestVisibilityPagination() { ), NextPageToken: resp.NextPageToken, }) - s.NoError(err4) - s.Empty(resp.Executions) + s.Nil(err4) + s.Equal(0, len(resp.Executions)) } } @@ -422,7 +422,7 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStartTime() { ), }) s.NoError(err) - s.Len(resp.Executions, 1) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord2, resp.Executions[0]) // List with WorkflowType filter in query string @@ -432,8 +432,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStartTime() { PageSize: 2, Query: queryStr, }) - s.NoError(err) - s.Len(resp.Executions, 1) + s.Nil(err) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord2, resp.Executions[0]) queryStr = fmt.Sprintf(`StartTime BETWEEN "%v" AND "%v"`, time.Now().Add(-3*time.Hour).Format(time.RFC3339Nano), time.Now().Format(time.RFC3339Nano)) @@ -442,16 +442,16 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStartTime() { PageSize: 2, Query: queryStr, }) - s.NoError(err) - s.Len(resp.Executions, 2) + s.Nil(err) + s.Equal(2, len(resp.Executions)) resp, err = s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ NamespaceID: testNamespaceUUID, PageSize: 2, Query: queryStr + ` AND WorkflowType = "visibility-workflow-1"`, }) - s.NoError(err) - s.Len(resp.Executions, 1) + s.Nil(err) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) } @@ -493,8 +493,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { "visibility-workflow-1", ), }) - s.NoError(err2) - s.Len(resp.Executions, 1) + s.Nil(err2) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // List with WorkflowType filter in query string @@ -503,8 +503,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { PageSize: 2, Query: `WorkflowType = "visibility-workflow-1"`, }) - s.NoError(err) - s.Len(resp.Executions, 1) + s.Nil(err) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // Close both executions @@ -530,8 +530,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { "visibility-workflow-2", ), }) - s.NoError(err5) - s.Len(resp.Executions, 1) + s.Nil(err5) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) // List with WorkflowType filter in query string @@ -540,8 +540,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByType() { PageSize: 2, Query: `WorkflowType = "visibility-workflow-2"`, }) - s.NoError(err) - s.Len(resp.Executions, 1) + s.Nil(err) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) } @@ -583,8 +583,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { "visibility-filtering-test1", ), }) - s.NoError(err2) - s.Len(resp.Executions, 1) + s.Nil(err2) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // List workflow with workflowID filter in query string @@ -593,8 +593,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { PageSize: 2, Query: `WorkflowId = "visibility-filtering-test1"`, }) - s.NoError(err) - s.Len(resp.Executions, 1) + s.Nil(err) + s.Equal(1, len(resp.Executions)) s.assertOpenExecutionEquals(openRecord1, resp.Executions[0]) // Close both executions @@ -620,8 +620,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { "visibility-filtering-test2", ), }) - s.NoError(err5) - s.Len(resp.Executions, 1) + s.Nil(err5) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) // List workflow with workflowID filter in query string @@ -630,8 +630,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByWorkflowID() { PageSize: 2, Query: `WorkflowId = "visibility-filtering-test2"`, }) - s.NoError(err) - s.Len(resp.Executions, 1) + s.Nil(err) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closedRecord2, resp.Executions[0]) } @@ -682,8 +682,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStatus() { enumspb.WORKFLOW_EXECUTION_STATUS_FAILED, ), }) - s.NoError(err4) - s.Len(resp.Executions, 1) + s.Nil(err4) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closeRecord2, resp.Executions[0]) resp, err := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -691,8 +691,8 @@ func (s *VisibilityPersistenceSuite) TestFilteringByStatus() { PageSize: 5, Query: `ExecutionStatus = "Failed"`, }) - s.NoError(err) - s.Len(resp.Executions, 1) + s.Nil(err) + s.Equal(1, len(resp.Executions)) s.assertClosedExecutionEquals(closeRecord2, resp.Executions[0]) } @@ -738,8 +738,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.NoError(err3) - s.Len(resp.Executions, closedRows) + s.Nil(err3) + s.Equal(closedRows, len(resp.Executions)) // Delete closed workflow for _, row := range resp.Executions { @@ -748,7 +748,7 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { WorkflowID: row.GetExecution().GetWorkflowId(), RunID: row.GetExecution().GetRunId(), }) - s.NoError(err4) + s.Nil(err4) } // ListClosedWorkflowExecutions @@ -764,8 +764,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, ), }) - s.NoError(err5) - s.Empty(resp.Executions) + s.Nil(err5) + s.Equal(0, len(resp.Executions)) // ListOpenWorkflowExecutions resp, err6 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ @@ -780,8 +780,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { ), PageSize: 10, }) - s.NoError(err6) - s.Len(resp.Executions, openRows-closedRows) + s.Nil(err6) + s.Equal(openRows-closedRows, len(resp.Executions)) // Delete open workflow for _, row := range resp.Executions { err7 := s.VisibilityMgr.DeleteWorkflowExecution(s.ctx, &manager.VisibilityDeleteWorkflowExecutionRequest{ @@ -789,7 +789,7 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { WorkflowID: row.GetExecution().GetWorkflowId(), RunID: row.GetExecution().GetRunId(), }) - s.NoError(err7) + s.Nil(err7) } resp, err8 := s.VisibilityMgr.ListWorkflowExecutions(s.ctx, &manager.ListWorkflowExecutionsRequestV2{ NamespaceID: testNamespaceUUID, @@ -801,8 +801,8 @@ func (s *VisibilityPersistenceSuite) TestDeleteWorkflow() { ), PageSize: 10, }) - s.NoError(err8) - s.Empty(resp.Executions) + s.Nil(err8) + s.Equal(0, len(resp.Executions)) } // TestUpsertWorkflowExecution test @@ -1063,7 +1063,7 @@ func (s *VisibilityPersistenceSuite) listWithPagination(namespaceID namespace.ID PageSize: pageSize, Query: "", }) - s.NoError(err) + s.Nil(err) executions = append(executions, resp.Executions...) for len(resp.NextPageToken) > 0 { @@ -1073,7 +1073,7 @@ func (s *VisibilityPersistenceSuite) listWithPagination(namespaceID namespace.ID Query: "", NextPageToken: resp.NextPageToken, }) - s.NoError(err) + s.Nil(err) executions = append(executions, resp.Executions...) } @@ -1101,7 +1101,7 @@ func (s *VisibilityPersistenceSuite) createClosedWorkflowRecord( HistoryLength: 5, } err := s.VisibilityMgr.RecordWorkflowExecutionClosed(s.ctx, closeReq) - s.NoError(err) + s.Nil(err) return closeReq } @@ -1131,7 +1131,7 @@ func (s *VisibilityPersistenceSuite) createOpenWorkflowRecord( }, } err := s.VisibilityMgr.RecordWorkflowExecutionStarted(s.ctx, startReq) - s.NoError(err) + s.Nil(err) return startReq } @@ -1154,6 +1154,6 @@ func (s *VisibilityPersistenceSuite) assertOpenExecutionEquals( s.Equal(req.WorkflowTypeName, resp.GetType().GetName()) s.Equal(persistence.UnixMilliseconds(req.StartTime), persistence.UnixMilliseconds(timestamp.TimeValue(resp.GetStartTime()))) s.Nil(resp.CloseTime) - s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, resp.Status) + s.Equal(resp.Status, enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING) s.Zero(resp.HistoryLength) } diff --git a/common/persistence/visibility/store/elasticsearch/processor_test.go b/common/persistence/visibility/store/elasticsearch/processor_test.go index b8136fbd57e..119745ef4d2 100644 --- a/common/persistence/visibility/store/elasticsearch/processor_test.go +++ b/common/persistence/visibility/store/elasticsearch/processor_test.go @@ -436,7 +436,7 @@ func (s *processorSuite) TestExtractVisibilityTaskKey() { request := elastic.NewBulkIndexRequest() s.mockMetricHandler.EXPECT().Counter(metrics.ElasticsearchBulkProcessorCorruptedData.Name()).Return(metrics.NoopCounterMetricFunc) visibilityTaskKey := s.esProcessor.extractVisibilityTaskKey(request) - s.Empty(visibilityTaskKey) + s.Equal("", visibilityTaskKey) m := map[string]any{ sadefs.VisibilityTaskKey: 1, @@ -456,7 +456,7 @@ func (s *processorSuite) TestExtractVisibilityTaskKey_Delete() { // ensure compatible with dependency source, err := request.Source() s.NoError(err) - s.Len(source, 1) + s.Equal(1, len(source)) var body map[string]map[string]any err = json.Unmarshal([]byte(source[0]), &body) s.NoError(err) @@ -465,7 +465,7 @@ func (s *processorSuite) TestExtractVisibilityTaskKey_Delete() { s.mockMetricHandler.EXPECT().Counter(metrics.ElasticsearchBulkProcessorCorruptedData.Name()).Return(metrics.NoopCounterMetricFunc) key := s.esProcessor.extractVisibilityTaskKey(request) - s.Empty(key) + s.Equal("", key) id := "id" request.Id(id) @@ -497,7 +497,7 @@ func (s *processorSuite) TestIsResponseSuccess() { func (s *processorSuite) TestErrorReasonFromResponse() { reason := "error reason" resp := &elastic.BulkResponseItem{Status: 400} - s.Empty(extractErrorReason(resp)) + s.Equal("", extractErrorReason(resp)) resp.Error = &elastic.ErrorDetails{Reason: reason} s.Equal(reason, extractErrorReason(resp)) } diff --git a/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go b/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go index 392b30d86b2..21e1226b219 100644 --- a/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go +++ b/common/persistence/visibility/store/elasticsearch/visibility_store_write_test.go @@ -64,7 +64,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionStarted() { s.EqualValues(request.SearchAttributes.GetIndexedFields()["CustomTextField"].Data, fmt.Sprintf("%q", CustomTextField)) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.Equal(request.TaskID, bulkRequest.Version) + s.EqualValues(request.TaskID, bulkRequest.Version) s.Equal("wid~rid", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -97,7 +97,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionStarted_EmptyRequest() { s.False(ok) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.Equal(request.TaskID, bulkRequest.Version) + s.EqualValues(request.TaskID, bulkRequest.Version) s.Equal("~", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -154,7 +154,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionClosed() { s.EqualValues(request.HistoryLength, body[sadefs.HistoryLength]) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.Equal(request.TaskID, bulkRequest.Version) + s.EqualValues(request.TaskID, bulkRequest.Version) s.Equal("wid~rid", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -187,7 +187,7 @@ func (s *ESVisibilitySuite) TestRecordWorkflowExecutionClosed_EmptyRequest() { s.False(ok) s.Equal(client.BulkableRequestTypeIndex, bulkRequest.RequestType) - s.Equal(request.TaskID, bulkRequest.Version) + s.EqualValues(request.TaskID, bulkRequest.Version) s.Equal("~", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) @@ -214,7 +214,7 @@ func (s *ESVisibilitySuite) TestDeleteExecution() { s.Equal("wid~rid", visibilityTaskKey) s.Equal(client.BulkableRequestTypeDelete, bulkRequest.RequestType) - s.Equal(request.TaskID, bulkRequest.Version) + s.EqualValues(request.TaskID, bulkRequest.Version) s.Equal("wid~rid", bulkRequest.ID) s.Equal("test-index", bulkRequest.Index) diff --git a/common/persistence/visibility/store/sql/pagination_token_legacy_test.go b/common/persistence/visibility/store/sql/pagination_token_legacy_test.go index 5eb03aca143..e71623785c1 100644 --- a/common/persistence/visibility/store/sql/pagination_token_legacy_test.go +++ b/common/persistence/visibility/store/sql/pagination_token_legacy_test.go @@ -17,9 +17,9 @@ func TestSerializePageToken(t *testing.T) { } data, err := serializePageTokenLegacy(&token) s.NoError(err) - s.JSONEq( - `{"CloseTime":"2023-03-21T14:20:32Z","StartTime":"2023-03-21T14:10:32Z","RunID":"test-run-id"}`, - string(data), + s.Equal( + []byte(`{"CloseTime":"2023-03-21T14:20:32Z","StartTime":"2023-03-21T14:10:32Z","RunID":"test-run-id"}`), + data, ) } diff --git a/common/persistence/workflow_state_status_validator_test.go b/common/persistence/workflow_state_status_validator_test.go index eeaf285a8d0..bfb49d0b441 100644 --- a/common/persistence/workflow_state_status_validator_test.go +++ b/common/persistence/workflow_state_status_validator_test.go @@ -55,7 +55,7 @@ func (s *workflowStateStatusSuite) TestCreateWorkflowStateStatus_WorkflowStateCr s.Error(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED, enumspb.WORKFLOW_EXECUTION_STATUS_PAUSED)) for _, status := range statuses { - s.Error(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_CREATED, status)) + s.NotNil(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_CREATED, status)) } } @@ -72,7 +72,7 @@ func (s *workflowStateStatusSuite) TestCreateWorkflowStateStatus_WorkflowStateRu s.NoError(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING)) for _, status := range statuses { - s.Error(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, status)) + s.NotNil(ValidateCreateWorkflowStateStatus(enumsspb.WORKFLOW_EXECUTION_STATE_RUNNING, status)) } } diff --git a/common/searchattribute/manager_test.go b/common/searchattribute/manager_test.go index 203b109ae81..3d2df087526 100644 --- a/common/searchattribute/manager_test.go +++ b/common/searchattribute/manager_test.go @@ -131,7 +131,7 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_Error() { s.logger.Expect(testlogger.Error, "failed to refresh search attributes") searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.Error(err) - s.Empty(searchAttributes.Custom()) + s.Len(searchAttributes.Custom(), 0) } func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_NotFoundError() { @@ -140,12 +140,12 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_NotFoundErro s.mockClusterMetadataManager.EXPECT().GetCurrentClusterMetadata(gomock.Any()).Return(nil, serviceerror.NewNotFound("not found")) searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Empty(searchAttributes.Custom()) + s.Len(searchAttributes.Custom(), 0) // GetClusterMetadata() shouldn't be called, because results are cached. searchAttributes, err = s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Empty(searchAttributes.Custom()) + s.Len(searchAttributes.Custom(), 0) } func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_UnavailableError() { @@ -156,7 +156,7 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_UnavailableE s.logger.Expect(testlogger.Error, "failed to refresh search attributes") searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.Error(err) - s.Empty(searchAttributes.Custom()) + s.Len(searchAttributes.Custom(), 0) // Move time forward s.timeSource.Update(time.Date(2020, 8, 22, 1, 1, 0, 0, time.UTC)) @@ -231,13 +231,13 @@ func (s *searchAttributesManagerSuite) TestGetSearchAttributesCache_RefreshIfAbs searchAttributes, err := s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Empty(searchAttributes.Custom()) + s.Len(searchAttributes.Custom(), 0) s.timeSource.Update(time.Date(2020, 8, 22, 1, 0, 1, 0, time.UTC)) searchAttributes, err = s.manager.GetSearchAttributes("index-name", false) s.NoError(err) - s.Empty(searchAttributes.Custom()) + s.Len(searchAttributes.Custom(), 0) s.forceCacheRefresh = true searchAttributes, err = s.manager.GetSearchAttributes("index-name", false) diff --git a/common/searchattribute/stringify_test.go b/common/searchattribute/stringify_test.go index 02399da5f09..e4ac2b5f2ec 100644 --- a/common/searchattribute/stringify_test.go +++ b/common/searchattribute/stringify_test.go @@ -405,7 +405,7 @@ func (s *StringifySuite) Test_parseJSONArray() { } for _, testCase := range testCases2 { res, err := parseJSONArray(testCase.input, testCase.indexedValueType) - s.Error(err) + s.NotNil(err) s.Nil(res) } } diff --git a/common/tasks/group_by_scheduler_test.go b/common/tasks/group_by_scheduler_test.go index 7932173ce9e..84f5dece2fb 100644 --- a/common/tasks/group_by_scheduler_test.go +++ b/common/tasks/group_by_scheduler_test.go @@ -71,10 +71,10 @@ func TestSchedulerLogic(t *testing.T) { task4b.EXPECT().Abort().Times(1) require.True(t, sched.TrySubmit(task4b)) - require.Len(t, scheds, 2) - require.Len(t, scheds["a"].buffer, 1) + require.Equal(t, 2, len(scheds)) + require.Equal(t, 1, len(scheds["a"].buffer)) require.Equal(t, "a", scheds["a"].buffer[0].(RunnableTask).Task.(taskWithID).ID) - require.Len(t, scheds["b"].buffer, 1) + require.Equal(t, 1, len(scheds["b"].buffer)) require.Equal(t, "b", scheds["b"].buffer[0].(RunnableTask).Task.(taskWithID).ID) // Stop shuts down all groups. require.True(t, scheds["a"].stopped && scheds["b"].stopped) diff --git a/common/tqid/task_queue_id_test.go b/common/tqid/task_queue_id_test.go index 5ebff7c9007..487d799a34e 100644 --- a/common/tqid/task_queue_id_test.go +++ b/common/tqid/task_queue_id_test.go @@ -1,6 +1,7 @@ package tqid import ( + "errors" "math/rand" "strconv" "testing" @@ -44,7 +45,7 @@ func TestFromProtoPartition_Sticky(t *testing.T) { a.Equal(nsid, p.NamespaceId()) a.Equal(taskType, p.TaskType()) a.Equal(kind, p.Kind()) - a.Empty(p.TaskQueue().Name()) + a.Equal("", p.TaskQueue().Name()) a.Equal(stickyName, p.(*StickyPartition).StickyName()) a.Equal(stickyName, p.RpcName()) a.False(p.IsRoot()) @@ -53,7 +54,7 @@ func TestFromProtoPartition_Sticky(t *testing.T) { proto.Name = "/_sys/my-basic-tq-name/23" _, err = PartitionFromProto(proto, nsid, taskType) // sticky queue cannot have non-zero prtn - a.ErrorIs(err, ErrNonZeroSticky) + a.True(errors.Is(err, ErrNonZeroSticky)) } func TestFromProtoPartition_WorkerCommands(t *testing.T) { diff --git a/components/callbacks/statemachine_test.go b/components/callbacks/statemachine_test.go index df50252d2f3..205c992d552 100644 --- a/components/callbacks/statemachine_test.go +++ b/components/callbacks/statemachine_test.go @@ -44,10 +44,10 @@ func TestValidTransitions(t *testing.T) { require.False(t, callback.LastAttemptFailure.GetApplicationFailureInfo().NonRetryable) require.Equal(t, currentTime, callback.LastAttemptCompleteTime.AsTime()) dt := currentTime.Add(time.Second).Sub(callback.NextAttemptScheduleTime.AsTime()) - require.Less(t, dt, time.Millisecond*200) + require.True(t, dt < time.Millisecond*200) // Assert backoff task is generated - require.Len(t, out.Tasks, 1) + require.Equal(t, 1, len(out.Tasks)) boTask := out.Tasks[0].(callbacks.BackoffTask) require.Equal(t, callback.NextAttemptScheduleTime.AsTime(), boTask.Deadline()) @@ -64,7 +64,7 @@ func TestValidTransitions(t *testing.T) { require.Nil(t, callback.NextAttemptScheduleTime) // Assert callback task is generated - require.Len(t, out.Tasks, 1) + require.Equal(t, 1, len(out.Tasks)) cbTask := out.Tasks[0].(callbacks.InvocationTask) require.Equal(t, "http://address:666", cbTask.Destination()) @@ -84,7 +84,7 @@ func TestValidTransitions(t *testing.T) { require.Nil(t, callback.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Empty(t, out.Tasks) + require.Equal(t, 0, len(out.Tasks)) // Reset back to scheduled callback = dup @@ -104,7 +104,7 @@ func TestValidTransitions(t *testing.T) { require.Nil(t, callback.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Empty(t, out.Tasks) + require.Equal(t, 0, len(out.Tasks)) } func TestCompareState(t *testing.T) { @@ -184,9 +184,9 @@ func TestCompareState(t *testing.T) { if tc.sign == 0 { require.Equal(t, 0, res) } else if tc.sign > 0 { - require.Positive(t, res) + require.Greater(t, res, 0) } else { - require.Negative(t, res) + require.Greater(t, 0, res) } }) } diff --git a/components/nexusoperations/executors_test.go b/components/nexusoperations/executors_test.go index 9c63182531e..8c5c430ba16 100644 --- a/components/nexusoperations/executors_test.go +++ b/components/nexusoperations/executors_test.go @@ -141,7 +141,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "pending", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_STARTED, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_STARTED, events[0].EventType) protorequire.ProtoEqual(t, &historypb.NexusOperationStartedEventAttributes{ ScheduledEventId: 1, @@ -186,7 +186,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "successful", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_SUCCEEDED, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_COMPLETED, events[0].EventType) attrs := &historypb.NexusOperationCompletedEventAttributes{ ScheduledEventId: 1, @@ -212,7 +212,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "operation-unsuccessful:failed", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_FAILED, events[0].EventType) attrs := &historypb.NexusOperationFailedEventAttributes{ ScheduledEventId: 1, @@ -273,7 +273,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "operation-unsuccessful:canceled", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_CANCELED, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_CANCELED, events[0].EventType) attrs := &historypb.NexusOperationCanceledEventAttributes{ ScheduledEventId: 1, @@ -327,7 +327,7 @@ func TestProcessInvocationTask(t *testing.T) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, op.State()) require.Equal(t, string(nexus.HandlerErrorTypeInternal), op.LastAttemptFailure.GetNexusHandlerFailureInfo().GetType()) require.Equal(t, "internal server error", op.LastAttemptFailure.Message) - require.Empty(t, events) + require.Equal(t, 0, len(events)) }, }, { @@ -344,7 +344,7 @@ func TestProcessInvocationTask(t *testing.T) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, op.State()) require.NotNil(t, op.LastAttemptFailure.GetApplicationFailureInfo()) require.Regexp(t, "request timed out", op.LastAttemptFailure.Message) - require.Empty(t, events) + require.Equal(t, 0, len(events)) }, }, { @@ -385,7 +385,7 @@ func TestProcessInvocationTask(t *testing.T) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, op.State()) require.NotNil(t, op.LastAttemptFailure.GetApplicationFailureInfo()) require.Regexp(t, "request timed out", op.LastAttemptFailure.Message) - require.Empty(t, events) + require.Equal(t, 0, len(events)) }, }, { @@ -414,7 +414,7 @@ func TestProcessInvocationTask(t *testing.T) { onStartOperation: nil, // This should not be called if the operation has timed out. checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_TIMED_OUT, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) failure := events[0].GetNexusOperationTimedOutEventAttributes().Failure.Cause require.NotNil(t, failure.GetTimeoutFailureInfo()) require.Equal(t, "operation timed out", failure.Message) @@ -428,7 +428,7 @@ func TestProcessInvocationTask(t *testing.T) { onStartOperation: nil, // This should not be called if the endpoint is not found. checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) failure := events[0].GetNexusOperationFailedEventAttributes().Failure.Cause require.Equal(t, string(nexus.HandlerErrorTypeNotFound), failure.GetNexusHandlerFailureInfo().GetType()) require.Equal(t, "endpoint not registered", failure.Message) @@ -442,7 +442,7 @@ func TestProcessInvocationTask(t *testing.T) { onStartOperation: nil, // This should not be called if the endpoint is not found. checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) failure := events[0].GetNexusOperationFailedEventAttributes().Failure.Cause require.Equal(t, string(nexus.HandlerErrorTypeNotFound), failure.GetNexusHandlerFailureInfo().GetType()) require.Equal(t, "endpoint not registered", failure.Message) @@ -468,7 +468,7 @@ func TestProcessInvocationTask(t *testing.T) { checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_STARTED, op.State()) require.Nil(t, op.LastAttemptFailure) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) }, }, { @@ -486,7 +486,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "invalid-operation-token", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Len(t, events, 1) + require.Equal(t, 1, len(events)) failure := events[0].GetNexusOperationFailedEventAttributes().Failure.Cause require.NotNil(t, failure.GetApplicationFailureInfo()) require.Equal(t, "invalid operation token: length exceeds allowed limit (11/10)", failure.Message) @@ -661,7 +661,7 @@ func TestProcessBackoffTask(t *testing.T) { op, err := hsm.MachineData[nexusoperations.Operation](node) require.NoError(t, err) require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_SCHEDULED, op.State()) - require.Empty(t, backend.Events) + require.Equal(t, 0, len(backend.Events)) } func TestProcessTimeoutTask(t *testing.T) { @@ -683,7 +683,7 @@ func TestProcessTimeoutTask(t *testing.T) { op, err := hsm.MachineData[nexusoperations.Operation](node) require.NoError(t, err) require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_TIMED_OUT, op.State()) - require.Len(t, backend.Events, 1) + require.Equal(t, 1, len(backend.Events)) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_TIMED_OUT, backend.Events[0].EventType) protorequire.ProtoEqual(t, &historypb.NexusOperationTimedOutEventAttributes{ ScheduledEventId: 1, @@ -1379,7 +1379,7 @@ func TestProcessCancelationBackoffTask(t *testing.T) { c, err := hsm.MachineData[nexusoperations.Cancelation](node) require.NoError(t, err) require.Equal(t, enumspb.NEXUS_OPERATION_CANCELLATION_STATE_SCHEDULED, c.State()) - require.Empty(t, backend.Events) + require.Equal(t, 0, len(backend.Events)) } // mockNexusOperationRoutingKey is a simple mock implementation of the routing key interface diff --git a/components/nexusoperations/statemachine_test.go b/components/nexusoperations/statemachine_test.go index 4943feacaa8..23fd17fe23c 100644 --- a/components/nexusoperations/statemachine_test.go +++ b/components/nexusoperations/statemachine_test.go @@ -29,7 +29,7 @@ func TestAddChild(t *testing.T) { name: "with timeout", timeout: time.Hour, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Len(t, tasks, 2) + require.Equal(t, 2, len(tasks)) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) require.Equal(t, nexusoperations.TaskTypeScheduleToCloseTimeout, tasks[1].Type()) }, @@ -38,7 +38,7 @@ func TestAddChild(t *testing.T) { name: "without timeout", timeout: 0, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Len(t, tasks, 1) + require.Equal(t, 1, len(tasks)) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) }, }, @@ -65,7 +65,7 @@ func TestAddChild(t *testing.T) { require.NoError(t, err) opLog, err := root.OpLog() require.NoError(t, err) - require.Len(t, opLog, 1) + require.Equal(t, 1, len(opLog)) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) tc.assertTasks(t, transitionOp.Output.Tasks) @@ -226,9 +226,9 @@ func TestRegenerateTasks(t *testing.T) { scheduleToCloseTimeout: time.Hour, state: enumsspb.NEXUS_OPERATION_STATE_SCHEDULED, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Len(t, tasks, 2) + require.Equal(t, 2, len(tasks)) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) - require.Equal(t, "endpoint", tasks[0].(nexusoperations.InvocationTask).EndpointName) + require.Equal(t, tasks[0].(nexusoperations.InvocationTask).EndpointName, "endpoint") require.Equal(t, nexusoperations.TaskTypeScheduleToCloseTimeout, tasks[1].Type()) }, }, @@ -236,7 +236,7 @@ func TestRegenerateTasks(t *testing.T) { name: "scheduled | without timeout", state: enumsspb.NEXUS_OPERATION_STATE_SCHEDULED, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Len(t, tasks, 1) + require.Equal(t, 1, len(tasks)) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) }, }, @@ -245,7 +245,7 @@ func TestRegenerateTasks(t *testing.T) { scheduleToCloseTimeout: time.Hour, state: enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Len(t, tasks, 2) + require.Equal(t, 2, len(tasks)) require.Equal(t, nexusoperations.TaskTypeBackoff, tasks[0].Type()) require.Equal(t, nexusoperations.TaskTypeScheduleToCloseTimeout, tasks[1].Type()) }, @@ -254,7 +254,7 @@ func TestRegenerateTasks(t *testing.T) { name: "backing off | without timeout", state: enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Len(t, tasks, 1) + require.Equal(t, 1, len(tasks)) require.Equal(t, nexusoperations.TaskTypeBackoff, tasks[0].Type()) }, }, @@ -343,10 +343,10 @@ func TestRetry(t *testing.T) { })) opLog, err := node.Parent.OpLog() require.NoError(t, err) - require.Len(t, opLog, 1) + require.Equal(t, 1, len(opLog)) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) - require.Len(t, transitionOp.Output.Tasks, 1) + require.Equal(t, 1, len(transitionOp.Output.Tasks)) boTask := transitionOp.Output.Tasks[0].(nexusoperations.BackoffTask) // nolint:revive op, err := hsm.MachineData[nexusoperations.Operation](node) require.NoError(t, err) @@ -363,10 +363,10 @@ func TestRetry(t *testing.T) { })) opLog, err = node.Parent.OpLog() require.NoError(t, err) - require.Len(t, opLog, 1) + require.Equal(t, 1, len(opLog)) transitionOp, ok = opLog[0].(hsm.TransitionOperation) require.True(t, ok) - require.Len(t, transitionOp.Output.Tasks, 1) + require.Equal(t, 1, len(transitionOp.Output.Tasks)) invocationTask := transitionOp.Output.Tasks[0].(nexusoperations.InvocationTask) // nolint:revive require.Equal(t, "endpoint", invocationTask.EndpointName) op, err = hsm.MachineData[nexusoperations.Operation](node) @@ -464,7 +464,7 @@ func TestCompleteFromAttempt(t *testing.T) { })) opLog, err := node.Parent.OpLog() require.NoError(t, err) - require.Len(t, opLog, 1) + require.Equal(t, 1, len(opLog)) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok, "expected TransitionOperation") require.Empty(t, transitionOp.Output.Tasks) @@ -584,7 +584,7 @@ func TestCompleteExternally(t *testing.T) { })) opLog, err := node.Parent.OpLog() require.NoError(t, err) - require.Len(t, opLog, 1) + require.Equal(t, 1, len(opLog)) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) require.Empty(t, transitionOp.Output.Tasks) @@ -661,10 +661,10 @@ func TestCancelationValidTransitions(t *testing.T) { require.Equal(t, "test", cancelation.LastAttemptFailure.Message) require.Equal(t, currentTime, cancelation.LastAttemptCompleteTime.AsTime()) dt := currentTime.Add(time.Second).Sub(cancelation.NextAttemptScheduleTime.AsTime()) - require.Less(t, dt, time.Millisecond*200) + require.True(t, dt < time.Millisecond*200) // Assert backoff task is generated - require.Len(t, out.Tasks, 1) + require.Equal(t, 1, len(out.Tasks)) boTask := out.Tasks[0].(nexusoperations.CancelationBackoffTask) // nolint:revive require.Equal(t, cancelation.NextAttemptScheduleTime.AsTime(), boTask.Deadline()) @@ -683,7 +683,7 @@ func TestCancelationValidTransitions(t *testing.T) { require.Nil(t, cancelation.NextAttemptScheduleTime) // Assert cancelation task is generated - require.Len(t, out.Tasks, 1) + require.Equal(t, 1, len(out.Tasks)) cbTask := out.Tasks[0].(nexusoperations.CancelationTask) // nolint:revive require.Equal(t, "endpoint", cbTask.EndpointName) @@ -706,7 +706,7 @@ func TestCancelationValidTransitions(t *testing.T) { require.Nil(t, cancelation.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Empty(t, out.Tasks) + require.Equal(t, 0, len(out.Tasks)) // Reset back to scheduled cancelation = dup @@ -729,7 +729,7 @@ func TestCancelationValidTransitions(t *testing.T) { require.Nil(t, cancelation.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Empty(t, out.Tasks) + require.Equal(t, 0, len(out.Tasks)) } func TestCancelationBeforeStarted(t *testing.T) { @@ -858,9 +858,9 @@ func TestOperationCompareState(t *testing.T) { if tc.sign == 0 { require.Equal(t, 0, res) } else if tc.sign > 0 { - require.Positive(t, res) + require.Greater(t, res, 0) } else { - require.Negative(t, res) + require.Greater(t, 0, res) } }) } @@ -935,9 +935,9 @@ func TestCancelationCompareState(t *testing.T) { if tc.sign == 0 { require.Equal(t, 0, res) } else if tc.sign > 0 { - require.Positive(t, res) + require.Greater(t, res, 0) } else { - require.Negative(t, res) + require.Greater(t, 0, res) } }) } diff --git a/components/nexusoperations/workflow/commands_test.go b/components/nexusoperations/workflow/commands_test.go index 7da08528204..1826dc7c4e8 100644 --- a/components/nexusoperations/workflow/commands_test.go +++ b/components/nexusoperations/workflow/commands_test.go @@ -126,7 +126,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("endpoint not found - rejected by config", func(t *testing.T) { @@ -144,7 +144,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("caller namespace unauthorized", func(t *testing.T) { @@ -162,7 +162,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("exceeds max service length", func(t *testing.T) { @@ -180,7 +180,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("exceeds max operation length", func(t *testing.T) { @@ -198,7 +198,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("exceeds max operation header size", func(t *testing.T) { @@ -219,7 +219,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("invalid header keys", func(t *testing.T) { @@ -240,7 +240,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("exceeds max payload size", func(t *testing.T) { @@ -261,7 +261,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.True(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("system endpoint skips payload size validation", func(t *testing.T) { @@ -314,7 +314,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_PENDING_NEXUS_OPERATIONS_LIMIT_EXCEEDED, failWFTErr.Cause) - require.Len(t, tcx.history.Events, 2) + require.Equal(t, 2, len(tcx.history.Events)) }) t.Run("schedule to close timeout capped by run timeout", func(t *testing.T) { @@ -331,7 +331,7 @@ func TestHandleScheduleCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Len(t, tcx.history.Events, 1) + require.Equal(t, 1, len(tcx.history.Events)) require.Equal(t, time.Hour, tcx.history.Events[0].GetNexusOperationScheduledEventAttributes().ScheduleToCloseTimeout.AsDuration()) }) @@ -350,7 +350,7 @@ func TestHandleScheduleCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Len(t, tcx.history.Events, 1) + require.Equal(t, 1, len(tcx.history.Events)) require.Equal(t, time.Minute, tcx.history.Events[0].GetNexusOperationScheduledEventAttributes().ScheduleToCloseTimeout.AsDuration()) }) @@ -441,7 +441,7 @@ func TestHandleScheduleCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Len(t, tcx.history.Events, 1) + require.Equal(t, 1, len(tcx.history.Events)) require.Equal(t, tc.expectedTimeout.AsDuration(), tcx.history.Events[0].GetNexusOperationScheduledEventAttributes().ScheduleToCloseTimeout.AsDuration()) }) } @@ -597,7 +597,7 @@ func TestHandleScheduleCommand(t *testing.T) { UserMetadata: userMetadata, }) require.NoError(t, err) - require.Len(t, tcx.history.Events, 1) + require.Equal(t, 1, len(tcx.history.Events)) event := tcx.history.Events[0] eAttrs := event.GetNexusOperationScheduledEventAttributes() require.Equal(t, cAttrs.Service, eAttrs.Service) @@ -651,7 +651,7 @@ func TestHandleCancelCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_REQUEST_CANCEL_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("operation not found", func(t *testing.T) { @@ -669,7 +669,7 @@ func TestHandleCancelCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_REQUEST_CANCEL_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Empty(t, tcx.history.Events) + require.Equal(t, 0, len(tcx.history.Events)) }) t.Run("operation already completed", func(t *testing.T) { @@ -686,7 +686,7 @@ func TestHandleCancelCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Len(t, tcx.history.Events, 1) + require.Equal(t, 1, len(tcx.history.Events)) event := tcx.history.Events[0] // Complete the operation using CompletedEventDefinition to ensure proper deletion @@ -712,7 +712,7 @@ func TestHandleCancelCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_REQUEST_CANCEL_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Len(t, tcx.history.Events, 1) // Only scheduled event should be recorded. + require.Equal(t, 1, len(tcx.history.Events)) // Only scheduled event should be recorded. }) t.Run("operation already completed - completion buffered", func(t *testing.T) { @@ -729,7 +729,7 @@ func TestHandleCancelCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Len(t, tcx.history.Events, 1) + require.Equal(t, 1, len(tcx.history.Events)) event := tcx.history.Events[0] err = nexusoperations.CompletedEventDefinition{}.Apply(tcx.ms.HSM(), &historypb.HistoryEvent{ @@ -751,7 +751,7 @@ func TestHandleCancelCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Len(t, tcx.history.Events, 2) // Both scheduled and cancel requested events should be recorded + require.Equal(t, 2, len(tcx.history.Events)) // Both scheduled and cancel requested events should be recorded crAttrs := tcx.history.Events[1].GetNexusOperationCancelRequestedEventAttributes() require.Equal(t, event.EventId, crAttrs.ScheduledEventId) }) @@ -779,7 +779,7 @@ func TestHandleCancelCommand(t *testing.T) { }, } require.NoError(t, err) - require.Len(t, tcx.history.Events, 1) + require.Equal(t, 1, len(tcx.history.Events)) event := tcx.history.Events[0] err = tcx.cancelHandler(context.Background(), tcx.ms, commandValidator{maxPayloadSize: 1}, 1, &commandpb.Command{ @@ -796,7 +796,7 @@ func TestHandleCancelCommand(t *testing.T) { require.NoError(t, err) require.NotNil(t, child) - require.Len(t, tcx.history.Events, 2) + require.Equal(t, 2, len(tcx.history.Events)) crAttrs := tcx.history.Events[1].GetNexusOperationCancelRequestedEventAttributes() require.Equal(t, event.EventId, crAttrs.ScheduledEventId) require.Equal(t, int64(1), crAttrs.WorkflowTaskCompletedEventId) diff --git a/service/history/ndc/activity_state_replicator_test.go b/service/history/ndc/activity_state_replicator_test.go index 90c85374837..58d6ced7733 100644 --- a/service/history/ndc/activity_state_replicator_test.go +++ b/service/history/ndc/activity_state_replicator_test.go @@ -631,7 +631,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivity_WorkflowNotFound() { ).AnyTimes() err := s.nDCActivityStateReplicator.SyncActivityState(context.Background(), request) - s.NoError(err) + s.Nil(err) } func (s *activityReplicatorStateSuite) TestSyncActivities_WorkflowNotFound() { @@ -669,7 +669,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivities_WorkflowNotFound() { ).AnyTimes() err := s.nDCActivityStateReplicator.SyncActivitiesState(context.Background(), request) - s.NoError(err) + s.Nil(err) } func (s *activityReplicatorStateSuite) TestSyncActivity_LoadMutableStateError() { @@ -1196,7 +1196,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_Zombie() { ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivityState(context.Background(), request) - s.NoError(err) + s.Nil(err) } func (s *activityReplicatorStateSuite) TestSyncActivities_ActivityFound_Zombie() { @@ -1302,7 +1302,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivities_ActivityFound_Zombie() ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivitiesState(context.Background(), request) - s.NoError(err) + s.Nil(err) } func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_NonZombie() { @@ -1404,7 +1404,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_NonZombie( ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivityState(context.Background(), request) - s.NoError(err) + s.Nil(err) } func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_NonZombie_LegacyUpdate() { @@ -1881,5 +1881,5 @@ func (s *activityReplicatorStateSuite) TestSyncActivities_ActivityFound_NonZombi ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivitiesState(context.Background(), request) - s.NoError(err) + s.Nil(err) } diff --git a/service/history/ndc/branch_manager_test.go b/service/history/ndc/branch_manager_test.go index 69e5686ddca..709917f0842 100644 --- a/service/history/ndc/branch_manager_test.go +++ b/service/history/ndc/branch_manager_test.go @@ -131,7 +131,7 @@ func (s *branchMgrSuite) TestCreateNewBranch() { }) newIndex, err := s.nDCBranchMgr.createNewBranch(context.Background(), baseBranchToken, baseBranchLCAEventID, newVersionHistory) - s.NoError(err) + s.Nil(err) s.Equal(int32(1), newIndex) compareVersionHistory, err := versionhistory.CopyVersionHistoryUntilLCAVersionHistoryItem( diff --git a/service/history/ndc/conflict_resolver_test.go b/service/history/ndc/conflict_resolver_test.go index e7b4a58f254..92a7c2d0d27 100644 --- a/service/history/ndc/conflict_resolver_test.go +++ b/service/history/ndc/conflict_resolver_test.go @@ -188,7 +188,7 @@ func (s *conflictResolverSuite) TestGetOrRebuildCurrentMutableState_NoRebuild_No ) versionHistories := versionhistory.NewVersionHistories(versionHistory0) _, _, err := versionhistory.AddAndSwitchVersionHistory(versionHistories, versionHistory1) - s.NoError(err) + s.Nil(err) s.mockMutableState.EXPECT().GetExecutionInfo().Return(&persistencespb.WorkflowExecutionInfo{VersionHistories: versionHistories}).AnyTimes() rebuiltMutableState, isRebuilt, err := s.nDCConflictResolver.GetOrRebuildCurrentMutableState(context.Background(), 0, version0) @@ -244,7 +244,7 @@ func (s *conflictResolverSuite) TestGetOrRebuildCurrentMutableState_Rebuild() { versionHistories := versionhistory.NewVersionHistories(versionHistory0) _, _, err := versionhistory.AddAndSwitchVersionHistory(versionHistories, versionHistory1) - s.NoError(err) + s.Nil(err) s.mockMutableState.EXPECT().GetUpdateCondition().Return(updateCondition, dbVersion).AnyTimes() s.mockMutableState.EXPECT().GetExecutionInfo().Return(&persistencespb.WorkflowExecutionInfo{ @@ -577,7 +577,7 @@ func (s *conflictResolverSuite) TestGetOrRebuildMutableState_Rebuild() { versionHistories := versionhistory.NewVersionHistories(versionHistory0) _, _, err := versionhistory.AddAndSwitchVersionHistory(versionHistories, versionHistory1) - s.NoError(err) + s.Nil(err) s.mockMutableState.EXPECT().GetUpdateCondition().Return(updateCondition, dbVersion).AnyTimes() s.mockMutableState.EXPECT().GetExecutionInfo().Return(&persistencespb.WorkflowExecutionInfo{ diff --git a/service/history/ndc/events_reapplier_test.go b/service/history/ndc/events_reapplier_test.go index e2357a6cece..0c41cbe3977 100644 --- a/service/history/ndc/events_reapplier_test.go +++ b/service/history/ndc/events_reapplier_test.go @@ -178,7 +178,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_WorkflowExec } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Len(appliedEvent, 1) + s.Equal(1, len(appliedEvent)) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Signal() { @@ -234,7 +234,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Signal() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Len(appliedEvent, 1) + s.Equal(1, len(appliedEvent)) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Update() { @@ -294,7 +294,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Update() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Len(appliedEvent, 1) + s.Equal(1, len(appliedEvent)) } } @@ -324,7 +324,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_Noop() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Empty(appliedEvent) + s.Equal(0, len(appliedEvent)) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_PartialAppliedEvent() { @@ -382,7 +382,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_PartialAppliedEvent() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Len(appliedEvent, 1) + s.Equal(1, len(appliedEvent)) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_Error() { @@ -425,7 +425,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_Error() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.Error(err) - s.Empty(appliedEvent) + s.Equal(0, len(appliedEvent)) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Termination() { @@ -469,7 +469,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Termination( } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Len(appliedEvent, 1) + s.Equal(1, len(appliedEvent)) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_NoPendingWorkflowTask() { @@ -531,7 +531,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_NoPendingWor } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Len(appliedEvent, 1) + s.Equal(1, len(appliedEvent)) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_ClosedWorkflow() { diff --git a/service/history/ndc/replication_task_test.go b/service/history/ndc/replication_task_test.go index 46f05a1bd22..513459f8d9d 100644 --- a/service/history/ndc/replication_task_test.go +++ b/service/history/ndc/replication_task_test.go @@ -75,7 +75,7 @@ func (s *replicationTaskSuite) TestValidateEventsSlice() { v, err := validateEventsSlice(eS1, eS2) s.Equal(int64(2), v) - s.NoError(err) + s.Nil(err) v, err = validateEventsSlice(eS1, eS3) s.Equal(int64(0), v) @@ -137,7 +137,7 @@ func (s *replicationTaskSuite) TestValidateEvents() { } v, err := validateEvents(eS1) - s.NoError(err) + s.Nil(err) s.Equal(int64(2), v) v, err = validateEvents(eS2) @@ -185,7 +185,7 @@ func (s *replicationTaskSuite) TestSkipDuplicatedEvents_ValidInput_SkipEvents() ) err := task.skipDuplicatedEvents(1) s.NoError(err) - s.Len(task.getEvents(), 1) + s.Equal(1, len(task.getEvents())) s.Equal(slice2, task.getEvents()[0]) s.Equal(int64(13), task.getFirstEvent().EventId) s.Equal(int64(14), task.getLastEvent().EventId) @@ -294,7 +294,7 @@ func (s *replicationTaskSuite) TestSkipDuplicatedEvents_ZeroInput_DoNothing() { ) err := task.skipDuplicatedEvents(0) s.NoError(err) - s.Len(task.getEvents(), 2) + s.Equal(2, len(task.getEvents())) s.Equal(slice1, task.getEvents()[0]) s.Equal(slice2, task.getEvents()[1]) } diff --git a/service/history/ndc/resetter_test.go b/service/history/ndc/resetter_test.go index e6aca5f243a..8f17681b76a 100644 --- a/service/history/ndc/resetter_test.go +++ b/service/history/ndc/resetter_test.go @@ -486,5 +486,5 @@ func (s *resetterSuite) TestResetWorkflow_Error() { incomingFirstEventID, incomingFirstEventVersion, ) - s.Equal(expectedErr, retryErr) + s.Equal(retryErr, expectedErr) } diff --git a/service/history/ndc/transaction_manager_test.go b/service/history/ndc/transaction_manager_test.go index e9f7c435b2b..969952d06cb 100644 --- a/service/history/ndc/transaction_manager_test.go +++ b/service/history/ndc/transaction_manager_test.go @@ -601,7 +601,7 @@ func (s *transactionMgrSuite) TestGetWorkflowCurrentRunID_Missing() { currentRunID, err := s.transactionMgr.GetCurrentWorkflowRunID(ctx, namespaceID, workflowID, chasm.WorkflowArchetypeID) s.NoError(err) - s.Empty(currentRunID) + s.Equal("", currentRunID) } func (s *transactionMgrSuite) TestGetWorkflowCurrentRunID_Exists() { diff --git a/service/history/ndc/workflow_state_replicator_test.go b/service/history/ndc/workflow_state_replicator_test.go index dc418aa9d8f..7487e6693ed 100644 --- a/service/history/ndc/workflow_state_replicator_test.go +++ b/service/history/ndc/workflow_state_replicator_test.go @@ -493,9 +493,9 @@ func (s *workflowReplicatorSuite) Test_ApplyWorkflowState_ExistWorkflow_Resend() err = s.workflowStateReplicator.SyncWorkflowState(context.Background(), request) var expectedErr *serviceerrors.RetryReplication s.ErrorAs(err, &expectedErr) - s.Equal(expectedErr.NamespaceId, namespaceID) - s.Equal(expectedErr.WorkflowId, s.workflowID) - s.Equal(expectedErr.RunId, s.runID) + s.Equal(namespaceID, expectedErr.NamespaceId) + s.Equal(s.workflowID, expectedErr.WorkflowId) + s.Equal(s.runID, expectedErr.RunId) s.Equal(int64(1), expectedErr.StartEventId) s.Equal(int64(1), expectedErr.StartEventVersion) } diff --git a/service/history/ndc/workflow_test.go b/service/history/ndc/workflow_test.go index 5663dcf2561..8dc21ab9a43 100644 --- a/service/history/ndc/workflow_test.go +++ b/service/history/ndc/workflow_test.go @@ -351,7 +351,7 @@ func (s *workflowSuite) TestSuppressWorkflowBy_Zombiefy() { s.NoError(err) s.Equal(historyi.TransactionPolicyPassive, policy) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_ZOMBIE, executionState.State) - s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, executionState.Status) + s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, executionState.Status) } func (s *workflowSuite) wfNewWorkflow() *WorkflowImpl { diff --git a/service/history/queues/reader_group_test.go b/service/history/queues/reader_group_test.go index 525d1867d20..5a60cda928f 100644 --- a/service/history/queues/reader_group_test.go +++ b/service/history/queues/reader_group_test.go @@ -98,7 +98,7 @@ func (s *readerGroupSuite) TestRemoveReader() { s.readerGroup.RemoveReader(readerID) s.Equal(common.DaemonStatusStopped, r.(*testReader).status) - s.Empty(s.readerGroup.Readers()) + s.Len(s.readerGroup.Readers(), 0) } func (s *readerGroupSuite) TestForEach() { diff --git a/service/history/queues/reader_test.go b/service/history/queues/reader_test.go index 43508bfeab4..1b0e4fde814 100644 --- a/service/history/queues/reader_test.go +++ b/service/history/queues/reader_test.go @@ -500,7 +500,7 @@ func (s *readerSuite) validateSlicesOrdered( } for idx := range scopes[:len(scopes)-1] { - s.LessOrEqual(scopes[idx].Range.ExclusiveMax.CompareTo(scopes[idx+1].Range.InclusiveMin), 0) + s.True(scopes[idx].Range.ExclusiveMax.CompareTo(scopes[idx+1].Range.InclusiveMin) <= 0) } } diff --git a/service/history/replication/ack_manager_test.go b/service/history/replication/ack_manager_test.go index af51ddeea70..5bff613d809 100644 --- a/service/history/replication/ack_manager_test.go +++ b/service/history/replication/ack_manager_test.go @@ -120,7 +120,7 @@ func (s *ackManagerSuite) TestNotifyNewTasks_NotInitialized() { &tasks.HistoryReplicationTask{TaskID: 123}, }) - s.Equal(int64(456), *s.replicationAckManager.maxTaskID) + s.Equal(*s.replicationAckManager.maxTaskID, int64(456)) } func (s *ackManagerSuite) TestNotifyNewTasks_Initialized() { @@ -129,12 +129,12 @@ func (s *ackManagerSuite) TestNotifyNewTasks_Initialized() { s.replicationAckManager.NotifyNewTasks([]tasks.Task{ &tasks.HistoryReplicationTask{TaskID: 100}, }) - s.Equal(int64(123), *s.replicationAckManager.maxTaskID) + s.Equal(*s.replicationAckManager.maxTaskID, int64(123)) s.replicationAckManager.NotifyNewTasks([]tasks.Task{ &tasks.HistoryReplicationTask{TaskID: 234}, }) - s.Equal(int64(234), *s.replicationAckManager.maxTaskID) + s.Equal(*s.replicationAckManager.maxTaskID, int64(234)) } func (s *ackManagerSuite) TestTaskIDRange_NotInitialized() { @@ -315,7 +315,7 @@ func (s *ackManagerSuite) TestGetTasks_SecondPersistenceErrorReturnsPartialResul replicationTasks, lastTaskID, err := s.replicationAckManager.getTasks(ctx, cluster.TestCurrentClusterName, minTaskID, maxTaskID) s.NoError(err) - s.Len(replicationTasks, 1) + s.Equal(1, len(replicationTasks)) s.Equal(tasksResponse.Tasks[0].GetTaskID(), lastTaskID) } diff --git a/service/history/replication/batchable_task_test.go b/service/history/replication/batchable_task_test.go index 08e4ca43306..23252c71b65 100644 --- a/service/history/replication/batchable_task_test.go +++ b/service/history/replication/batchable_task_test.go @@ -320,7 +320,7 @@ func (s *batchedTaskSuite) TestMarkPoisonPill_SingleItem_MarkTheTask() { existing.EXPECT().MarkPoisonPill().Return(nil).Times(1) result := batchedTestTask.MarkPoisonPill() - s.NoError(result) + s.Nil(result) } func (s *batchedTaskSuite) TestReschedule_SingleItem_RescheduleTheTask() { @@ -508,5 +508,5 @@ func (s *batchedTaskSuite) TestMarkPoisonPill_MultipleItems_CallIndividualHandle add2.EXPECT().MarkUnbatchable().Times(1) result := batchedTestTask.MarkPoisonPill() - s.NoError(result) + s.Nil(result) } diff --git a/service/history/replication/eager_namespace_refresher_test.go b/service/history/replication/eager_namespace_refresher_test.go index a9c38714420..3a532b335eb 100644 --- a/service/history/replication/eager_namespace_refresher_test.go +++ b/service/history/replication/eager_namespace_refresher_test.go @@ -117,7 +117,7 @@ func (s *EagerNamespaceRefresherSuite) TestSyncNamespaceFromSourceCluster_Create s.NoError(err) s.mockNamespaceRegistry.EXPECT().RefreshNamespaceById(namespaceId).Return(nsFromResponse, nil).Times(1) ns, err := s.eagerNamespaceRefresher.SyncNamespaceFromSourceCluster(context.Background(), namespaceId, "currentCluster") - s.NoError(err) + s.Nil(err) s.Equal(namespaceId, ns.ID()) } @@ -160,7 +160,7 @@ func (s *EagerNamespaceRefresherSuite) TestSyncNamespaceFromSourceCluster_Update s.NoError(err) s.mockNamespaceRegistry.EXPECT().RefreshNamespaceById(namespaceId).Return(nsFromResponse, nil).Times(1) ns, err := s.eagerNamespaceRefresher.SyncNamespaceFromSourceCluster(context.Background(), namespaceId, "currentCluster") - s.NoError(err) + s.Nil(err) s.Equal(namespaceId, ns.ID()) } diff --git a/service/history/replication/eventhandler/event_importer_test.go b/service/history/replication/eventhandler/event_importer_test.go index 72a55d29409..e806f7e770a 100644 --- a/service/history/replication/eventhandler/event_importer_test.go +++ b/service/history/replication/eventhandler/event_importer_test.go @@ -212,7 +212,7 @@ func (s *eventImporterSuite) TestImportHistoryEvents_ImportAllLocalAndCommit() { 7, 1001, ) - s.NoError(err) + s.Nil(err) } func serializeEvents(serializer serialization.Serializer, events [][]*historypb.HistoryEvent) []*commonpb.DataBlob { diff --git a/service/history/replication/eventhandler/history_events_handler_test.go b/service/history/replication/eventhandler/history_events_handler_test.go index 49ec67a448d..470cf2d3e5d 100644 --- a/service/history/replication/eventhandler/history_events_handler_test.go +++ b/service/history/replication/eventhandler/history_events_handler_test.go @@ -125,7 +125,7 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_RemoteOnly() { nil, "", ) - s.NoError(err) + s.Nil(err) } func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalAndRemote_HandleLocalThenRemote() { @@ -217,7 +217,7 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalAndRemote_Handle nil, "", ) - s.NoError(err) + s.Nil(err) } func (s *historyEventHandlerSuite) TestHandleLocalHistoryEvents_AlreadyExist() { @@ -268,7 +268,7 @@ func (s *historyEventHandlerSuite) TestHandleLocalHistoryEvents_AlreadyExist() { workflowKey, versionHistory.Items, ) - s.NoError(err) + s.Nil(err) } func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ImportAllLocalAndCommit() { @@ -325,7 +325,7 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ImportAllLo workflowKey, versionHistory.Items, ) - s.NoError(err) + s.Nil(err) } func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ExistButNotEnoughEvents_DataLose() { @@ -381,5 +381,5 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ExistButNot workflowKey, versionHistory.Items, ) - s.Error(err) + s.NotNil(err) } diff --git a/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go b/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go index e649cb44bcb..4454417d654 100644 --- a/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go +++ b/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go @@ -191,12 +191,12 @@ func (s *historyPaginatedFetcherSuite) TestGetSingleWorkflowHistoryIterator() { ) s.True(fetcher.HasNext()) batch, err := fetcher.Next() - s.NoError(err) + s.Nil(err) s.Equal(blob, batch.RawEventBatch) s.True(fetcher.HasNext()) batch, err = fetcher.Next() - s.NoError(err) + s.Nil(err) s.Equal(blob, batch.RawEventBatch) s.False(fetcher.HasNext()) @@ -248,14 +248,14 @@ func (s *historyPaginatedFetcherSuite) TestGetHistory() { pageSize, false, ) - s.NoError(err) + s.Nil(err) s.Equal(token, nextTokenOut) s.Equal(out[0].RawEventBatch.Data, blob) } func (s *historyPaginatedFetcherSuite) serializeEvents(events []*historypb.HistoryEvent) *commonpb.DataBlob { blob, err := s.serializer.SerializeEvents(events) - s.NoError(err) + s.Nil(err) return &commonpb.DataBlob{ EncodingType: enumspb.ENCODING_TYPE_PROTO3, Data: blob.Data, diff --git a/service/history/replication/eventhandler/resend_handler_test.go b/service/history/replication/eventhandler/resend_handler_test.go index b9b054e8818..5374ed19639 100644 --- a/service/history/replication/eventhandler/resend_handler_test.go +++ b/service/history/replication/eventhandler/resend_handler_test.go @@ -327,7 +327,7 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_AllRemoteEvents() { endEventID, endEventVersion, ) - s.NoError(err) + s.Nil(err) } func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_LocalAndRemoteEvents() { @@ -435,7 +435,7 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_LocalAndRemoteEvents( endEventID, endEventVersion, ) - s.NoError(err) + s.Nil(err) } func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_MixedVersionHistory_RemoteEventsOnly() { @@ -503,7 +503,7 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_MixedVersionHistory_R endEventID, endEventVersion, ) - s.NoError(err) + s.Nil(err) } func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_AllRemoteEvents_BatchTest() { @@ -627,12 +627,12 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_AllRemoteEvents_Batch endEventID, endEventVersion, ) - s.NoError(err) + s.Nil(err) } func (s *resendHandlerSuite) serializeEvents(events []*historypb.HistoryEvent) *commonpb.DataBlob { blob, err := s.serializer.SerializeEvents(events) - s.NoError(err) + s.Nil(err) return &commonpb.DataBlob{ EncodingType: enumspb.ENCODING_TYPE_PROTO3, Data: blob.Data, diff --git a/service/history/replication/executable_activity_state_task_test.go b/service/history/replication/executable_activity_state_task_test.go index b732389b5d3..69287e1d003 100644 --- a/service/history/replication/executable_activity_state_task_test.go +++ b/service/history/replication/executable_activity_state_task_test.go @@ -278,7 +278,7 @@ func (s *executableActivityStateTaskSuite) TestHandleErr_Other() { s.Equal(err, s.task.HandleErr(err)) err = serviceerror.NewNotFound("") - s.NoError(s.task.HandleErr(err)) + s.Equal(nil, s.task.HandleErr(err)) err = serviceerror.NewUnavailable("") s.Equal(err, s.task.HandleErr(err)) @@ -367,7 +367,7 @@ func (s *executableActivityStateTaskSuite) TestBatchedTask_ShouldBatchTogether_A batchResult, batched := task1.BatchWith(task2) s.True(batched) activityTask, _ := batchResult.(*ExecutableActivityStateTask) - s.Len(activityTask.activityInfos, 2) + s.Equal(2, len(activityTask.activityInfos)) s.assertAttributeEqual(replicationAttribute1, activityTask.activityInfos[0]) s.assertAttributeEqual(replicationAttribute2, activityTask.activityInfos[1]) @@ -391,7 +391,7 @@ func (s *executableActivityStateTaskSuite) TestBatchedTask_ShouldBatchTogether_A ActivitiesInfo: activityTask.activityInfos, }) err := batchResult.Execute() - s.NoError(err) + s.Nil(err) } func (s *executableActivityStateTaskSuite) TestBatchWith_InvalidBatchTask_ShouldNotBatch() { diff --git a/service/history/replication/executable_task_test.go b/service/history/replication/executable_task_test.go index 36c2554c906..7a3e370761f 100644 --- a/service/history/replication/executable_task_test.go +++ b/service/history/replication/executable_task_test.go @@ -607,7 +607,7 @@ func (s *executableTaskSuite) TestResend_TransitionHistoryDisabled() { ) doContinue, err := s.task.SyncState(context.Background(), syncStateErr, ResendAttempt) - s.NoError(err) + s.Nil(err) s.False(doContinue) } @@ -661,7 +661,7 @@ func (s *executableTaskSuite) TestSyncState_SourceMutableStateHasUnFlushedBuffer ).Return(nil, serviceerror.NewWorkflowNotReady("workflow not ready")).Times(1) doContinue, err := s.task.SyncState(context.Background(), syncStateErr, ResendAttempt) - s.NoError(err) + s.Nil(err) s.False(doContinue) } @@ -1064,7 +1064,7 @@ func (s *executableTaskSuite) TestGetNamespaceInfo_NotFoundOnCurrentCluster_Sync nil, errors.New("some error")) _, toProcess, err := s.task.GetNamespaceInfo(context.Background(), namespaceID, "test-workflow-id") - s.NoError(err) + s.Nil(err) s.False(toProcess) } diff --git a/service/history/replication/progress_cache_test.go b/service/history/replication/progress_cache_test.go index fa4cec202ec..8a549030044 100644 --- a/service/history/replication/progress_cache_test.go +++ b/service/history/replication/progress_cache_test.go @@ -104,7 +104,7 @@ func (s *progressCacheSuite) TestProgressCache() { s.Nil(cachedProgress) err := s.progressCache.Update(s.runID, targetClusterID, versionedTransitions, versionHistoryItems) - s.NoError(err) + s.Nil(err) // get existing progress cachedProgress = s.progressCache.Get(s.runID, targetClusterID) @@ -121,7 +121,7 @@ func (s *progressCacheSuite) TestProgressCache() { versionhistory.NewVersionHistoryItem(firstEventID+1, versionedTransition.NamespaceFailoverVersion), } err = s.progressCache.Update(s.runID, targetClusterID, versionedTransitions2, versionHistoryItems2) - s.NoError(err) + s.Nil(err) expected2 := &ReplicationProgress{ versionedTransitions: [][]*persistencespb.VersionedTransition{versionedTransitions2}, @@ -144,7 +144,7 @@ func (s *progressCacheSuite) TestProgressCache() { versionhistory.NewVersionHistoryItem(firstEventID+1, versionedTransition.NamespaceFailoverVersion+1), } err = s.progressCache.Update(s.runID, targetClusterID, versionedTransitions3, versionHistoryItems3) - s.NoError(err) + s.Nil(err) expected3 := &ReplicationProgress{ versionedTransitions: [][]*persistencespb.VersionedTransition{versionedTransitions2, versionedTransitions3}, @@ -157,7 +157,7 @@ func (s *progressCacheSuite) TestProgressCache() { // noop update: versioned transition and version history are already included in the existing progress err = s.progressCache.Update(s.runID, targetClusterID, versionedTransitions, versionHistoryItems) - s.NoError(err) + s.Nil(err) cachedProgress = s.progressCache.Get(s.runID, targetClusterID) s.DeepEqual(expected3, cachedProgress) diff --git a/service/history/replication/stream_receiver_monitor_test.go b/service/history/replication/stream_receiver_monitor_test.go index 6ed5c03d264..58889585dd2 100644 --- a/service/history/replication/stream_receiver_monitor_test.go +++ b/service/history/replication/stream_receiver_monitor_test.go @@ -271,7 +271,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Add() { serverKey := NewClusterShardKey(int32(cluster.TestCurrentClusterInitialFailoverVersion), rand.Int31()) s.streamReceiverMonitor.Lock() - s.Empty(s.streamReceiverMonitor.inboundStreams) + s.Equal(0, len(s.streamReceiverMonitor.inboundStreams)) s.streamReceiverMonitor.Unlock() streamKeys := map[ClusterShardKeyPair]struct{}{ @@ -291,7 +291,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Add() { s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Len(s.streamReceiverMonitor.inboundStreams, 1) + s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) stream, ok := s.streamReceiverMonitor.inboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -315,14 +315,14 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Remove() { s.streamReceiverMonitor.RegisterInboundStream(streamSender) s.streamReceiverMonitor.Lock() - s.Len(s.streamReceiverMonitor.inboundStreams, 1) + s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) s.streamReceiverMonitor.Unlock() s.streamReceiverMonitor.doReconcileInboundStreams(map[ClusterShardKeyPair]struct{}{}) s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Empty(s.streamReceiverMonitor.inboundStreams) + s.Equal(0, len(s.streamReceiverMonitor.inboundStreams)) } func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Reactivate() { @@ -339,7 +339,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Reactivate() s.streamReceiverMonitor.RegisterInboundStream(streamSenderStale) s.streamReceiverMonitor.Lock() - s.Len(s.streamReceiverMonitor.inboundStreams, 1) + s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) s.streamReceiverMonitor.Unlock() streamSenderValid := NewMockStreamSender(s.controller) @@ -351,7 +351,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Reactivate() s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Len(s.streamReceiverMonitor.inboundStreams, 1) + s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) stream, ok := s.streamReceiverMonitor.inboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -443,7 +443,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Add() { serverKey := NewClusterShardKey(int32(cluster.TestAlternativeClusterInitialFailoverVersion), rand.Int31()) s.streamReceiverMonitor.Lock() - s.Empty(s.streamReceiverMonitor.outboundStreams) + s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) s.streamReceiverMonitor.Unlock() streamKeys := map[ClusterShardKeyPair]struct{}{ @@ -456,7 +456,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Add() { s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Len(s.streamReceiverMonitor.outboundStreams, 1) + s.Equal(1, len(s.streamReceiverMonitor.outboundStreams)) stream, ok := s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -479,7 +479,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Remove() { streamReceiver.EXPECT().Stop() s.streamReceiverMonitor.Lock() - s.Empty(s.streamReceiverMonitor.outboundStreams) + s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -490,7 +490,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Remove() { s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Empty(s.streamReceiverMonitor.outboundStreams) + s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) } func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Reactivate() { @@ -508,7 +508,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Reactivate() streamReceiverStale.EXPECT().Stop() s.streamReceiverMonitor.Lock() - s.Empty(s.streamReceiverMonitor.outboundStreams) + s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -524,7 +524,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Reactivate() s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Len(s.streamReceiverMonitor.outboundStreams, 1) + s.Equal(1, len(s.streamReceiverMonitor.outboundStreams)) stream, ok := s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, diff --git a/service/history/replication/stream_receiver_test.go b/service/history/replication/stream_receiver_test.go index f800c67d7b9..9ffa8163b57 100644 --- a/service/history/replication/stream_receiver_test.go +++ b/service/history/replication/stream_receiver_test.go @@ -124,7 +124,7 @@ func (s *streamReceiverSuite) TestAckMessage_Noop() { s.streamReceiver.ackMessage(s.stream) - s.Empty(s.stream.requests) + s.Equal(0, len(s.stream.requests)) } func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeUnset() { @@ -134,7 +134,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeUnset() { s.highPriorityTaskTracker.EXPECT().Size().Return(0) s.lowPriorityTaskTracker.EXPECT().Size().Return(0) _, err := s.streamReceiver.ackMessage(s.stream) - s.Empty(s.stream.requests) + s.Equal(0, len(s.stream.requests)) s.NoError(err) } @@ -177,7 +177,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeSingleStack_ _, err := s.streamReceiver.ackMessage(s.stream) s.Error(err) - s.Empty(s.stream.requests) + s.Equal(0, len(s.stream.requests)) } func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeSingleStack_HasBothWatermark() { @@ -194,7 +194,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeSingleStack_ _, err := s.streamReceiver.ackMessage(s.stream) s.Error(err) - s.Empty(s.stream.requests) + s.Equal(0, len(s.stream.requests)) } func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeTieredStack_NoHighPriorityWatermark() { @@ -208,7 +208,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeTieredStack_ s.highPriorityTaskTracker.EXPECT().Size().Return(0) s.lowPriorityTaskTracker.EXPECT().Size().Return(0) _, err := s.streamReceiver.ackMessage(s.stream) - s.Empty(s.stream.requests) + s.Equal(0, len(s.stream.requests)) s.NoError(err) } @@ -223,7 +223,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeTieredStack_ s.highPriorityTaskTracker.EXPECT().Size().Return(0) s.lowPriorityTaskTracker.EXPECT().Size().Return(0) _, err := s.streamReceiver.ackMessage(s.stream) - s.Empty(s.stream.requests) + s.Equal(0, len(s.stream.requests)) s.NoError(err) } @@ -292,7 +292,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_SingleStack() { func(highWatermarkInfo WatermarkInfo, tasks ...TrackableExecutableTask) []TrackableExecutableTask { s.Equal(streamResp.Resp.GetMessages().ExclusiveHighWatermark, highWatermarkInfo.Watermark) s.Equal(streamResp.Resp.GetMessages().ExclusiveHighWatermarkTime.AsTime(), highWatermarkInfo.Timestamp) - s.Len(tasks, 1) + s.Equal(1, len(tasks)) s.IsType(&ExecutableUnknownTask{}, tasks[0]) return []TrackableExecutableTask{tasks[0]} }, @@ -300,7 +300,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_SingleStack() { err := s.streamReceiver.processMessages(s.stream) s.NoError(err) - s.Len(s.taskScheduler.tasks, 1) + s.Equal(1, len(s.taskScheduler.tasks)) s.IsType(&ExecutableUnknownTask{}, s.taskScheduler.tasks[0]) s.Equal(ReceiverModeSingleStack, s.streamReceiver.receiverMode) } @@ -409,7 +409,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { func(highWatermarkInfo WatermarkInfo, tasks ...TrackableExecutableTask) []TrackableExecutableTask { s.Equal(streamResp1.Resp.GetMessages().ExclusiveHighWatermark, highWatermarkInfo.Watermark) s.Equal(streamResp1.Resp.GetMessages().ExclusiveHighWatermarkTime.AsTime(), highWatermarkInfo.Timestamp) - s.Len(tasks, 1) + s.Equal(1, len(tasks)) s.IsType(&ExecutableUnknownTask{}, tasks[0]) return []TrackableExecutableTask{tasks[0]} }, @@ -418,7 +418,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { func(highWatermarkInfo WatermarkInfo, tasks ...TrackableExecutableTask) []TrackableExecutableTask { s.Equal(streamResp2.Resp.GetMessages().ExclusiveHighWatermark, highWatermarkInfo.Watermark) s.Equal(streamResp2.Resp.GetMessages().ExclusiveHighWatermarkTime.AsTime(), highWatermarkInfo.Timestamp) - s.Len(tasks, 1) + s.Equal(1, len(tasks)) s.IsType(&ExecutableUnknownTask{}, tasks[0]) return []TrackableExecutableTask{tasks[0]} }, @@ -426,7 +426,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { err := s.streamReceiver.processMessages(s.stream) s.NoError(err) - s.Len(s.taskScheduler.tasks, 2) + s.Equal(2, len(s.taskScheduler.tasks)) s.Equal(ReceiverModeTieredStack, s.streamReceiver.receiverMode) } diff --git a/service/history/replication/stream_sender_test.go b/service/history/replication/stream_sender_test.go index de07578682a..44685bacb27 100644 --- a/service/history/replication/stream_sender_test.go +++ b/service/history/replication/stream_sender_test.go @@ -693,8 +693,8 @@ func (s *streamSenderSuite) TestSendLive() { channel, watermark0, ) - s.NoError(err) - s.False(s.streamSender.IsValid()) + s.Nil(err) + s.True(!s.streamSender.IsValid()) } func (s *streamSenderSuite) TestSendTasks_Noop() { diff --git a/service/history/replication/sync_state_retriever_test.go b/service/history/replication/sync_state_retriever_test.go index 049d79ac1e7..ac56b79ae2b 100644 --- a/service/history/replication/sync_state_retriever_test.go +++ b/service/history/replication/sync_state_retriever_test.go @@ -243,15 +243,15 @@ func (s *syncWorkflowStateSuite) TestSyncWorkflowState_ReturnMutation() { mutation := syncAttributes.StateMutation // ensure it's a copy by checking the pointers are pointing to different memory addresses - s.NotSame(executionInfo, mutation.ExecutionInfo) + s.True(executionInfo != mutation.ExecutionInfo) s.Nil(mutation.ExecutionInfo.UpdateInfos) s.Nil(mutation.ExecutionInfo.SubStateMachinesByType) s.Nil(mutation.ExecutionInfo.SubStateMachineTombstoneBatches) s.Zero(mutation.ExecutionInfo.LastFirstEventTxnId) // field should be sanitized s.Empty(mutation.UpdatedActivityInfos) - s.Empty(mutation.UpdatedTimerInfos) + s.Len(mutation.UpdatedTimerInfos, 0) s.Len(mutation.UpdatedChildExecutionInfos, 1) - s.Empty(mutation.UpdatedRequestCancelInfos) + s.Len(mutation.UpdatedRequestCancelInfos, 0) s.Len(mutation.UpdatedSignalInfos, 1) s.Len(mutation.UpdatedChasmNodes, 1) s.Nil(mutation.UpdatedChildExecutionInfos[13].Clock) // field should be sanitized @@ -355,7 +355,7 @@ func (s *syncWorkflowStateSuite) TestGetSyncStateRetrieverForNewWorkflow_WithEve mutation := syncAttributes.StateMutation // ensure it's a copy by checking the pointers are pointing to different memory addresses - s.NotSame(executionInfo, mutation.ExecutionInfo) + s.True(executionInfo != mutation.ExecutionInfo) s.Nil(mutation.ExecutionInfo.UpdateInfos) s.Nil(mutation.ExecutionInfo.SubStateMachinesByType) s.Nil(mutation.ExecutionInfo.SubStateMachineTombstoneBatches) @@ -1213,15 +1213,15 @@ func (s *syncWorkflowStateSuite) TestGetUpdatedSubStateMachine() { s.NoError(err) root.InternalRepr().LastUpdateVersionedTransition = &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 10} child1, err := root.AddChild(hsm.Key{Type: def1.Type(), ID: "child1"}, hsmtest.NewData(hsmtest.State1)) - s.NoError(err) + s.Nil(err) child1.InternalRepr().LastUpdateVersionedTransition = &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 8} child2, err := root.AddChild(hsm.Key{Type: def1.Type(), ID: "child2"}, hsmtest.NewData(hsmtest.State1)) - s.NoError(err) + s.Nil(err) child2.InternalRepr().LastUpdateVersionedTransition = &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 10} result, err := s.syncStateRetriever.getUpdatedSubStateMachine(root, &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 9}) s.NoError(err) - s.Len(result, 1) - s.Len(result[0].Path.Path, len(child2.Path())) + s.Equal(1, len(result)) + s.Equal(len(child2.Path()), len(result[0].Path.Path)) s.Equal(child2.Path()[0].ID, result[0].Path.Path[0].Id) } diff --git a/service/history/replication/task_processor_test.go b/service/history/replication/task_processor_test.go index 65ef741a90b..bf2bce80887 100644 --- a/service/history/replication/task_processor_test.go +++ b/service/history/replication/task_processor_test.go @@ -538,7 +538,7 @@ func (s *taskProcessorSuite) TestPaginationFn_Success_More() { tasks, _, err := s.replicationTaskProcessor.paginationFn(nil) s.NoError(err) - s.Len(tasks, 1) + s.Equal(1, len(tasks)) s.Equal(task, tasks[0].(*replicationspb.ReplicationTask)) s.Equal(syncShardTask, <-s.replicationTaskProcessor.syncShardChan) s.Equal(lastRetrievedMessageID, s.replicationTaskProcessor.maxRxReceivedTaskID) @@ -611,7 +611,7 @@ func (s *taskProcessorSuite) TestPaginationFn_Success_NoMore() { tasks, _, err := s.replicationTaskProcessor.paginationFn(nil) s.NoError(err) - s.Len(tasks, 1) + s.Equal(1, len(tasks)) s.Equal(task, tasks[0].(*replicationspb.ReplicationTask)) s.Equal(syncShardTask, <-s.replicationTaskProcessor.syncShardChan) s.Equal(lastRetrievedMessageID, s.replicationTaskProcessor.maxRxReceivedTaskID) diff --git a/service/history/shard/context_test.go b/service/history/shard/context_test.go index 6ba381aae1d..37719f8f282 100644 --- a/service/history/shard/context_test.go +++ b/service/history/shard/context_test.go @@ -468,7 +468,7 @@ func (s *contextSuite) TestAcquireShardOwnershipLostErrorIsNotRetried() { s.mockShard.acquireShard() - s.Equal(contextStateStopping, s.mockShard.state) + s.Assert().Equal(contextStateStopping, s.mockShard.state) } func (s *contextSuite) TestAcquireShardNonOwnershipLostErrorIsRetried() { @@ -480,7 +480,7 @@ func (s *contextSuite) TestAcquireShardNonOwnershipLostErrorIsRetried() { s.mockShard.acquireShard() - s.Equal(contextStateStopping, s.mockShard.state) + s.Assert().Equal(contextStateStopping, s.mockShard.state) } func (s *contextSuite) TestAcquireShardEventuallySucceeds() { @@ -495,7 +495,7 @@ func (s *contextSuite) TestAcquireShardEventuallySucceeds() { s.mockShard.acquireShard() - s.Equal(contextStateAcquired, s.mockShard.state) + s.Assert().Equal(contextStateAcquired, s.mockShard.state) } func (s *contextSuite) TestAcquireShardNoError() { @@ -508,7 +508,7 @@ func (s *contextSuite) TestAcquireShardNoError() { s.mockShard.acquireShard() - s.Equal(contextStateAcquired, s.mockShard.state) + s.Assert().Equal(contextStateAcquired, s.mockShard.state) } func (s *contextSuite) TestHandoverNamespace() { @@ -775,7 +775,7 @@ func (s *contextSuite) TestShardStopReasonAcquireShard() { s.mockShard.acquireShard() - s.Equal(contextStateStopping, s.mockShard.state) + s.Assert().Equal(contextStateStopping, s.mockShard.state) s.False(s.mockShard.IsValid()) s.True(s.mockShard.stoppedForOwnershipLost()) } @@ -785,7 +785,7 @@ func (s *contextSuite) TestShardStopReasonUnload() { s.mockShard.UnloadForOwnershipLost() - s.Equal(contextStateStopping, s.mockShard.state) + s.Assert().Equal(contextStateStopping, s.mockShard.state) s.False(s.mockShard.IsValid()) s.True(s.mockShard.stoppedForOwnershipLost()) } @@ -951,7 +951,7 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(2, s.mockShard.tasksCompletedSinceLastUpdate) + s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 2) // update after ShardFirstUpdateInterval s.mockShard.initLastUpdatesTime() @@ -962,7 +962,7 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(0, s.mockShard.tasksCompletedSinceLastUpdate) + s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 0) // update again. This time update will not work since shard lastUpdate time was set during previous update s.timeSource.Update(time.Now().Add(s.mockShard.config.ShardFirstUpdateInterval() + 15*time.Second)) @@ -972,7 +972,7 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(1, s.mockShard.tasksCompletedSinceLastUpdate) + s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 1) // now move past last updated interval. This time hard info should be updated/persisted s.timeSource.Update(s.mockShard.lastUpdated.Add(s.mockShard.config.ShardUpdateMinInterval() + 10*time.Second)) @@ -982,5 +982,5 @@ func (s *contextSuite) TestUpdateShardInfo_FirstUpdate() { s.NoError(err) s.True(called) - s.Equal(0, s.mockShard.tasksCompletedSinceLastUpdate) + s.Equal(s.mockShard.tasksCompletedSinceLastUpdate, 0) } diff --git a/service/history/shard/controller_test.go b/service/history/shard/controller_test.go index b79baf18522..a8ed689d40f 100644 --- a/service/history/shard/controller_test.go +++ b/service/history/shard/controller_test.go @@ -457,7 +457,7 @@ func (s *controllerSuite) TestShardExplicitUnload() { shard, err := s.shardController.getOrCreateShardContext(1) s.NoError(err) - s.Len(s.shardController.ShardIDs(), 1) + s.Equal(1, len(s.shardController.ShardIDs())) shard.UnloadForOwnershipLost() @@ -465,7 +465,7 @@ func (s *controllerSuite) TestShardExplicitUnload() { // removal from map happens asynchronously time.Sleep(1 * time.Millisecond) } - s.Empty(s.shardController.ShardIDs()) + s.Equal(0, len(s.shardController.ShardIDs())) s.False(shard.IsValid()) } @@ -742,7 +742,7 @@ func (s *controllerSuite) TestShardLingerTimeout() { // By now the timeout should have occurred. time.Sleep(timeLimit/2 + 100*time.Millisecond) - s.Empty(s.shardController.ShardIDs()) + s.Len(s.shardController.ShardIDs(), 0) s.False(shard.IsValid()) s.Equal(float64(1), s.readMetricsCounter( @@ -823,7 +823,7 @@ func (s *controllerSuite) TestShardLingerSuccess() { expectedWait := time.Second / time.Duration(checkQPS) * 2 time.Sleep(expectedWait + 100*time.Millisecond) - s.Empty(s.shardController.ShardIDs()) + s.Len(s.shardController.ShardIDs(), 0) } // TestShardCounter verifies that we can subscribe to shard count updates, receive them when shards are acquired, and diff --git a/service/history/shard/ownership_test.go b/service/history/shard/ownership_test.go index 53814e5e356..306a09b9032 100644 --- a/service/history/shard/ownership_test.go +++ b/service/history/shard/ownership_test.go @@ -83,7 +83,7 @@ func (s *ownershipSuite) TestAcquireViaMembershipUpdate() { shardController := s.newController(cf) shardController.Start() - s.Empty(shardController.ShardIDs()) + s.Zero(len(shardController.ShardIDs())) shardController.ownership.membershipUpdateCh <- &membership.ChangedEvent{} diff --git a/service/history/shard/task_key_generator_test.go b/service/history/shard/task_key_generator_test.go index 79c45e2ad27..fbcec6ff13d 100644 --- a/service/history/shard/task_key_generator_test.go +++ b/service/history/shard/task_key_generator_test.go @@ -120,7 +120,7 @@ func (s *taskKeyGeneratorSuite) TestSetTaskKeys_RenewRange() { initialRangeID := s.rangeID numTask := 10 - s.Greater(numTask, (1 << s.rangeSizeBits)) + s.True(numTask > (1 << s.rangeSizeBits)) transferTasks := make([]tasks.Task, 0, numTask) for range numTask { diff --git a/service/history/visibility_queue_task_executor_test.go b/service/history/visibility_queue_task_executor_test.go index ac60c0069ea..36427b50df3 100644 --- a/service/history/visibility_queue_task_executor_test.go +++ b/service/history/visibility_queue_task_executor_test.go @@ -235,7 +235,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecution() { }, }, ) - s.NoError(err) + s.Nil(err) wt := addWorkflowTaskScheduledEvent(mutableState) event := addWorkflowTaskStartedEvent(mutableState, wt.ScheduledEventID, taskQueueName, uuid.NewString()) @@ -274,7 +274,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecution() { ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecutionWithWorkflowClosedCleanup() { @@ -321,7 +321,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecutionWithWorkflow }, }, ) - s.NoError(err) + s.Nil(err) wt := addWorkflowTaskScheduledEvent(mutableState) event := addWorkflowTaskStartedEvent(mutableState, wt.ScheduledEventID, taskQueueName, uuid.NewString()) @@ -361,7 +361,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessCloseExecutionWithWorkflow ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessRecordWorkflowStartedTask() { @@ -391,7 +391,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessRecordWorkflowStartedTask( FirstWorkflowTaskBackoff: durationpb.New(backoff), }, ) - s.NoError(err) + s.Nil(err) taskID := int64(59) wt := addWorkflowTaskScheduledEvent(mutableState) @@ -415,7 +415,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessRecordWorkflowStartedTask( ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessUpsertWorkflowSearchAttributes() { @@ -463,7 +463,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessUpsertWorkflowSearchAttrib ).Return(nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessModifyWorkflowProperties() { @@ -531,7 +531,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessModifyWorkflowProperties() context.Background(), s.newTaskExecutable(visibilityTask), ) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessDeleteExecution() { @@ -545,7 +545,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessDeleteExecution() { WorkflowKey: workflowKey, CloseExecutionVisibilityTaskID: 0, }) - s.NoError(err) + s.Assert().NoError(err) }) s.Run("WorkflowCloseTime=1970-01-01T00:00:00Z", func() { s.mockVisibilityMgr.EXPECT().DeleteWorkflowExecution(gomock.Any(), gomock.Any()) @@ -553,7 +553,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessDeleteExecution() { WorkflowKey: workflowKey, CloseTime: time.Unix(0, 0).UTC(), }) - s.NoError(err) + s.Assert().NoError(err) }) s.Run("MultiCursorQueue", func() { const highWatermark int64 = 5 @@ -596,7 +596,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_InvalidTask() { s.mockExecutionMgr.EXPECT().GetWorkflowExecution(gomock.Any(), gomock.Any()).Return(&persistence.GetWorkflowExecutionResponse{State: mutableState}, nil) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) // Case 2: invalid task with a different initial versioned transition componentInitVT := mutableState.ChasmNodes["Visibility"].Metadata.InitialVersionedTransition @@ -607,7 +607,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_InvalidTask() { } resp = s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_RunningExecution() { @@ -658,7 +658,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_RunningExecution ) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_ClosedExecution() { @@ -691,7 +691,7 @@ func (s *visibilityQueueTaskExecutorSuite) TestProcessChasmTask_ClosedExecution( ) resp := s.visibilityQueueTaskExecutor.Execute(context.Background(), s.newTaskExecutable(visibilityTask)) - s.NoError(resp.ExecutionErr) + s.Nil(resp.ExecutionErr) } func (s *visibilityQueueTaskExecutorSuite) buildChasmMutableState( diff --git a/service/matching/ack_manager_test.go b/service/matching/ack_manager_test.go index d9533b45675..d22a8438f2a 100644 --- a/service/matching/ack_manager_test.go +++ b/service/matching/ack_manager_test.go @@ -33,10 +33,10 @@ func (s *AckManagerTestSuite) AddingTasksIncreasesBacklogCounter() { ackMgr := newTestAckMgr(s.logger) ackMgr.addTask(1) - s.Equal(int64(1), ackMgr.getBacklogCountHint()) + s.Equal(ackMgr.getBacklogCountHint(), int64(1)) ackMgr.addTask(12) - s.Equal(int64(2), ackMgr.getBacklogCountHint()) + s.Equal(ackMgr.getBacklogCountHint(), int64(2)) } func (s *AckManagerTestSuite) CompleteTaskMovesAckLevelUpToGap() { diff --git a/service/matching/configs/quotas_test.go b/service/matching/configs/quotas_test.go index 0a62e888c1a..2d44ccdc7d3 100644 --- a/service/matching/configs/quotas_test.go +++ b/service/matching/configs/quotas_test.go @@ -48,7 +48,7 @@ func (s *quotasSuite) TestAPIToPriorityMapping() { func (s *quotasSuite) TestAPIPrioritiesOrdered() { for idx := range APIPrioritiesOrdered[1:] { - s.Less(APIPrioritiesOrdered[idx], APIPrioritiesOrdered[idx+1]) + s.True(APIPrioritiesOrdered[idx] < APIPrioritiesOrdered[idx+1]) } } diff --git a/service/matching/forwarder_test.go b/service/matching/forwarder_test.go index 0b18a661421..dc2f44f2c44 100644 --- a/service/matching/forwarder_test.go +++ b/service/matching/forwarder_test.go @@ -107,7 +107,7 @@ func (t *ForwarderTestSuite) TestForwardWorkflowTask() { schedToStart := int32(request.GetScheduleToStartTimeout().AsDuration().Seconds()) rewritten := convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()) - t.Equal(schedToStart, rewritten) + t.EqualValues(schedToStart, rewritten) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_DB_BACKLOG, request.GetForwardInfo().GetTaskSource()) } @@ -137,7 +137,7 @@ func (t *ForwarderTestSuite) TestForwardWorkflowTask_WithBuildId() { schedToStart := int32(request.GetScheduleToStartTimeout().AsDuration().Seconds()) rewritten := convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()) - t.Equal(schedToStart, rewritten) + t.EqualValues(schedToStart, rewritten) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_HISTORY, request.GetForwardInfo().GetTaskSource()) } @@ -162,7 +162,7 @@ func (t *ForwarderTestSuite) TestForwardActivityTask() { t.Equal(taskInfo.Data.GetWorkflowId(), request.GetExecution().GetWorkflowId()) t.Equal(taskInfo.Data.GetRunId(), request.GetExecution().GetRunId()) t.Equal(taskInfo.Data.GetScheduledEventId(), request.GetScheduledEventId()) - t.Equal(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), + t.EqualValues(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), int32(request.GetScheduleToStartTimeout().AsDuration().Seconds())) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_DB_BACKLOG, request.GetForwardInfo().GetTaskSource()) @@ -190,7 +190,7 @@ func (t *ForwarderTestSuite) TestForwardActivityTask_WithBuildId() { t.Equal(taskInfo.Data.GetWorkflowId(), request.GetExecution().GetWorkflowId()) t.Equal(taskInfo.Data.GetRunId(), request.GetExecution().GetRunId()) t.Equal(taskInfo.Data.GetScheduledEventId(), request.GetScheduledEventId()) - t.Equal(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), + t.EqualValues(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), int32(request.GetScheduleToStartTimeout().AsDuration().Seconds())) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_DB_BACKLOG, request.GetForwardInfo().GetTaskSource()) @@ -495,7 +495,7 @@ func (t *ForwarderTestSuite) usingTaskqueuePartition(taskType enumspb.TaskQueueT t.NoError(err) t.partition = f.TaskQueue(taskType).NormalPartition(1) t.fwdr, err = newForwarder(t.cfg, UnversionedQueueKey(t.partition), t.client) - t.NoError(err) + t.Nil(err) } func (t *ForwarderTestSuite) usingBuildIdQueue(taskType enumspb.TaskQueueType, buildId string) { @@ -503,7 +503,7 @@ func (t *ForwarderTestSuite) usingBuildIdQueue(taskType enumspb.TaskQueueType, b t.NoError(err) t.partition = f.TaskQueue(taskType).NormalPartition(1) t.fwdr, err = newForwarder(t.cfg, BuildIdQueueKey(t.partition, buildId), t.client) - t.NoError(err) + t.Nil(err) } func mustParent(tn *tqid.NormalPartition, n int) *tqid.NormalPartition { diff --git a/service/matching/physical_task_queue_key_test.go b/service/matching/physical_task_queue_key_test.go index 2e7b7c3d335..c0d6af44812 100644 --- a/service/matching/physical_task_queue_key_test.go +++ b/service/matching/physical_task_queue_key_test.go @@ -19,7 +19,7 @@ func TestVersionSetQueueKey(t *testing.T) { key := VersionSetQueueKey(p, "abc3") a.Equal(p, key.Partition()) a.Equal("abc3", key.Version().VersionSet()) - a.Empty(key.Version().BuildId()) + a.Equal("", key.Version().BuildId()) a.Nil(key.Version().Deployment()) } @@ -31,7 +31,7 @@ func TestBuildIDQueueKey(t *testing.T) { p := f.TaskQueue(enumspb.TASK_QUEUE_TYPE_WORKFLOW).NormalPartition(2) key := BuildIdQueueKey(p, "abc3") a.Equal(p, key.Partition()) - a.Empty(key.Version().VersionSet()) + a.Equal("", key.Version().VersionSet()) a.Equal("abc3", key.Version().BuildId()) a.Nil(key.Version().Deployment()) } @@ -48,8 +48,8 @@ func TestDeploymentQueueKey(t *testing.T) { } key := DeploymentQueueKey(p, d) a.Equal(p, key.Partition()) - a.Empty(key.Version().VersionSet()) - a.Empty(key.Version().BuildId()) + a.Equal("", key.Version().VersionSet()) + a.Equal("", key.Version().BuildId()) a.True(d.Equal(key.Version().Deployment())) } @@ -61,8 +61,8 @@ func TestUnversionedQueueKey(t *testing.T) { p := f.TaskQueue(enumspb.TASK_QUEUE_TYPE_WORKFLOW).NormalPartition(2) key := UnversionedQueueKey(p) a.Equal(p, key.Partition()) - a.Empty(key.Version().VersionSet()) - a.Empty(key.Version().BuildId()) + a.Equal("", key.Version().VersionSet()) + a.Equal("", key.Version().BuildId()) a.Nil(key.Version().Deployment()) } diff --git a/service/matching/physical_task_queue_manager_test.go b/service/matching/physical_task_queue_manager_test.go index e971d6ee79b..b7cbdfb305c 100644 --- a/service/matching/physical_task_queue_manager_test.go +++ b/service/matching/physical_task_queue_manager_test.go @@ -258,7 +258,7 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestLegacyDescribeTaskQueue() { includeTaskStatus := false descResp := s.tqMgr.LegacyDescribeTaskQueue(includeTaskStatus) - s.Empty(descResp.DescResponse.GetPollers()) + s.Equal(0, len(descResp.DescResponse.GetPollers())) s.Nil(descResp.DescResponse.GetTaskQueueStatus()) includeTaskStatus = true @@ -280,14 +280,14 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestLegacyDescribeTaskQueue() { } descResp = s.tqMgr.LegacyDescribeTaskQueue(includeTaskStatus) - s.Len(descResp.DescResponse.GetPollers(), 1) + s.Equal(1, len(descResp.DescResponse.GetPollers())) s.Equal(string(pollerIdent), descResp.DescResponse.Pollers[0].GetIdentity()) s.NotEmpty(descResp.DescResponse.Pollers[0].GetLastAccessTime()) rps := 5.0 s.tqMgr.pollerHistory.updatePollerInfo(pollerIdent, makePollMetadata(rps)) descResp = s.tqMgr.LegacyDescribeTaskQueue(includeTaskStatus) - s.Len(descResp.DescResponse.GetPollers(), 1) + s.Equal(1, len(descResp.DescResponse.GetPollers())) s.Equal(string(pollerIdent), descResp.DescResponse.Pollers[0].GetIdentity()) s.True(descResp.DescResponse.Pollers[0].GetRatePerSecond() > 4.0 && descResp.DescResponse.Pollers[0].GetRatePerSecond() < 6.0) @@ -310,7 +310,7 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestCheckIdleTaskQueue() { // Active poll-er s.tqMgr.Start() s.tqMgr.pollerHistory.updatePollerInfo("test-poll", &pollMetadata{}) - s.Len(s.tqMgr.GetAllPollerInfo(), 1) + s.Equal(1, len(s.tqMgr.GetAllPollerInfo())) time.Sleep(50 * time.Millisecond) // nolint:forbidigo s.Equal(common.DaemonStatusStarted, atomic.LoadInt32(&s.tqMgr.status)) s.tqMgr.Stop(unloadCauseUnspecified) @@ -320,7 +320,7 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestCheckIdleTaskQueue() { // Active adding task s.tqMgr.Start() - s.Empty(s.tqMgr.GetAllPollerInfo()) + s.Equal(0, len(s.tqMgr.GetAllPollerInfo())) time.Sleep(50 * time.Millisecond) // nolint:forbidigo s.Equal(common.DaemonStatusStarted, atomic.LoadInt32(&s.tqMgr.status)) s.tqMgr.Stop(unloadCauseUnspecified) diff --git a/service/worker/deletenamespace/activities_test.go b/service/worker/deletenamespace/activities_test.go index 4719eedb759..0d62634f7a4 100644 --- a/service/worker/deletenamespace/activities_test.go +++ b/service/worker/deletenamespace/activities_test.go @@ -90,7 +90,7 @@ func Test_ValidateNexusEndpointsActivity(t *testing.T) { nexusEndpointManager.EXPECT().ListNexusEndpoints(gomock.Any(), gomock.Any()).Return(nil, errors.New("persistence failure")) err = a.ValidateNexusEndpointsActivity(context.Background(), "namespace-id", "namespace") require.Error(t, err) - require.Equal(t, "unable to list Nexus endpoints for namespace namespace: persistence failure", err.Error()) + require.Equal(t, err.Error(), "unable to list Nexus endpoints for namespace namespace: persistence failure") ctrl.Finish() } diff --git a/service/worker/deletenamespace/deleteexecutions/workflow_test.go b/service/worker/deletenamespace/deleteexecutions/workflow_test.go index ee5a90fbb1f..e9742ea9330 100644 --- a/service/worker/deletenamespace/deleteexecutions/workflow_test.go +++ b/service/worker/deletenamespace/deleteexecutions/workflow_test.go @@ -3,6 +3,7 @@ package deleteexecutions import ( "context" "encoding/json" + stderrors "errors" "strconv" "sync/atomic" "testing" @@ -236,8 +237,8 @@ func Test_DeleteExecutionsWorkflow_ManyExecutions_ActivityError(t *testing.T) { err := env.GetWorkflowError() require.Error(t, err) var appErr *temporal.ApplicationError - require.ErrorAs(t, err, &appErr) - require.Equal(t, "specific_error_from_activity (type: Unavailable, retryable: true)", appErr.Error()) + require.True(t, stderrors.As(err, &appErr)) + require.Equal(t, appErr.Error(), "specific_error_from_activity (type: Unavailable, retryable: true)") } func Test_DeleteExecutionsWorkflow_NoActivityMocks_ManyExecutions(t *testing.T) { diff --git a/service/worker/deletenamespace/reclaimresources/workflow_test.go b/service/worker/deletenamespace/reclaimresources/workflow_test.go index 5712ff8f5ce..b61c32ac1cc 100644 --- a/service/worker/deletenamespace/reclaimresources/workflow_test.go +++ b/service/worker/deletenamespace/reclaimresources/workflow_test.go @@ -70,7 +70,7 @@ func Test_ReclaimResourcesWorkflow_Success(t *testing.T) { require.NoError(t, env.GetWorkflowResult(&result)) require.Equal(t, 0, result.DeleteErrorCount) require.Equal(t, 10, result.DeleteSuccessCount) - require.True(t, result.NamespaceDeleted) + require.Equal(t, true, result.NamespaceDeleted) } func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_Error(t *testing.T) { @@ -119,7 +119,8 @@ func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_Error(t *testing.T err := env.GetWorkflowError() require.Error(t, err) require.Equal(t, - "workflow execution error (type: ReclaimResourcesWorkflow, workflowID: default-test-workflow-id, runID: default-test-run-id): activity error (type: EnsureNoExecutionsAdvVisibilityActivity, scheduledEventID: 0, startedEventID: 0, identity: ): specific_error_from_activity", err.Error()) + err.Error(), + "workflow execution error (type: ReclaimResourcesWorkflow, workflowID: default-test-workflow-id, runID: default-test-run-id): activity error (type: EnsureNoExecutionsAdvVisibilityActivity, scheduledEventID: 0, startedEventID: 0, identity: ): specific_error_from_activity") } func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_ExecutionsStillExist(t *testing.T) { @@ -167,7 +168,7 @@ func Test_ReclaimResourcesWorkflow_EnsureNoExecutionsActivity_ExecutionsStillExi require.True(t, env.IsWorkflowCompleted()) err := env.GetWorkflowError() var appErr *temporal.ApplicationError - require.ErrorAs(t, err, &appErr) + require.True(t, stderrors.As(err, &appErr)) require.Equal(t, errors.ExecutionsStillExistErrType, appErr.Type()) } @@ -263,7 +264,7 @@ func Test_ReclaimResourcesWorkflow_NoActivityMocks_Success(t *testing.T) { require.NoError(t, env.GetWorkflowResult(&result)) require.Equal(t, 0, result.DeleteErrorCount) require.Equal(t, 10, result.DeleteSuccessCount) - require.True(t, result.NamespaceDeleted) + require.Equal(t, true, result.NamespaceDeleted) } func Test_ReclaimResourcesWorkflow_NoActivityMocks_NoProgressMade(t *testing.T) { @@ -339,7 +340,7 @@ func Test_ReclaimResourcesWorkflow_NoActivityMocks_NoProgressMade(t *testing.T) err := env.GetWorkflowError() require.Error(t, err) var appErr *temporal.ApplicationError - require.ErrorAs(t, err, &appErr) + require.True(t, stderrors.As(err, &appErr)) require.Equal(t, errors.NoProgressErrType, appErr.Type()) } @@ -415,5 +416,5 @@ func Test_ReclaimResourcesWorkflow_UpdateDeleteDelay(t *testing.T) { require.NoError(t, env.GetWorkflowResult(&result)) require.Equal(t, 0, result.DeleteErrorCount) require.Equal(t, 10, result.DeleteSuccessCount) - require.True(t, result.NamespaceDeleted) + require.Equal(t, true, result.NamespaceDeleted) } diff --git a/service/worker/deletenamespace/workflow_test.go b/service/worker/deletenamespace/workflow_test.go index 67586329def..4f14c61964c 100644 --- a/service/worker/deletenamespace/workflow_test.go +++ b/service/worker/deletenamespace/workflow_test.go @@ -252,7 +252,7 @@ func Test_DeleteProtectedNamespace(t *testing.T) { require.Error(t, err) var appErr *temporal.ApplicationError require.ErrorAs(t, err, &appErr) - require.Equal(t, "namespace namespace is protected from deletion", appErr.Message()) + require.Equal(t, appErr.Message(), "namespace namespace is protected from deletion") } func Test_DeleteNamespaceUsedByNexus(t *testing.T) { @@ -279,5 +279,5 @@ func Test_DeleteNamespaceUsedByNexus(t *testing.T) { require.Error(t, err) var appErr *temporal.ApplicationError require.ErrorAs(t, err, &appErr) - require.Equal(t, "cannot delete a namespace that is a target of a Nexus endpoint", appErr.Message()) + require.Equal(t, appErr.Message(), "cannot delete a namespace that is a target of a Nexus endpoint") } diff --git a/service/worker/dlq/workflow_test.go b/service/worker/dlq/workflow_test.go index 01143cbc745..8d13821227f 100644 --- a/service/worker/dlq/workflow_test.go +++ b/service/worker/dlq/workflow_test.go @@ -572,7 +572,7 @@ func (p *testParams) setDefaultParams(t *testing.T) { require.Equal(t, p.expectedQueryResp.LastProcessedMessageID, response.LastProcessedMessageID) require.Equal(t, p.expectedQueryResp.WorkflowType, response.WorkflowType) require.Equal(t, p.expectedQueryResp.NumberOfMessagesProcessed, response.NumberOfMessagesProcessed) - require.Equal(t, p.expectedQueryResp.DlqKey, response.DlqKey) + require.EqualValues(t, p.expectedQueryResp.DlqKey, response.DlqKey) } p.taskClientDialer = dlq.TaskClientDialerFn(func(ctx context.Context, address string) (dlq.TaskClient, error) { return dlq.AddTasksFn(func(ctx context.Context, req *adminservice.AddTasksRequest) (*adminservice.AddTasksResponse, error) { diff --git a/service/worker/migration/handover_workflow_test.go b/service/worker/migration/handover_workflow_test.go index 3e66fbbe186..b8b6bde53fe 100644 --- a/service/worker/migration/handover_workflow_test.go +++ b/service/worker/migration/handover_workflow_test.go @@ -1,6 +1,7 @@ package migration import ( + "errors" "testing" "time" @@ -119,7 +120,7 @@ func TestHandoverWorkflow_SetTimeout(t *testing.T) { require.Error(t, workflowErr) var applicationErr *temporal.ApplicationError - require.ErrorAs(t, workflowErr, &applicationErr) + require.True(t, errors.As(workflowErr, &applicationErr)) assert.Equal(t, "InvalidTimeout", applicationErr.Type()) assert.True(t, applicationErr.NonRetryable()) } diff --git a/service/worker/scanner/executions/task_test.go b/service/worker/scanner/executions/task_test.go index bd1a591fdf9..aa0a53dcf5c 100644 --- a/service/worker/scanner/executions/task_test.go +++ b/service/worker/scanner/executions/task_test.go @@ -5,6 +5,7 @@ import ( "errors" "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "go.temporal.io/server/common/log" "go.temporal.io/server/common/metrics" @@ -55,7 +56,7 @@ func (s *taskTestSuite) TestRun_Success_EmptyResults() { Return(&persistence.ListConcreteExecutionsResponse{}, nil) status := task.Run() - s.Equal(executor.TaskStatusDone, status) + assert.Equal(s.T(), executor.TaskStatusDone, status) } func (s *taskTestSuite) TestRun_PaginationError() { @@ -67,5 +68,5 @@ func (s *taskTestSuite) TestRun_PaginationError() { Return(nil, errors.New("pagination error")) status := task.Run() - s.Equal(executor.TaskStatusDefer, status) + assert.Equal(s.T(), executor.TaskStatusDefer, status) } diff --git a/service/worker/scanner/taskqueue/scavenger_test.go b/service/worker/scanner/taskqueue/scavenger_test.go index fb1ca666691..c88c40592b4 100644 --- a/service/worker/scanner/taskqueue/scavenger_test.go +++ b/service/worker/scanner/taskqueue/scavenger_test.go @@ -62,7 +62,7 @@ func (s *ScavengerTestSuite) TestAllExpiredTasks() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Empty(tasks, "failed to delete all expired tasks") + s.Equal(0, len(tasks), "failed to delete all expired tasks") s.Nil(s.taskQueueTable.get(tl), "failed to delete expired executorTask queue") } } @@ -81,7 +81,7 @@ func (s *ScavengerTestSuite) TestAllAliveTasks() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Len(tasks, nTasks, "scavenger deleted a non-expired executorTask") + s.Equal(nTasks, len(tasks), "scavenger deleted a non-expired executorTask") s.NotNil(s.taskQueueTable.get(tl), "scavenger deleted a non-expired executorTask queue") } } @@ -101,7 +101,7 @@ func (s *ScavengerTestSuite) TestExpiredTasksFollowedByAlive() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Len(tasks, nTasks/2, "scavenger deleted non-expired tasks") + s.Equal(nTasks/2, len(tasks), "scavenger deleted non-expired tasks") s.Equal(int64(nTasks/2), tasks[0].GetTaskId(), "scavenger deleted wrong set of tasks") s.NotNil(s.taskQueueTable.get(tl), "scavenger deleted a non-expired executorTask queue") } @@ -122,7 +122,7 @@ func (s *ScavengerTestSuite) TestAliveTasksFollowedByExpired() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Len(tasks, nTasks, "scavenger deleted non-expired tasks") + s.Equal(nTasks, len(tasks), "scavenger deleted non-expired tasks") s.NotNil(s.taskQueueTable.get(tl), "scavenger deleted a non-expired executorTask queue") } } @@ -141,10 +141,10 @@ func (s *ScavengerTestSuite) TestAllExpiredTasksWithErrors() { s.runScavenger() for _, tbl := range s.taskTables { tasks := tbl.get(100) - s.Empty(tasks, "failed to delete all expired tasks") + s.Equal(0, len(tasks), "failed to delete all expired tasks") } result, _ := s.taskQueueTable.list(nil, 10) - s.Len(result, 1, "expected partial deletion due to transient errors") + s.Equal(1, len(result), "expected partial deletion due to transient errors") } func (s *ScavengerTestSuite) runScavenger() { diff --git a/service/worker/scheduler/calendar_test.go b/service/worker/scheduler/calendar_test.go index 5cabbe5080d..1ece799bf1e 100644 --- a/service/worker/scheduler/calendar_test.go +++ b/service/worker/scheduler/calendar_test.go @@ -111,7 +111,7 @@ func (s *calendarSuite) TestParseCronString() { DayOfWeek: []*schedulepb.Range{{Start: 0, End: 6}}, }, scs) s.Nil(iv) - s.Empty(tz) + s.Equal("", tz) _, _, _, err = parseCronString("0 1 2 3 4 1999") s.ErrorContains(err, "Year is not in range") @@ -141,7 +141,7 @@ func (s *calendarSuite) TestParseCronString() { DayOfWeek: []*schedulepb.Range{{Start: 0, End: 6}}, }, scs) s.Nil(iv) - s.Empty(tz) + s.Equal("", tz) scs, iv, tz, err = parseCronString("@every 5d") s.NoError(err) @@ -149,7 +149,7 @@ func (s *calendarSuite) TestParseCronString() { s.Equal(&schedulepb.IntervalSpec{ Interval: durationpb.New(5 * 24 * time.Hour), }, iv) - s.Empty(tz) + s.Equal("", tz) scs, iv, tz, err = parseCronString("@every 5h/45m") s.NoError(err) @@ -158,7 +158,7 @@ func (s *calendarSuite) TestParseCronString() { Interval: durationpb.New(5 * time.Hour), Phase: durationpb.New(45 * time.Minute), }, iv) - s.Empty(tz) + s.Equal("", tz) } func (s *calendarSuite) TestCalendarNextBasic() { @@ -297,7 +297,7 @@ func (s *calendarSuite) TestMakeRange() { s.T().Helper() ranges, err := makeRange(str, "Test", "", minVal, maxVal, parseMode) s.NoError(err) - s.Equal(expected, ranges) + s.EqualValues(expected, ranges) } checkErr := func(str string, minVal, maxVal int, parseMode parseMode, expectedErr string) { s.T().Helper() diff --git a/service/worker/scheduler/query_test.go b/service/worker/scheduler/query_test.go index 936990c7e81..aeb500218a5 100644 --- a/service/worker/scheduler/query_test.go +++ b/service/worker/scheduler/query_test.go @@ -265,7 +265,7 @@ func TestGetQueryFields(t *testing.T) { ) if tc.expectedErrMsg == "" { s.NoError(err) - s.Len(fields, len(tc.expectedFields)) + s.Equal(len(tc.expectedFields), len(fields)) for _, f := range fields { s.Contains(tc.expectedFields, f) } diff --git a/service/worker/scheduler/workflow_test.go b/service/worker/scheduler/workflow_test.go index 46a543e8b96..6dccb2843af 100644 --- a/service/worker/scheduler/workflow_test.go +++ b/service/worker/scheduler/workflow_test.go @@ -289,7 +289,7 @@ func (s *workflowSuite) runAcrossContinue( s.True(s.env.IsWorkflowCompleted()) result := s.env.GetWorkflowError() var canErr *workflow.ContinueAsNewError - s.Require().ErrorAs(result, &canErr, "result: %v", result) + s.Require().True(errors.As(result, &canErr), "result: %v", result) s.env.AssertExpectations(s.T()) @@ -302,7 +302,7 @@ func (s *workflowSuite) runAcrossContinue( s.Require().NoError(payloads.Decode(canErr.Input, &startArgs)) } // check starts that we actually got - s.Require().Lenf(state.started, len(runs), "started %#v", state.started) + s.Require().Equalf(len(runs), len(state.started), "started %#v", state.started) for _, run := range runs { actual := state.started[run.id] inRange := !actual.Before(run.start.Add(-run.startTolerance)) && !actual.After(run.start.Add(run.startTolerance)) @@ -1885,26 +1885,26 @@ func (s *workflowSuite) TestLimitedActions() { s.env.RegisterDelayedCallback(func() { desc := s.describe() s.Equal(int64(2), desc.Schedule.State.RemainingActions) - s.Len(desc.Info.FutureActionTimes, 2) + s.Equal(2, len(desc.Info.FutureActionTimes)) }, 1*time.Minute) s.env.RegisterDelayedCallback(func() { desc := s.describe() s.Equal(int64(1), desc.Schedule.State.RemainingActions) - s.Len(desc.Info.FutureActionTimes, 1) + s.Equal(1, len(desc.Info.FutureActionTimes)) }, 5*time.Minute) s.env.RegisterDelayedCallback(func() { desc := s.describe() s.Equal(int64(0), desc.Schedule.State.RemainingActions) - s.Empty(desc.Info.FutureActionTimes) - s.Len(s.runningWorkflows(), 1) + s.Equal(0, len(desc.Info.FutureActionTimes)) + s.Equal(1, len(s.runningWorkflows())) }, 7*time.Minute) s.env.RegisterDelayedCallback(func() { // hasn't updated yet since we slept past :09 - s.Len(s.runningWorkflows(), 1) + s.Equal(1, len(s.runningWorkflows())) s.env.SignalWorkflow(SignalNameRefresh, nil) }, 10*time.Minute) s.env.RegisterDelayedCallback(func() { - s.Empty(s.runningWorkflows()) + s.Equal(0, len(s.runningWorkflows())) }, 10*time.Minute+1*time.Second) s.run(&schedulepb.Schedule{ @@ -2042,7 +2042,7 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenNoActions() { }) s.True(s.env.IsWorkflowCompleted()) s.False(workflow.IsContinueAsNewError(s.env.GetWorkflowError())) - s.Equal(s.env.Now().Sub(time.Date(2022, 6, 1, 0, 30, 0, 0, time.UTC)), CurrentTweakablePolicies.RetentionTime) + s.True(s.env.Now().Sub(time.Date(2022, 6, 1, 0, 30, 0, 0, time.UTC)) == CurrentTweakablePolicies.RetentionTime) } func (s *workflowSuite) TestExitScheduleWorkflowWhenNoNextTime() { @@ -2078,7 +2078,7 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenNoNextTime() { }) s.True(s.env.IsWorkflowCompleted()) s.False(workflow.IsContinueAsNewError(s.env.GetWorkflowError())) - s.Equal(s.env.Now().Sub(time.Date(2022, 6, 1, 1, 0, 0, 0, time.UTC)), CurrentTweakablePolicies.RetentionTime) + s.True(s.env.Now().Sub(time.Date(2022, 6, 1, 1, 0, 0, 0, time.UTC)) == CurrentTweakablePolicies.RetentionTime) } func (s *workflowSuite) TestExitScheduleWorkflowWhenEmpty() { @@ -2100,7 +2100,7 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenEmpty() { s.True(s.env.IsWorkflowCompleted()) s.False(workflow.IsContinueAsNewError(s.env.GetWorkflowError())) - s.Equal(s.env.Now().Sub(baseStartTime), CurrentTweakablePolicies.RetentionTime) + s.True(s.env.Now().Sub(baseStartTime) == CurrentTweakablePolicies.RetentionTime) } func (s *workflowSuite) TestCANByIterations() { From 0c6849acc3fc9d35e6ee960eb7bd8d2f7d5ebf13 Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Sun, 21 Jun 2026 13:37:55 -0700 Subject: [PATCH 5/7] Type jitter comparison bounds --- common/backoff/jitter_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/backoff/jitter_test.go b/common/backoff/jitter_test.go index 9e4e2344d6e..0ea669de03d 100644 --- a/common/backoff/jitter_test.go +++ b/common/backoff/jitter_test.go @@ -34,7 +34,7 @@ func (s *jitterSuite) TestJitter_Int64() { s.Less(result, upperBound) result = FullJitter(input) - s.GreaterOrEqual(result, 0) + s.GreaterOrEqual(result, int64(0)) s.Less(result, input) } } @@ -51,7 +51,7 @@ func (s *jitterSuite) TestJitter_Float64() { s.Less(result, upperBound) result = FullJitter(input) - s.GreaterOrEqual(result, 0) + s.GreaterOrEqual(result, float64(0)) s.Less(result, input) } } @@ -68,7 +68,7 @@ func (s *jitterSuite) TestJitter_Duration() { s.Less(result, upperBound) result = FullJitter(input) - s.GreaterOrEqual(result, 0) + s.GreaterOrEqual(result, time.Duration(0)) s.Less(result, input) } } From a99128e9c8ce7bd75549a54900dc80636b2fb7c4 Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Tue, 23 Jun 2026 17:22:07 -0700 Subject: [PATCH 6/7] Keep testifylint fixes server-owned --- common/tqid/task_queue_id_test.go | 5 +- components/callbacks/statemachine_test.go | 14 +++--- components/nexusoperations/executors_test.go | 30 ++++++------ .../nexusoperations/statemachine_test.go | 46 +++++++++---------- .../nexusoperations/workflow/commands_test.go | 42 ++++++++--------- .../replication/stream_receiver_test.go | 4 +- service/matching/ack_manager_test.go | 4 +- service/matching/configs/quotas_test.go | 2 +- service/matching/forwarder_test.go | 12 ++--- .../matching/physical_task_queue_key_test.go | 12 ++--- .../physical_task_queue_manager_test.go | 10 ++-- .../scanner/taskqueue/scavenger_test.go | 12 ++--- service/worker/scheduler/calendar_test.go | 10 ++-- service/worker/scheduler/query_test.go | 2 +- service/worker/scheduler/workflow_test.go | 22 ++++----- 15 files changed, 113 insertions(+), 114 deletions(-) diff --git a/common/tqid/task_queue_id_test.go b/common/tqid/task_queue_id_test.go index 487d799a34e..5ebff7c9007 100644 --- a/common/tqid/task_queue_id_test.go +++ b/common/tqid/task_queue_id_test.go @@ -1,7 +1,6 @@ package tqid import ( - "errors" "math/rand" "strconv" "testing" @@ -45,7 +44,7 @@ func TestFromProtoPartition_Sticky(t *testing.T) { a.Equal(nsid, p.NamespaceId()) a.Equal(taskType, p.TaskType()) a.Equal(kind, p.Kind()) - a.Equal("", p.TaskQueue().Name()) + a.Empty(p.TaskQueue().Name()) a.Equal(stickyName, p.(*StickyPartition).StickyName()) a.Equal(stickyName, p.RpcName()) a.False(p.IsRoot()) @@ -54,7 +53,7 @@ func TestFromProtoPartition_Sticky(t *testing.T) { proto.Name = "/_sys/my-basic-tq-name/23" _, err = PartitionFromProto(proto, nsid, taskType) // sticky queue cannot have non-zero prtn - a.True(errors.Is(err, ErrNonZeroSticky)) + a.ErrorIs(err, ErrNonZeroSticky) } func TestFromProtoPartition_WorkerCommands(t *testing.T) { diff --git a/components/callbacks/statemachine_test.go b/components/callbacks/statemachine_test.go index 205c992d552..df50252d2f3 100644 --- a/components/callbacks/statemachine_test.go +++ b/components/callbacks/statemachine_test.go @@ -44,10 +44,10 @@ func TestValidTransitions(t *testing.T) { require.False(t, callback.LastAttemptFailure.GetApplicationFailureInfo().NonRetryable) require.Equal(t, currentTime, callback.LastAttemptCompleteTime.AsTime()) dt := currentTime.Add(time.Second).Sub(callback.NextAttemptScheduleTime.AsTime()) - require.True(t, dt < time.Millisecond*200) + require.Less(t, dt, time.Millisecond*200) // Assert backoff task is generated - require.Equal(t, 1, len(out.Tasks)) + require.Len(t, out.Tasks, 1) boTask := out.Tasks[0].(callbacks.BackoffTask) require.Equal(t, callback.NextAttemptScheduleTime.AsTime(), boTask.Deadline()) @@ -64,7 +64,7 @@ func TestValidTransitions(t *testing.T) { require.Nil(t, callback.NextAttemptScheduleTime) // Assert callback task is generated - require.Equal(t, 1, len(out.Tasks)) + require.Len(t, out.Tasks, 1) cbTask := out.Tasks[0].(callbacks.InvocationTask) require.Equal(t, "http://address:666", cbTask.Destination()) @@ -84,7 +84,7 @@ func TestValidTransitions(t *testing.T) { require.Nil(t, callback.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Equal(t, 0, len(out.Tasks)) + require.Empty(t, out.Tasks) // Reset back to scheduled callback = dup @@ -104,7 +104,7 @@ func TestValidTransitions(t *testing.T) { require.Nil(t, callback.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Equal(t, 0, len(out.Tasks)) + require.Empty(t, out.Tasks) } func TestCompareState(t *testing.T) { @@ -184,9 +184,9 @@ func TestCompareState(t *testing.T) { if tc.sign == 0 { require.Equal(t, 0, res) } else if tc.sign > 0 { - require.Greater(t, res, 0) + require.Positive(t, res) } else { - require.Greater(t, 0, res) + require.Negative(t, res) } }) } diff --git a/components/nexusoperations/executors_test.go b/components/nexusoperations/executors_test.go index 8c5c430ba16..9c63182531e 100644 --- a/components/nexusoperations/executors_test.go +++ b/components/nexusoperations/executors_test.go @@ -141,7 +141,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "pending", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_STARTED, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_STARTED, events[0].EventType) protorequire.ProtoEqual(t, &historypb.NexusOperationStartedEventAttributes{ ScheduledEventId: 1, @@ -186,7 +186,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "successful", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_SUCCEEDED, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_COMPLETED, events[0].EventType) attrs := &historypb.NexusOperationCompletedEventAttributes{ ScheduledEventId: 1, @@ -212,7 +212,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "operation-unsuccessful:failed", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_FAILED, events[0].EventType) attrs := &historypb.NexusOperationFailedEventAttributes{ ScheduledEventId: 1, @@ -273,7 +273,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "operation-unsuccessful:canceled", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_CANCELED, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_CANCELED, events[0].EventType) attrs := &historypb.NexusOperationCanceledEventAttributes{ ScheduledEventId: 1, @@ -327,7 +327,7 @@ func TestProcessInvocationTask(t *testing.T) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, op.State()) require.Equal(t, string(nexus.HandlerErrorTypeInternal), op.LastAttemptFailure.GetNexusHandlerFailureInfo().GetType()) require.Equal(t, "internal server error", op.LastAttemptFailure.Message) - require.Equal(t, 0, len(events)) + require.Empty(t, events) }, }, { @@ -344,7 +344,7 @@ func TestProcessInvocationTask(t *testing.T) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, op.State()) require.NotNil(t, op.LastAttemptFailure.GetApplicationFailureInfo()) require.Regexp(t, "request timed out", op.LastAttemptFailure.Message) - require.Equal(t, 0, len(events)) + require.Empty(t, events) }, }, { @@ -385,7 +385,7 @@ func TestProcessInvocationTask(t *testing.T) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, op.State()) require.NotNil(t, op.LastAttemptFailure.GetApplicationFailureInfo()) require.Regexp(t, "request timed out", op.LastAttemptFailure.Message) - require.Equal(t, 0, len(events)) + require.Empty(t, events) }, }, { @@ -414,7 +414,7 @@ func TestProcessInvocationTask(t *testing.T) { onStartOperation: nil, // This should not be called if the operation has timed out. checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_TIMED_OUT, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) failure := events[0].GetNexusOperationTimedOutEventAttributes().Failure.Cause require.NotNil(t, failure.GetTimeoutFailureInfo()) require.Equal(t, "operation timed out", failure.Message) @@ -428,7 +428,7 @@ func TestProcessInvocationTask(t *testing.T) { onStartOperation: nil, // This should not be called if the endpoint is not found. checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) failure := events[0].GetNexusOperationFailedEventAttributes().Failure.Cause require.Equal(t, string(nexus.HandlerErrorTypeNotFound), failure.GetNexusHandlerFailureInfo().GetType()) require.Equal(t, "endpoint not registered", failure.Message) @@ -442,7 +442,7 @@ func TestProcessInvocationTask(t *testing.T) { onStartOperation: nil, // This should not be called if the endpoint is not found. checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) failure := events[0].GetNexusOperationFailedEventAttributes().Failure.Cause require.Equal(t, string(nexus.HandlerErrorTypeNotFound), failure.GetNexusHandlerFailureInfo().GetType()) require.Equal(t, "endpoint not registered", failure.Message) @@ -468,7 +468,7 @@ func TestProcessInvocationTask(t *testing.T) { checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_STARTED, op.State()) require.Nil(t, op.LastAttemptFailure) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) }, }, { @@ -486,7 +486,7 @@ func TestProcessInvocationTask(t *testing.T) { expectedMetricOutcome: "invalid-operation-token", checkOutcome: func(t *testing.T, op nexusoperations.Operation, events []*historypb.HistoryEvent) { require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_FAILED, op.State()) - require.Equal(t, 1, len(events)) + require.Len(t, events, 1) failure := events[0].GetNexusOperationFailedEventAttributes().Failure.Cause require.NotNil(t, failure.GetApplicationFailureInfo()) require.Equal(t, "invalid operation token: length exceeds allowed limit (11/10)", failure.Message) @@ -661,7 +661,7 @@ func TestProcessBackoffTask(t *testing.T) { op, err := hsm.MachineData[nexusoperations.Operation](node) require.NoError(t, err) require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_SCHEDULED, op.State()) - require.Equal(t, 0, len(backend.Events)) + require.Empty(t, backend.Events) } func TestProcessTimeoutTask(t *testing.T) { @@ -683,7 +683,7 @@ func TestProcessTimeoutTask(t *testing.T) { op, err := hsm.MachineData[nexusoperations.Operation](node) require.NoError(t, err) require.Equal(t, enumsspb.NEXUS_OPERATION_STATE_TIMED_OUT, op.State()) - require.Equal(t, 1, len(backend.Events)) + require.Len(t, backend.Events, 1) require.Equal(t, enumspb.EVENT_TYPE_NEXUS_OPERATION_TIMED_OUT, backend.Events[0].EventType) protorequire.ProtoEqual(t, &historypb.NexusOperationTimedOutEventAttributes{ ScheduledEventId: 1, @@ -1379,7 +1379,7 @@ func TestProcessCancelationBackoffTask(t *testing.T) { c, err := hsm.MachineData[nexusoperations.Cancelation](node) require.NoError(t, err) require.Equal(t, enumspb.NEXUS_OPERATION_CANCELLATION_STATE_SCHEDULED, c.State()) - require.Equal(t, 0, len(backend.Events)) + require.Empty(t, backend.Events) } // mockNexusOperationRoutingKey is a simple mock implementation of the routing key interface diff --git a/components/nexusoperations/statemachine_test.go b/components/nexusoperations/statemachine_test.go index 23fd17fe23c..4943feacaa8 100644 --- a/components/nexusoperations/statemachine_test.go +++ b/components/nexusoperations/statemachine_test.go @@ -29,7 +29,7 @@ func TestAddChild(t *testing.T) { name: "with timeout", timeout: time.Hour, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Equal(t, 2, len(tasks)) + require.Len(t, tasks, 2) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) require.Equal(t, nexusoperations.TaskTypeScheduleToCloseTimeout, tasks[1].Type()) }, @@ -38,7 +38,7 @@ func TestAddChild(t *testing.T) { name: "without timeout", timeout: 0, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Equal(t, 1, len(tasks)) + require.Len(t, tasks, 1) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) }, }, @@ -65,7 +65,7 @@ func TestAddChild(t *testing.T) { require.NoError(t, err) opLog, err := root.OpLog() require.NoError(t, err) - require.Equal(t, 1, len(opLog)) + require.Len(t, opLog, 1) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) tc.assertTasks(t, transitionOp.Output.Tasks) @@ -226,9 +226,9 @@ func TestRegenerateTasks(t *testing.T) { scheduleToCloseTimeout: time.Hour, state: enumsspb.NEXUS_OPERATION_STATE_SCHEDULED, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Equal(t, 2, len(tasks)) + require.Len(t, tasks, 2) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) - require.Equal(t, tasks[0].(nexusoperations.InvocationTask).EndpointName, "endpoint") + require.Equal(t, "endpoint", tasks[0].(nexusoperations.InvocationTask).EndpointName) require.Equal(t, nexusoperations.TaskTypeScheduleToCloseTimeout, tasks[1].Type()) }, }, @@ -236,7 +236,7 @@ func TestRegenerateTasks(t *testing.T) { name: "scheduled | without timeout", state: enumsspb.NEXUS_OPERATION_STATE_SCHEDULED, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Equal(t, 1, len(tasks)) + require.Len(t, tasks, 1) require.Equal(t, nexusoperations.TaskTypeInvocation, tasks[0].Type()) }, }, @@ -245,7 +245,7 @@ func TestRegenerateTasks(t *testing.T) { scheduleToCloseTimeout: time.Hour, state: enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Equal(t, 2, len(tasks)) + require.Len(t, tasks, 2) require.Equal(t, nexusoperations.TaskTypeBackoff, tasks[0].Type()) require.Equal(t, nexusoperations.TaskTypeScheduleToCloseTimeout, tasks[1].Type()) }, @@ -254,7 +254,7 @@ func TestRegenerateTasks(t *testing.T) { name: "backing off | without timeout", state: enumsspb.NEXUS_OPERATION_STATE_BACKING_OFF, assertTasks: func(t *testing.T, tasks []hsm.Task) { - require.Equal(t, 1, len(tasks)) + require.Len(t, tasks, 1) require.Equal(t, nexusoperations.TaskTypeBackoff, tasks[0].Type()) }, }, @@ -343,10 +343,10 @@ func TestRetry(t *testing.T) { })) opLog, err := node.Parent.OpLog() require.NoError(t, err) - require.Equal(t, 1, len(opLog)) + require.Len(t, opLog, 1) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) - require.Equal(t, 1, len(transitionOp.Output.Tasks)) + require.Len(t, transitionOp.Output.Tasks, 1) boTask := transitionOp.Output.Tasks[0].(nexusoperations.BackoffTask) // nolint:revive op, err := hsm.MachineData[nexusoperations.Operation](node) require.NoError(t, err) @@ -363,10 +363,10 @@ func TestRetry(t *testing.T) { })) opLog, err = node.Parent.OpLog() require.NoError(t, err) - require.Equal(t, 1, len(opLog)) + require.Len(t, opLog, 1) transitionOp, ok = opLog[0].(hsm.TransitionOperation) require.True(t, ok) - require.Equal(t, 1, len(transitionOp.Output.Tasks)) + require.Len(t, transitionOp.Output.Tasks, 1) invocationTask := transitionOp.Output.Tasks[0].(nexusoperations.InvocationTask) // nolint:revive require.Equal(t, "endpoint", invocationTask.EndpointName) op, err = hsm.MachineData[nexusoperations.Operation](node) @@ -464,7 +464,7 @@ func TestCompleteFromAttempt(t *testing.T) { })) opLog, err := node.Parent.OpLog() require.NoError(t, err) - require.Equal(t, 1, len(opLog)) + require.Len(t, opLog, 1) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok, "expected TransitionOperation") require.Empty(t, transitionOp.Output.Tasks) @@ -584,7 +584,7 @@ func TestCompleteExternally(t *testing.T) { })) opLog, err := node.Parent.OpLog() require.NoError(t, err) - require.Equal(t, 1, len(opLog)) + require.Len(t, opLog, 1) transitionOp, ok := opLog[0].(hsm.TransitionOperation) require.True(t, ok) require.Empty(t, transitionOp.Output.Tasks) @@ -661,10 +661,10 @@ func TestCancelationValidTransitions(t *testing.T) { require.Equal(t, "test", cancelation.LastAttemptFailure.Message) require.Equal(t, currentTime, cancelation.LastAttemptCompleteTime.AsTime()) dt := currentTime.Add(time.Second).Sub(cancelation.NextAttemptScheduleTime.AsTime()) - require.True(t, dt < time.Millisecond*200) + require.Less(t, dt, time.Millisecond*200) // Assert backoff task is generated - require.Equal(t, 1, len(out.Tasks)) + require.Len(t, out.Tasks, 1) boTask := out.Tasks[0].(nexusoperations.CancelationBackoffTask) // nolint:revive require.Equal(t, cancelation.NextAttemptScheduleTime.AsTime(), boTask.Deadline()) @@ -683,7 +683,7 @@ func TestCancelationValidTransitions(t *testing.T) { require.Nil(t, cancelation.NextAttemptScheduleTime) // Assert cancelation task is generated - require.Equal(t, 1, len(out.Tasks)) + require.Len(t, out.Tasks, 1) cbTask := out.Tasks[0].(nexusoperations.CancelationTask) // nolint:revive require.Equal(t, "endpoint", cbTask.EndpointName) @@ -706,7 +706,7 @@ func TestCancelationValidTransitions(t *testing.T) { require.Nil(t, cancelation.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Equal(t, 0, len(out.Tasks)) + require.Empty(t, out.Tasks) // Reset back to scheduled cancelation = dup @@ -729,7 +729,7 @@ func TestCancelationValidTransitions(t *testing.T) { require.Nil(t, cancelation.NextAttemptScheduleTime) // Assert no additional tasks are generated - require.Equal(t, 0, len(out.Tasks)) + require.Empty(t, out.Tasks) } func TestCancelationBeforeStarted(t *testing.T) { @@ -858,9 +858,9 @@ func TestOperationCompareState(t *testing.T) { if tc.sign == 0 { require.Equal(t, 0, res) } else if tc.sign > 0 { - require.Greater(t, res, 0) + require.Positive(t, res) } else { - require.Greater(t, 0, res) + require.Negative(t, res) } }) } @@ -935,9 +935,9 @@ func TestCancelationCompareState(t *testing.T) { if tc.sign == 0 { require.Equal(t, 0, res) } else if tc.sign > 0 { - require.Greater(t, res, 0) + require.Positive(t, res) } else { - require.Greater(t, 0, res) + require.Negative(t, res) } }) } diff --git a/components/nexusoperations/workflow/commands_test.go b/components/nexusoperations/workflow/commands_test.go index 1826dc7c4e8..7da08528204 100644 --- a/components/nexusoperations/workflow/commands_test.go +++ b/components/nexusoperations/workflow/commands_test.go @@ -126,7 +126,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("endpoint not found - rejected by config", func(t *testing.T) { @@ -144,7 +144,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("caller namespace unauthorized", func(t *testing.T) { @@ -162,7 +162,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("exceeds max service length", func(t *testing.T) { @@ -180,7 +180,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("exceeds max operation length", func(t *testing.T) { @@ -198,7 +198,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("exceeds max operation header size", func(t *testing.T) { @@ -219,7 +219,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("invalid header keys", func(t *testing.T) { @@ -240,7 +240,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("exceeds max payload size", func(t *testing.T) { @@ -261,7 +261,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.True(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_SCHEDULE_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("system endpoint skips payload size validation", func(t *testing.T) { @@ -314,7 +314,7 @@ func TestHandleScheduleCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_PENDING_NEXUS_OPERATIONS_LIMIT_EXCEEDED, failWFTErr.Cause) - require.Equal(t, 2, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 2) }) t.Run("schedule to close timeout capped by run timeout", func(t *testing.T) { @@ -331,7 +331,7 @@ func TestHandleScheduleCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Equal(t, 1, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 1) require.Equal(t, time.Hour, tcx.history.Events[0].GetNexusOperationScheduledEventAttributes().ScheduleToCloseTimeout.AsDuration()) }) @@ -350,7 +350,7 @@ func TestHandleScheduleCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Equal(t, 1, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 1) require.Equal(t, time.Minute, tcx.history.Events[0].GetNexusOperationScheduledEventAttributes().ScheduleToCloseTimeout.AsDuration()) }) @@ -441,7 +441,7 @@ func TestHandleScheduleCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Equal(t, 1, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 1) require.Equal(t, tc.expectedTimeout.AsDuration(), tcx.history.Events[0].GetNexusOperationScheduledEventAttributes().ScheduleToCloseTimeout.AsDuration()) }) } @@ -597,7 +597,7 @@ func TestHandleScheduleCommand(t *testing.T) { UserMetadata: userMetadata, }) require.NoError(t, err) - require.Equal(t, 1, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 1) event := tcx.history.Events[0] eAttrs := event.GetNexusOperationScheduledEventAttributes() require.Equal(t, cAttrs.Service, eAttrs.Service) @@ -651,7 +651,7 @@ func TestHandleCancelCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_REQUEST_CANCEL_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("operation not found", func(t *testing.T) { @@ -669,7 +669,7 @@ func TestHandleCancelCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_REQUEST_CANCEL_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 0, len(tcx.history.Events)) + require.Empty(t, tcx.history.Events) }) t.Run("operation already completed", func(t *testing.T) { @@ -686,7 +686,7 @@ func TestHandleCancelCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Equal(t, 1, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 1) event := tcx.history.Events[0] // Complete the operation using CompletedEventDefinition to ensure proper deletion @@ -712,7 +712,7 @@ func TestHandleCancelCommand(t *testing.T) { require.ErrorAs(t, err, &failWFTErr) require.False(t, failWFTErr.TerminateWorkflow) require.Equal(t, enumspb.WORKFLOW_TASK_FAILED_CAUSE_BAD_REQUEST_CANCEL_NEXUS_OPERATION_ATTRIBUTES, failWFTErr.Cause) - require.Equal(t, 1, len(tcx.history.Events)) // Only scheduled event should be recorded. + require.Len(t, tcx.history.Events, 1) // Only scheduled event should be recorded. }) t.Run("operation already completed - completion buffered", func(t *testing.T) { @@ -729,7 +729,7 @@ func TestHandleCancelCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Equal(t, 1, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 1) event := tcx.history.Events[0] err = nexusoperations.CompletedEventDefinition{}.Apply(tcx.ms.HSM(), &historypb.HistoryEvent{ @@ -751,7 +751,7 @@ func TestHandleCancelCommand(t *testing.T) { }, }) require.NoError(t, err) - require.Equal(t, 2, len(tcx.history.Events)) // Both scheduled and cancel requested events should be recorded + require.Len(t, tcx.history.Events, 2) // Both scheduled and cancel requested events should be recorded crAttrs := tcx.history.Events[1].GetNexusOperationCancelRequestedEventAttributes() require.Equal(t, event.EventId, crAttrs.ScheduledEventId) }) @@ -779,7 +779,7 @@ func TestHandleCancelCommand(t *testing.T) { }, } require.NoError(t, err) - require.Equal(t, 1, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 1) event := tcx.history.Events[0] err = tcx.cancelHandler(context.Background(), tcx.ms, commandValidator{maxPayloadSize: 1}, 1, &commandpb.Command{ @@ -796,7 +796,7 @@ func TestHandleCancelCommand(t *testing.T) { require.NoError(t, err) require.NotNil(t, child) - require.Equal(t, 2, len(tcx.history.Events)) + require.Len(t, tcx.history.Events, 2) crAttrs := tcx.history.Events[1].GetNexusOperationCancelRequestedEventAttributes() require.Equal(t, event.EventId, crAttrs.ScheduledEventId) require.Equal(t, int64(1), crAttrs.WorkflowTaskCompletedEventId) diff --git a/service/history/replication/stream_receiver_test.go b/service/history/replication/stream_receiver_test.go index 9ffa8163b57..4744c1dd25e 100644 --- a/service/history/replication/stream_receiver_test.go +++ b/service/history/replication/stream_receiver_test.go @@ -331,7 +331,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_SingleStack_Receive // no TrackTasks call should be made err := s.streamReceiver.processMessages(s.stream) s.ErrorAs(err, new(*StreamError)) - s.Empty(s.taskScheduler.tasks) + s.Equal(0, len(s.taskScheduler.tasks)) } func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack_ReceivedNonPrioritizedTask() { @@ -358,7 +358,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack_Receive // no TrackTasks call should be made err := s.streamReceiver.processMessages(s.stream) s.ErrorAs(err, new(*StreamError)) - s.Empty(s.taskScheduler.tasks) + s.Equal(0, len(s.taskScheduler.tasks)) } func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { diff --git a/service/matching/ack_manager_test.go b/service/matching/ack_manager_test.go index d22a8438f2a..d9533b45675 100644 --- a/service/matching/ack_manager_test.go +++ b/service/matching/ack_manager_test.go @@ -33,10 +33,10 @@ func (s *AckManagerTestSuite) AddingTasksIncreasesBacklogCounter() { ackMgr := newTestAckMgr(s.logger) ackMgr.addTask(1) - s.Equal(ackMgr.getBacklogCountHint(), int64(1)) + s.Equal(int64(1), ackMgr.getBacklogCountHint()) ackMgr.addTask(12) - s.Equal(ackMgr.getBacklogCountHint(), int64(2)) + s.Equal(int64(2), ackMgr.getBacklogCountHint()) } func (s *AckManagerTestSuite) CompleteTaskMovesAckLevelUpToGap() { diff --git a/service/matching/configs/quotas_test.go b/service/matching/configs/quotas_test.go index 2d44ccdc7d3..0a62e888c1a 100644 --- a/service/matching/configs/quotas_test.go +++ b/service/matching/configs/quotas_test.go @@ -48,7 +48,7 @@ func (s *quotasSuite) TestAPIToPriorityMapping() { func (s *quotasSuite) TestAPIPrioritiesOrdered() { for idx := range APIPrioritiesOrdered[1:] { - s.True(APIPrioritiesOrdered[idx] < APIPrioritiesOrdered[idx+1]) + s.Less(APIPrioritiesOrdered[idx], APIPrioritiesOrdered[idx+1]) } } diff --git a/service/matching/forwarder_test.go b/service/matching/forwarder_test.go index dc2f44f2c44..0b18a661421 100644 --- a/service/matching/forwarder_test.go +++ b/service/matching/forwarder_test.go @@ -107,7 +107,7 @@ func (t *ForwarderTestSuite) TestForwardWorkflowTask() { schedToStart := int32(request.GetScheduleToStartTimeout().AsDuration().Seconds()) rewritten := convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()) - t.EqualValues(schedToStart, rewritten) + t.Equal(schedToStart, rewritten) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_DB_BACKLOG, request.GetForwardInfo().GetTaskSource()) } @@ -137,7 +137,7 @@ func (t *ForwarderTestSuite) TestForwardWorkflowTask_WithBuildId() { schedToStart := int32(request.GetScheduleToStartTimeout().AsDuration().Seconds()) rewritten := convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()) - t.EqualValues(schedToStart, rewritten) + t.Equal(schedToStart, rewritten) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_HISTORY, request.GetForwardInfo().GetTaskSource()) } @@ -162,7 +162,7 @@ func (t *ForwarderTestSuite) TestForwardActivityTask() { t.Equal(taskInfo.Data.GetWorkflowId(), request.GetExecution().GetWorkflowId()) t.Equal(taskInfo.Data.GetRunId(), request.GetExecution().GetRunId()) t.Equal(taskInfo.Data.GetScheduledEventId(), request.GetScheduledEventId()) - t.EqualValues(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), + t.Equal(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), int32(request.GetScheduleToStartTimeout().AsDuration().Seconds())) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_DB_BACKLOG, request.GetForwardInfo().GetTaskSource()) @@ -190,7 +190,7 @@ func (t *ForwarderTestSuite) TestForwardActivityTask_WithBuildId() { t.Equal(taskInfo.Data.GetWorkflowId(), request.GetExecution().GetWorkflowId()) t.Equal(taskInfo.Data.GetRunId(), request.GetExecution().GetRunId()) t.Equal(taskInfo.Data.GetScheduledEventId(), request.GetScheduledEventId()) - t.EqualValues(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), + t.Equal(convert.Int32Ceil(time.Until(taskInfo.Data.ExpiryTime.AsTime()).Seconds()), int32(request.GetScheduleToStartTimeout().AsDuration().Seconds())) t.Equal(t.partition.RpcName(), request.GetForwardInfo().GetSourcePartition()) t.Equal(enumsspb.TASK_SOURCE_DB_BACKLOG, request.GetForwardInfo().GetTaskSource()) @@ -495,7 +495,7 @@ func (t *ForwarderTestSuite) usingTaskqueuePartition(taskType enumspb.TaskQueueT t.NoError(err) t.partition = f.TaskQueue(taskType).NormalPartition(1) t.fwdr, err = newForwarder(t.cfg, UnversionedQueueKey(t.partition), t.client) - t.Nil(err) + t.NoError(err) } func (t *ForwarderTestSuite) usingBuildIdQueue(taskType enumspb.TaskQueueType, buildId string) { @@ -503,7 +503,7 @@ func (t *ForwarderTestSuite) usingBuildIdQueue(taskType enumspb.TaskQueueType, b t.NoError(err) t.partition = f.TaskQueue(taskType).NormalPartition(1) t.fwdr, err = newForwarder(t.cfg, BuildIdQueueKey(t.partition, buildId), t.client) - t.Nil(err) + t.NoError(err) } func mustParent(tn *tqid.NormalPartition, n int) *tqid.NormalPartition { diff --git a/service/matching/physical_task_queue_key_test.go b/service/matching/physical_task_queue_key_test.go index c0d6af44812..2e7b7c3d335 100644 --- a/service/matching/physical_task_queue_key_test.go +++ b/service/matching/physical_task_queue_key_test.go @@ -19,7 +19,7 @@ func TestVersionSetQueueKey(t *testing.T) { key := VersionSetQueueKey(p, "abc3") a.Equal(p, key.Partition()) a.Equal("abc3", key.Version().VersionSet()) - a.Equal("", key.Version().BuildId()) + a.Empty(key.Version().BuildId()) a.Nil(key.Version().Deployment()) } @@ -31,7 +31,7 @@ func TestBuildIDQueueKey(t *testing.T) { p := f.TaskQueue(enumspb.TASK_QUEUE_TYPE_WORKFLOW).NormalPartition(2) key := BuildIdQueueKey(p, "abc3") a.Equal(p, key.Partition()) - a.Equal("", key.Version().VersionSet()) + a.Empty(key.Version().VersionSet()) a.Equal("abc3", key.Version().BuildId()) a.Nil(key.Version().Deployment()) } @@ -48,8 +48,8 @@ func TestDeploymentQueueKey(t *testing.T) { } key := DeploymentQueueKey(p, d) a.Equal(p, key.Partition()) - a.Equal("", key.Version().VersionSet()) - a.Equal("", key.Version().BuildId()) + a.Empty(key.Version().VersionSet()) + a.Empty(key.Version().BuildId()) a.True(d.Equal(key.Version().Deployment())) } @@ -61,8 +61,8 @@ func TestUnversionedQueueKey(t *testing.T) { p := f.TaskQueue(enumspb.TASK_QUEUE_TYPE_WORKFLOW).NormalPartition(2) key := UnversionedQueueKey(p) a.Equal(p, key.Partition()) - a.Equal("", key.Version().VersionSet()) - a.Equal("", key.Version().BuildId()) + a.Empty(key.Version().VersionSet()) + a.Empty(key.Version().BuildId()) a.Nil(key.Version().Deployment()) } diff --git a/service/matching/physical_task_queue_manager_test.go b/service/matching/physical_task_queue_manager_test.go index b7cbdfb305c..e971d6ee79b 100644 --- a/service/matching/physical_task_queue_manager_test.go +++ b/service/matching/physical_task_queue_manager_test.go @@ -258,7 +258,7 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestLegacyDescribeTaskQueue() { includeTaskStatus := false descResp := s.tqMgr.LegacyDescribeTaskQueue(includeTaskStatus) - s.Equal(0, len(descResp.DescResponse.GetPollers())) + s.Empty(descResp.DescResponse.GetPollers()) s.Nil(descResp.DescResponse.GetTaskQueueStatus()) includeTaskStatus = true @@ -280,14 +280,14 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestLegacyDescribeTaskQueue() { } descResp = s.tqMgr.LegacyDescribeTaskQueue(includeTaskStatus) - s.Equal(1, len(descResp.DescResponse.GetPollers())) + s.Len(descResp.DescResponse.GetPollers(), 1) s.Equal(string(pollerIdent), descResp.DescResponse.Pollers[0].GetIdentity()) s.NotEmpty(descResp.DescResponse.Pollers[0].GetLastAccessTime()) rps := 5.0 s.tqMgr.pollerHistory.updatePollerInfo(pollerIdent, makePollMetadata(rps)) descResp = s.tqMgr.LegacyDescribeTaskQueue(includeTaskStatus) - s.Equal(1, len(descResp.DescResponse.GetPollers())) + s.Len(descResp.DescResponse.GetPollers(), 1) s.Equal(string(pollerIdent), descResp.DescResponse.Pollers[0].GetIdentity()) s.True(descResp.DescResponse.Pollers[0].GetRatePerSecond() > 4.0 && descResp.DescResponse.Pollers[0].GetRatePerSecond() < 6.0) @@ -310,7 +310,7 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestCheckIdleTaskQueue() { // Active poll-er s.tqMgr.Start() s.tqMgr.pollerHistory.updatePollerInfo("test-poll", &pollMetadata{}) - s.Equal(1, len(s.tqMgr.GetAllPollerInfo())) + s.Len(s.tqMgr.GetAllPollerInfo(), 1) time.Sleep(50 * time.Millisecond) // nolint:forbidigo s.Equal(common.DaemonStatusStarted, atomic.LoadInt32(&s.tqMgr.status)) s.tqMgr.Stop(unloadCauseUnspecified) @@ -320,7 +320,7 @@ func (s *PhysicalTaskQueueManagerTestSuite) TestCheckIdleTaskQueue() { // Active adding task s.tqMgr.Start() - s.Equal(0, len(s.tqMgr.GetAllPollerInfo())) + s.Empty(s.tqMgr.GetAllPollerInfo()) time.Sleep(50 * time.Millisecond) // nolint:forbidigo s.Equal(common.DaemonStatusStarted, atomic.LoadInt32(&s.tqMgr.status)) s.tqMgr.Stop(unloadCauseUnspecified) diff --git a/service/worker/scanner/taskqueue/scavenger_test.go b/service/worker/scanner/taskqueue/scavenger_test.go index c88c40592b4..fb1ca666691 100644 --- a/service/worker/scanner/taskqueue/scavenger_test.go +++ b/service/worker/scanner/taskqueue/scavenger_test.go @@ -62,7 +62,7 @@ func (s *ScavengerTestSuite) TestAllExpiredTasks() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Equal(0, len(tasks), "failed to delete all expired tasks") + s.Empty(tasks, "failed to delete all expired tasks") s.Nil(s.taskQueueTable.get(tl), "failed to delete expired executorTask queue") } } @@ -81,7 +81,7 @@ func (s *ScavengerTestSuite) TestAllAliveTasks() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Equal(nTasks, len(tasks), "scavenger deleted a non-expired executorTask") + s.Len(tasks, nTasks, "scavenger deleted a non-expired executorTask") s.NotNil(s.taskQueueTable.get(tl), "scavenger deleted a non-expired executorTask queue") } } @@ -101,7 +101,7 @@ func (s *ScavengerTestSuite) TestExpiredTasksFollowedByAlive() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Equal(nTasks/2, len(tasks), "scavenger deleted non-expired tasks") + s.Len(tasks, nTasks/2, "scavenger deleted non-expired tasks") s.Equal(int64(nTasks/2), tasks[0].GetTaskId(), "scavenger deleted wrong set of tasks") s.NotNil(s.taskQueueTable.get(tl), "scavenger deleted a non-expired executorTask queue") } @@ -122,7 +122,7 @@ func (s *ScavengerTestSuite) TestAliveTasksFollowedByExpired() { s.runScavenger() for tl, tbl := range s.taskTables { tasks := tbl.get(100) - s.Equal(nTasks, len(tasks), "scavenger deleted non-expired tasks") + s.Len(tasks, nTasks, "scavenger deleted non-expired tasks") s.NotNil(s.taskQueueTable.get(tl), "scavenger deleted a non-expired executorTask queue") } } @@ -141,10 +141,10 @@ func (s *ScavengerTestSuite) TestAllExpiredTasksWithErrors() { s.runScavenger() for _, tbl := range s.taskTables { tasks := tbl.get(100) - s.Equal(0, len(tasks), "failed to delete all expired tasks") + s.Empty(tasks, "failed to delete all expired tasks") } result, _ := s.taskQueueTable.list(nil, 10) - s.Equal(1, len(result), "expected partial deletion due to transient errors") + s.Len(result, 1, "expected partial deletion due to transient errors") } func (s *ScavengerTestSuite) runScavenger() { diff --git a/service/worker/scheduler/calendar_test.go b/service/worker/scheduler/calendar_test.go index 1ece799bf1e..5cabbe5080d 100644 --- a/service/worker/scheduler/calendar_test.go +++ b/service/worker/scheduler/calendar_test.go @@ -111,7 +111,7 @@ func (s *calendarSuite) TestParseCronString() { DayOfWeek: []*schedulepb.Range{{Start: 0, End: 6}}, }, scs) s.Nil(iv) - s.Equal("", tz) + s.Empty(tz) _, _, _, err = parseCronString("0 1 2 3 4 1999") s.ErrorContains(err, "Year is not in range") @@ -141,7 +141,7 @@ func (s *calendarSuite) TestParseCronString() { DayOfWeek: []*schedulepb.Range{{Start: 0, End: 6}}, }, scs) s.Nil(iv) - s.Equal("", tz) + s.Empty(tz) scs, iv, tz, err = parseCronString("@every 5d") s.NoError(err) @@ -149,7 +149,7 @@ func (s *calendarSuite) TestParseCronString() { s.Equal(&schedulepb.IntervalSpec{ Interval: durationpb.New(5 * 24 * time.Hour), }, iv) - s.Equal("", tz) + s.Empty(tz) scs, iv, tz, err = parseCronString("@every 5h/45m") s.NoError(err) @@ -158,7 +158,7 @@ func (s *calendarSuite) TestParseCronString() { Interval: durationpb.New(5 * time.Hour), Phase: durationpb.New(45 * time.Minute), }, iv) - s.Equal("", tz) + s.Empty(tz) } func (s *calendarSuite) TestCalendarNextBasic() { @@ -297,7 +297,7 @@ func (s *calendarSuite) TestMakeRange() { s.T().Helper() ranges, err := makeRange(str, "Test", "", minVal, maxVal, parseMode) s.NoError(err) - s.EqualValues(expected, ranges) + s.Equal(expected, ranges) } checkErr := func(str string, minVal, maxVal int, parseMode parseMode, expectedErr string) { s.T().Helper() diff --git a/service/worker/scheduler/query_test.go b/service/worker/scheduler/query_test.go index aeb500218a5..936990c7e81 100644 --- a/service/worker/scheduler/query_test.go +++ b/service/worker/scheduler/query_test.go @@ -265,7 +265,7 @@ func TestGetQueryFields(t *testing.T) { ) if tc.expectedErrMsg == "" { s.NoError(err) - s.Equal(len(tc.expectedFields), len(fields)) + s.Len(fields, len(tc.expectedFields)) for _, f := range fields { s.Contains(tc.expectedFields, f) } diff --git a/service/worker/scheduler/workflow_test.go b/service/worker/scheduler/workflow_test.go index 6dccb2843af..46a543e8b96 100644 --- a/service/worker/scheduler/workflow_test.go +++ b/service/worker/scheduler/workflow_test.go @@ -289,7 +289,7 @@ func (s *workflowSuite) runAcrossContinue( s.True(s.env.IsWorkflowCompleted()) result := s.env.GetWorkflowError() var canErr *workflow.ContinueAsNewError - s.Require().True(errors.As(result, &canErr), "result: %v", result) + s.Require().ErrorAs(result, &canErr, "result: %v", result) s.env.AssertExpectations(s.T()) @@ -302,7 +302,7 @@ func (s *workflowSuite) runAcrossContinue( s.Require().NoError(payloads.Decode(canErr.Input, &startArgs)) } // check starts that we actually got - s.Require().Equalf(len(runs), len(state.started), "started %#v", state.started) + s.Require().Lenf(state.started, len(runs), "started %#v", state.started) for _, run := range runs { actual := state.started[run.id] inRange := !actual.Before(run.start.Add(-run.startTolerance)) && !actual.After(run.start.Add(run.startTolerance)) @@ -1885,26 +1885,26 @@ func (s *workflowSuite) TestLimitedActions() { s.env.RegisterDelayedCallback(func() { desc := s.describe() s.Equal(int64(2), desc.Schedule.State.RemainingActions) - s.Equal(2, len(desc.Info.FutureActionTimes)) + s.Len(desc.Info.FutureActionTimes, 2) }, 1*time.Minute) s.env.RegisterDelayedCallback(func() { desc := s.describe() s.Equal(int64(1), desc.Schedule.State.RemainingActions) - s.Equal(1, len(desc.Info.FutureActionTimes)) + s.Len(desc.Info.FutureActionTimes, 1) }, 5*time.Minute) s.env.RegisterDelayedCallback(func() { desc := s.describe() s.Equal(int64(0), desc.Schedule.State.RemainingActions) - s.Equal(0, len(desc.Info.FutureActionTimes)) - s.Equal(1, len(s.runningWorkflows())) + s.Empty(desc.Info.FutureActionTimes) + s.Len(s.runningWorkflows(), 1) }, 7*time.Minute) s.env.RegisterDelayedCallback(func() { // hasn't updated yet since we slept past :09 - s.Equal(1, len(s.runningWorkflows())) + s.Len(s.runningWorkflows(), 1) s.env.SignalWorkflow(SignalNameRefresh, nil) }, 10*time.Minute) s.env.RegisterDelayedCallback(func() { - s.Equal(0, len(s.runningWorkflows())) + s.Empty(s.runningWorkflows()) }, 10*time.Minute+1*time.Second) s.run(&schedulepb.Schedule{ @@ -2042,7 +2042,7 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenNoActions() { }) s.True(s.env.IsWorkflowCompleted()) s.False(workflow.IsContinueAsNewError(s.env.GetWorkflowError())) - s.True(s.env.Now().Sub(time.Date(2022, 6, 1, 0, 30, 0, 0, time.UTC)) == CurrentTweakablePolicies.RetentionTime) + s.Equal(s.env.Now().Sub(time.Date(2022, 6, 1, 0, 30, 0, 0, time.UTC)), CurrentTweakablePolicies.RetentionTime) } func (s *workflowSuite) TestExitScheduleWorkflowWhenNoNextTime() { @@ -2078,7 +2078,7 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenNoNextTime() { }) s.True(s.env.IsWorkflowCompleted()) s.False(workflow.IsContinueAsNewError(s.env.GetWorkflowError())) - s.True(s.env.Now().Sub(time.Date(2022, 6, 1, 1, 0, 0, 0, time.UTC)) == CurrentTweakablePolicies.RetentionTime) + s.Equal(s.env.Now().Sub(time.Date(2022, 6, 1, 1, 0, 0, 0, time.UTC)), CurrentTweakablePolicies.RetentionTime) } func (s *workflowSuite) TestExitScheduleWorkflowWhenEmpty() { @@ -2100,7 +2100,7 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenEmpty() { s.True(s.env.IsWorkflowCompleted()) s.False(workflow.IsContinueAsNewError(s.env.GetWorkflowError())) - s.True(s.env.Now().Sub(baseStartTime) == CurrentTweakablePolicies.RetentionTime) + s.Equal(s.env.Now().Sub(baseStartTime), CurrentTweakablePolicies.RetentionTime) } func (s *workflowSuite) TestCANByIterations() { From ede559bdee6f990359b8df7d74acfe588270270b Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Tue, 23 Jun 2026 21:16:56 -0700 Subject: [PATCH 7/7] Keep lint fixes server-owned only --- .../ndc/activity_state_replicator_test.go | 12 ++++----- service/history/ndc/branch_manager_test.go | 2 +- service/history/ndc/conflict_resolver_test.go | 6 ++--- service/history/ndc/events_reapplier_test.go | 16 ++++++------ service/history/ndc/replication_task_test.go | 8 +++--- service/history/ndc/resetter_test.go | 2 +- .../history/ndc/transaction_manager_test.go | 2 +- .../ndc/workflow_state_replicator_test.go | 6 ++--- service/history/ndc/workflow_test.go | 2 +- .../history/replication/ack_manager_test.go | 8 +++--- .../replication/batchable_task_test.go | 4 +-- .../eager_namespace_refresher_test.go | 4 +-- .../eventhandler/event_importer_test.go | 2 +- .../history_events_handler_test.go | 10 +++---- .../remote_history_paginated_fetcher_test.go | 8 +++--- .../eventhandler/resend_handler_test.go | 10 +++---- .../executable_activity_state_task_test.go | 6 ++--- .../replication/executable_task_test.go | 6 ++--- .../replication/progress_cache_test.go | 8 +++--- .../stream_receiver_monitor_test.go | 24 ++++++++--------- .../replication/stream_receiver_test.go | 26 +++++++++---------- .../history/replication/stream_sender_test.go | 4 +-- .../replication/sync_state_retriever_test.go | 16 ++++++------ .../replication/task_processor_test.go | 4 +-- .../migration/handover_workflow_test.go | 3 +-- 25 files changed, 99 insertions(+), 100 deletions(-) diff --git a/service/history/ndc/activity_state_replicator_test.go b/service/history/ndc/activity_state_replicator_test.go index 58d6ced7733..90c85374837 100644 --- a/service/history/ndc/activity_state_replicator_test.go +++ b/service/history/ndc/activity_state_replicator_test.go @@ -631,7 +631,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivity_WorkflowNotFound() { ).AnyTimes() err := s.nDCActivityStateReplicator.SyncActivityState(context.Background(), request) - s.Nil(err) + s.NoError(err) } func (s *activityReplicatorStateSuite) TestSyncActivities_WorkflowNotFound() { @@ -669,7 +669,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivities_WorkflowNotFound() { ).AnyTimes() err := s.nDCActivityStateReplicator.SyncActivitiesState(context.Background(), request) - s.Nil(err) + s.NoError(err) } func (s *activityReplicatorStateSuite) TestSyncActivity_LoadMutableStateError() { @@ -1196,7 +1196,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_Zombie() { ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivityState(context.Background(), request) - s.Nil(err) + s.NoError(err) } func (s *activityReplicatorStateSuite) TestSyncActivities_ActivityFound_Zombie() { @@ -1302,7 +1302,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivities_ActivityFound_Zombie() ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivitiesState(context.Background(), request) - s.Nil(err) + s.NoError(err) } func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_NonZombie() { @@ -1404,7 +1404,7 @@ func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_NonZombie( ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivityState(context.Background(), request) - s.Nil(err) + s.NoError(err) } func (s *activityReplicatorStateSuite) TestSyncActivity_ActivityFound_NonZombie_LegacyUpdate() { @@ -1881,5 +1881,5 @@ func (s *activityReplicatorStateSuite) TestSyncActivities_ActivityFound_NonZombi ).AnyTimes() err = s.nDCActivityStateReplicator.SyncActivitiesState(context.Background(), request) - s.Nil(err) + s.NoError(err) } diff --git a/service/history/ndc/branch_manager_test.go b/service/history/ndc/branch_manager_test.go index 709917f0842..69e5686ddca 100644 --- a/service/history/ndc/branch_manager_test.go +++ b/service/history/ndc/branch_manager_test.go @@ -131,7 +131,7 @@ func (s *branchMgrSuite) TestCreateNewBranch() { }) newIndex, err := s.nDCBranchMgr.createNewBranch(context.Background(), baseBranchToken, baseBranchLCAEventID, newVersionHistory) - s.Nil(err) + s.NoError(err) s.Equal(int32(1), newIndex) compareVersionHistory, err := versionhistory.CopyVersionHistoryUntilLCAVersionHistoryItem( diff --git a/service/history/ndc/conflict_resolver_test.go b/service/history/ndc/conflict_resolver_test.go index 92a7c2d0d27..e7b4a58f254 100644 --- a/service/history/ndc/conflict_resolver_test.go +++ b/service/history/ndc/conflict_resolver_test.go @@ -188,7 +188,7 @@ func (s *conflictResolverSuite) TestGetOrRebuildCurrentMutableState_NoRebuild_No ) versionHistories := versionhistory.NewVersionHistories(versionHistory0) _, _, err := versionhistory.AddAndSwitchVersionHistory(versionHistories, versionHistory1) - s.Nil(err) + s.NoError(err) s.mockMutableState.EXPECT().GetExecutionInfo().Return(&persistencespb.WorkflowExecutionInfo{VersionHistories: versionHistories}).AnyTimes() rebuiltMutableState, isRebuilt, err := s.nDCConflictResolver.GetOrRebuildCurrentMutableState(context.Background(), 0, version0) @@ -244,7 +244,7 @@ func (s *conflictResolverSuite) TestGetOrRebuildCurrentMutableState_Rebuild() { versionHistories := versionhistory.NewVersionHistories(versionHistory0) _, _, err := versionhistory.AddAndSwitchVersionHistory(versionHistories, versionHistory1) - s.Nil(err) + s.NoError(err) s.mockMutableState.EXPECT().GetUpdateCondition().Return(updateCondition, dbVersion).AnyTimes() s.mockMutableState.EXPECT().GetExecutionInfo().Return(&persistencespb.WorkflowExecutionInfo{ @@ -577,7 +577,7 @@ func (s *conflictResolverSuite) TestGetOrRebuildMutableState_Rebuild() { versionHistories := versionhistory.NewVersionHistories(versionHistory0) _, _, err := versionhistory.AddAndSwitchVersionHistory(versionHistories, versionHistory1) - s.Nil(err) + s.NoError(err) s.mockMutableState.EXPECT().GetUpdateCondition().Return(updateCondition, dbVersion).AnyTimes() s.mockMutableState.EXPECT().GetExecutionInfo().Return(&persistencespb.WorkflowExecutionInfo{ diff --git a/service/history/ndc/events_reapplier_test.go b/service/history/ndc/events_reapplier_test.go index 0c41cbe3977..e2357a6cece 100644 --- a/service/history/ndc/events_reapplier_test.go +++ b/service/history/ndc/events_reapplier_test.go @@ -178,7 +178,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_WorkflowExec } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Equal(1, len(appliedEvent)) + s.Len(appliedEvent, 1) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Signal() { @@ -234,7 +234,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Signal() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Equal(1, len(appliedEvent)) + s.Len(appliedEvent, 1) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Update() { @@ -294,7 +294,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Update() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Equal(1, len(appliedEvent)) + s.Len(appliedEvent, 1) } } @@ -324,7 +324,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_Noop() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Equal(0, len(appliedEvent)) + s.Empty(appliedEvent) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_PartialAppliedEvent() { @@ -382,7 +382,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_PartialAppliedEvent() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Equal(1, len(appliedEvent)) + s.Len(appliedEvent, 1) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_Error() { @@ -425,7 +425,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_Error() { } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.Error(err) - s.Equal(0, len(appliedEvent)) + s.Empty(appliedEvent) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Termination() { @@ -469,7 +469,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_Termination( } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Equal(1, len(appliedEvent)) + s.Len(appliedEvent, 1) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_NoPendingWorkflowTask() { @@ -531,7 +531,7 @@ func (s *nDCEventReapplicationSuite) TestReapplyEvents_AppliedEvent_NoPendingWor } appliedEvent, err := s.nDCReapplication.ReapplyEvents(context.Background(), msCurrent, updateRegistry, events, runID) s.NoError(err) - s.Equal(1, len(appliedEvent)) + s.Len(appliedEvent, 1) } func (s *nDCEventReapplicationSuite) TestReapplyEvents_ClosedWorkflow() { diff --git a/service/history/ndc/replication_task_test.go b/service/history/ndc/replication_task_test.go index 513459f8d9d..46f05a1bd22 100644 --- a/service/history/ndc/replication_task_test.go +++ b/service/history/ndc/replication_task_test.go @@ -75,7 +75,7 @@ func (s *replicationTaskSuite) TestValidateEventsSlice() { v, err := validateEventsSlice(eS1, eS2) s.Equal(int64(2), v) - s.Nil(err) + s.NoError(err) v, err = validateEventsSlice(eS1, eS3) s.Equal(int64(0), v) @@ -137,7 +137,7 @@ func (s *replicationTaskSuite) TestValidateEvents() { } v, err := validateEvents(eS1) - s.Nil(err) + s.NoError(err) s.Equal(int64(2), v) v, err = validateEvents(eS2) @@ -185,7 +185,7 @@ func (s *replicationTaskSuite) TestSkipDuplicatedEvents_ValidInput_SkipEvents() ) err := task.skipDuplicatedEvents(1) s.NoError(err) - s.Equal(1, len(task.getEvents())) + s.Len(task.getEvents(), 1) s.Equal(slice2, task.getEvents()[0]) s.Equal(int64(13), task.getFirstEvent().EventId) s.Equal(int64(14), task.getLastEvent().EventId) @@ -294,7 +294,7 @@ func (s *replicationTaskSuite) TestSkipDuplicatedEvents_ZeroInput_DoNothing() { ) err := task.skipDuplicatedEvents(0) s.NoError(err) - s.Equal(2, len(task.getEvents())) + s.Len(task.getEvents(), 2) s.Equal(slice1, task.getEvents()[0]) s.Equal(slice2, task.getEvents()[1]) } diff --git a/service/history/ndc/resetter_test.go b/service/history/ndc/resetter_test.go index 8f17681b76a..e6aca5f243a 100644 --- a/service/history/ndc/resetter_test.go +++ b/service/history/ndc/resetter_test.go @@ -486,5 +486,5 @@ func (s *resetterSuite) TestResetWorkflow_Error() { incomingFirstEventID, incomingFirstEventVersion, ) - s.Equal(retryErr, expectedErr) + s.Equal(expectedErr, retryErr) } diff --git a/service/history/ndc/transaction_manager_test.go b/service/history/ndc/transaction_manager_test.go index 969952d06cb..e9f7c435b2b 100644 --- a/service/history/ndc/transaction_manager_test.go +++ b/service/history/ndc/transaction_manager_test.go @@ -601,7 +601,7 @@ func (s *transactionMgrSuite) TestGetWorkflowCurrentRunID_Missing() { currentRunID, err := s.transactionMgr.GetCurrentWorkflowRunID(ctx, namespaceID, workflowID, chasm.WorkflowArchetypeID) s.NoError(err) - s.Equal("", currentRunID) + s.Empty(currentRunID) } func (s *transactionMgrSuite) TestGetWorkflowCurrentRunID_Exists() { diff --git a/service/history/ndc/workflow_state_replicator_test.go b/service/history/ndc/workflow_state_replicator_test.go index 7487e6693ed..dc418aa9d8f 100644 --- a/service/history/ndc/workflow_state_replicator_test.go +++ b/service/history/ndc/workflow_state_replicator_test.go @@ -493,9 +493,9 @@ func (s *workflowReplicatorSuite) Test_ApplyWorkflowState_ExistWorkflow_Resend() err = s.workflowStateReplicator.SyncWorkflowState(context.Background(), request) var expectedErr *serviceerrors.RetryReplication s.ErrorAs(err, &expectedErr) - s.Equal(namespaceID, expectedErr.NamespaceId) - s.Equal(s.workflowID, expectedErr.WorkflowId) - s.Equal(s.runID, expectedErr.RunId) + s.Equal(expectedErr.NamespaceId, namespaceID) + s.Equal(expectedErr.WorkflowId, s.workflowID) + s.Equal(expectedErr.RunId, s.runID) s.Equal(int64(1), expectedErr.StartEventId) s.Equal(int64(1), expectedErr.StartEventVersion) } diff --git a/service/history/ndc/workflow_test.go b/service/history/ndc/workflow_test.go index 8dc21ab9a43..5663dcf2561 100644 --- a/service/history/ndc/workflow_test.go +++ b/service/history/ndc/workflow_test.go @@ -351,7 +351,7 @@ func (s *workflowSuite) TestSuppressWorkflowBy_Zombiefy() { s.NoError(err) s.Equal(historyi.TransactionPolicyPassive, policy) s.Equal(enumsspb.WORKFLOW_EXECUTION_STATE_ZOMBIE, executionState.State) - s.EqualValues(enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, executionState.Status) + s.Equal(enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, executionState.Status) } func (s *workflowSuite) wfNewWorkflow() *WorkflowImpl { diff --git a/service/history/replication/ack_manager_test.go b/service/history/replication/ack_manager_test.go index 5bff613d809..af51ddeea70 100644 --- a/service/history/replication/ack_manager_test.go +++ b/service/history/replication/ack_manager_test.go @@ -120,7 +120,7 @@ func (s *ackManagerSuite) TestNotifyNewTasks_NotInitialized() { &tasks.HistoryReplicationTask{TaskID: 123}, }) - s.Equal(*s.replicationAckManager.maxTaskID, int64(456)) + s.Equal(int64(456), *s.replicationAckManager.maxTaskID) } func (s *ackManagerSuite) TestNotifyNewTasks_Initialized() { @@ -129,12 +129,12 @@ func (s *ackManagerSuite) TestNotifyNewTasks_Initialized() { s.replicationAckManager.NotifyNewTasks([]tasks.Task{ &tasks.HistoryReplicationTask{TaskID: 100}, }) - s.Equal(*s.replicationAckManager.maxTaskID, int64(123)) + s.Equal(int64(123), *s.replicationAckManager.maxTaskID) s.replicationAckManager.NotifyNewTasks([]tasks.Task{ &tasks.HistoryReplicationTask{TaskID: 234}, }) - s.Equal(*s.replicationAckManager.maxTaskID, int64(234)) + s.Equal(int64(234), *s.replicationAckManager.maxTaskID) } func (s *ackManagerSuite) TestTaskIDRange_NotInitialized() { @@ -315,7 +315,7 @@ func (s *ackManagerSuite) TestGetTasks_SecondPersistenceErrorReturnsPartialResul replicationTasks, lastTaskID, err := s.replicationAckManager.getTasks(ctx, cluster.TestCurrentClusterName, minTaskID, maxTaskID) s.NoError(err) - s.Equal(1, len(replicationTasks)) + s.Len(replicationTasks, 1) s.Equal(tasksResponse.Tasks[0].GetTaskID(), lastTaskID) } diff --git a/service/history/replication/batchable_task_test.go b/service/history/replication/batchable_task_test.go index 23252c71b65..08e4ca43306 100644 --- a/service/history/replication/batchable_task_test.go +++ b/service/history/replication/batchable_task_test.go @@ -320,7 +320,7 @@ func (s *batchedTaskSuite) TestMarkPoisonPill_SingleItem_MarkTheTask() { existing.EXPECT().MarkPoisonPill().Return(nil).Times(1) result := batchedTestTask.MarkPoisonPill() - s.Nil(result) + s.NoError(result) } func (s *batchedTaskSuite) TestReschedule_SingleItem_RescheduleTheTask() { @@ -508,5 +508,5 @@ func (s *batchedTaskSuite) TestMarkPoisonPill_MultipleItems_CallIndividualHandle add2.EXPECT().MarkUnbatchable().Times(1) result := batchedTestTask.MarkPoisonPill() - s.Nil(result) + s.NoError(result) } diff --git a/service/history/replication/eager_namespace_refresher_test.go b/service/history/replication/eager_namespace_refresher_test.go index 3a532b335eb..a9c38714420 100644 --- a/service/history/replication/eager_namespace_refresher_test.go +++ b/service/history/replication/eager_namespace_refresher_test.go @@ -117,7 +117,7 @@ func (s *EagerNamespaceRefresherSuite) TestSyncNamespaceFromSourceCluster_Create s.NoError(err) s.mockNamespaceRegistry.EXPECT().RefreshNamespaceById(namespaceId).Return(nsFromResponse, nil).Times(1) ns, err := s.eagerNamespaceRefresher.SyncNamespaceFromSourceCluster(context.Background(), namespaceId, "currentCluster") - s.Nil(err) + s.NoError(err) s.Equal(namespaceId, ns.ID()) } @@ -160,7 +160,7 @@ func (s *EagerNamespaceRefresherSuite) TestSyncNamespaceFromSourceCluster_Update s.NoError(err) s.mockNamespaceRegistry.EXPECT().RefreshNamespaceById(namespaceId).Return(nsFromResponse, nil).Times(1) ns, err := s.eagerNamespaceRefresher.SyncNamespaceFromSourceCluster(context.Background(), namespaceId, "currentCluster") - s.Nil(err) + s.NoError(err) s.Equal(namespaceId, ns.ID()) } diff --git a/service/history/replication/eventhandler/event_importer_test.go b/service/history/replication/eventhandler/event_importer_test.go index e806f7e770a..72a55d29409 100644 --- a/service/history/replication/eventhandler/event_importer_test.go +++ b/service/history/replication/eventhandler/event_importer_test.go @@ -212,7 +212,7 @@ func (s *eventImporterSuite) TestImportHistoryEvents_ImportAllLocalAndCommit() { 7, 1001, ) - s.Nil(err) + s.NoError(err) } func serializeEvents(serializer serialization.Serializer, events [][]*historypb.HistoryEvent) []*commonpb.DataBlob { diff --git a/service/history/replication/eventhandler/history_events_handler_test.go b/service/history/replication/eventhandler/history_events_handler_test.go index 470cf2d3e5d..49ec67a448d 100644 --- a/service/history/replication/eventhandler/history_events_handler_test.go +++ b/service/history/replication/eventhandler/history_events_handler_test.go @@ -125,7 +125,7 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_RemoteOnly() { nil, "", ) - s.Nil(err) + s.NoError(err) } func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalAndRemote_HandleLocalThenRemote() { @@ -217,7 +217,7 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalAndRemote_Handle nil, "", ) - s.Nil(err) + s.NoError(err) } func (s *historyEventHandlerSuite) TestHandleLocalHistoryEvents_AlreadyExist() { @@ -268,7 +268,7 @@ func (s *historyEventHandlerSuite) TestHandleLocalHistoryEvents_AlreadyExist() { workflowKey, versionHistory.Items, ) - s.Nil(err) + s.NoError(err) } func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ImportAllLocalAndCommit() { @@ -325,7 +325,7 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ImportAllLo workflowKey, versionHistory.Items, ) - s.Nil(err) + s.NoError(err) } func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ExistButNotEnoughEvents_DataLose() { @@ -381,5 +381,5 @@ func (s *historyEventHandlerSuite) TestHandleHistoryEvents_LocalOnly_ExistButNot workflowKey, versionHistory.Items, ) - s.NotNil(err) + s.Error(err) } diff --git a/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go b/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go index 4454417d654..e649cb44bcb 100644 --- a/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go +++ b/service/history/replication/eventhandler/remote_history_paginated_fetcher_test.go @@ -191,12 +191,12 @@ func (s *historyPaginatedFetcherSuite) TestGetSingleWorkflowHistoryIterator() { ) s.True(fetcher.HasNext()) batch, err := fetcher.Next() - s.Nil(err) + s.NoError(err) s.Equal(blob, batch.RawEventBatch) s.True(fetcher.HasNext()) batch, err = fetcher.Next() - s.Nil(err) + s.NoError(err) s.Equal(blob, batch.RawEventBatch) s.False(fetcher.HasNext()) @@ -248,14 +248,14 @@ func (s *historyPaginatedFetcherSuite) TestGetHistory() { pageSize, false, ) - s.Nil(err) + s.NoError(err) s.Equal(token, nextTokenOut) s.Equal(out[0].RawEventBatch.Data, blob) } func (s *historyPaginatedFetcherSuite) serializeEvents(events []*historypb.HistoryEvent) *commonpb.DataBlob { blob, err := s.serializer.SerializeEvents(events) - s.Nil(err) + s.NoError(err) return &commonpb.DataBlob{ EncodingType: enumspb.ENCODING_TYPE_PROTO3, Data: blob.Data, diff --git a/service/history/replication/eventhandler/resend_handler_test.go b/service/history/replication/eventhandler/resend_handler_test.go index 5374ed19639..b9b054e8818 100644 --- a/service/history/replication/eventhandler/resend_handler_test.go +++ b/service/history/replication/eventhandler/resend_handler_test.go @@ -327,7 +327,7 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_AllRemoteEvents() { endEventID, endEventVersion, ) - s.Nil(err) + s.NoError(err) } func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_LocalAndRemoteEvents() { @@ -435,7 +435,7 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_LocalAndRemoteEvents( endEventID, endEventVersion, ) - s.Nil(err) + s.NoError(err) } func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_MixedVersionHistory_RemoteEventsOnly() { @@ -503,7 +503,7 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_MixedVersionHistory_R endEventID, endEventVersion, ) - s.Nil(err) + s.NoError(err) } func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_AllRemoteEvents_BatchTest() { @@ -627,12 +627,12 @@ func (s *resendHandlerSuite) TestSendSingleWorkflowHistory_AllRemoteEvents_Batch endEventID, endEventVersion, ) - s.Nil(err) + s.NoError(err) } func (s *resendHandlerSuite) serializeEvents(events []*historypb.HistoryEvent) *commonpb.DataBlob { blob, err := s.serializer.SerializeEvents(events) - s.Nil(err) + s.NoError(err) return &commonpb.DataBlob{ EncodingType: enumspb.ENCODING_TYPE_PROTO3, Data: blob.Data, diff --git a/service/history/replication/executable_activity_state_task_test.go b/service/history/replication/executable_activity_state_task_test.go index 69287e1d003..b732389b5d3 100644 --- a/service/history/replication/executable_activity_state_task_test.go +++ b/service/history/replication/executable_activity_state_task_test.go @@ -278,7 +278,7 @@ func (s *executableActivityStateTaskSuite) TestHandleErr_Other() { s.Equal(err, s.task.HandleErr(err)) err = serviceerror.NewNotFound("") - s.Equal(nil, s.task.HandleErr(err)) + s.NoError(s.task.HandleErr(err)) err = serviceerror.NewUnavailable("") s.Equal(err, s.task.HandleErr(err)) @@ -367,7 +367,7 @@ func (s *executableActivityStateTaskSuite) TestBatchedTask_ShouldBatchTogether_A batchResult, batched := task1.BatchWith(task2) s.True(batched) activityTask, _ := batchResult.(*ExecutableActivityStateTask) - s.Equal(2, len(activityTask.activityInfos)) + s.Len(activityTask.activityInfos, 2) s.assertAttributeEqual(replicationAttribute1, activityTask.activityInfos[0]) s.assertAttributeEqual(replicationAttribute2, activityTask.activityInfos[1]) @@ -391,7 +391,7 @@ func (s *executableActivityStateTaskSuite) TestBatchedTask_ShouldBatchTogether_A ActivitiesInfo: activityTask.activityInfos, }) err := batchResult.Execute() - s.Nil(err) + s.NoError(err) } func (s *executableActivityStateTaskSuite) TestBatchWith_InvalidBatchTask_ShouldNotBatch() { diff --git a/service/history/replication/executable_task_test.go b/service/history/replication/executable_task_test.go index 7a3e370761f..36c2554c906 100644 --- a/service/history/replication/executable_task_test.go +++ b/service/history/replication/executable_task_test.go @@ -607,7 +607,7 @@ func (s *executableTaskSuite) TestResend_TransitionHistoryDisabled() { ) doContinue, err := s.task.SyncState(context.Background(), syncStateErr, ResendAttempt) - s.Nil(err) + s.NoError(err) s.False(doContinue) } @@ -661,7 +661,7 @@ func (s *executableTaskSuite) TestSyncState_SourceMutableStateHasUnFlushedBuffer ).Return(nil, serviceerror.NewWorkflowNotReady("workflow not ready")).Times(1) doContinue, err := s.task.SyncState(context.Background(), syncStateErr, ResendAttempt) - s.Nil(err) + s.NoError(err) s.False(doContinue) } @@ -1064,7 +1064,7 @@ func (s *executableTaskSuite) TestGetNamespaceInfo_NotFoundOnCurrentCluster_Sync nil, errors.New("some error")) _, toProcess, err := s.task.GetNamespaceInfo(context.Background(), namespaceID, "test-workflow-id") - s.Nil(err) + s.NoError(err) s.False(toProcess) } diff --git a/service/history/replication/progress_cache_test.go b/service/history/replication/progress_cache_test.go index 8a549030044..fa4cec202ec 100644 --- a/service/history/replication/progress_cache_test.go +++ b/service/history/replication/progress_cache_test.go @@ -104,7 +104,7 @@ func (s *progressCacheSuite) TestProgressCache() { s.Nil(cachedProgress) err := s.progressCache.Update(s.runID, targetClusterID, versionedTransitions, versionHistoryItems) - s.Nil(err) + s.NoError(err) // get existing progress cachedProgress = s.progressCache.Get(s.runID, targetClusterID) @@ -121,7 +121,7 @@ func (s *progressCacheSuite) TestProgressCache() { versionhistory.NewVersionHistoryItem(firstEventID+1, versionedTransition.NamespaceFailoverVersion), } err = s.progressCache.Update(s.runID, targetClusterID, versionedTransitions2, versionHistoryItems2) - s.Nil(err) + s.NoError(err) expected2 := &ReplicationProgress{ versionedTransitions: [][]*persistencespb.VersionedTransition{versionedTransitions2}, @@ -144,7 +144,7 @@ func (s *progressCacheSuite) TestProgressCache() { versionhistory.NewVersionHistoryItem(firstEventID+1, versionedTransition.NamespaceFailoverVersion+1), } err = s.progressCache.Update(s.runID, targetClusterID, versionedTransitions3, versionHistoryItems3) - s.Nil(err) + s.NoError(err) expected3 := &ReplicationProgress{ versionedTransitions: [][]*persistencespb.VersionedTransition{versionedTransitions2, versionedTransitions3}, @@ -157,7 +157,7 @@ func (s *progressCacheSuite) TestProgressCache() { // noop update: versioned transition and version history are already included in the existing progress err = s.progressCache.Update(s.runID, targetClusterID, versionedTransitions, versionHistoryItems) - s.Nil(err) + s.NoError(err) cachedProgress = s.progressCache.Get(s.runID, targetClusterID) s.DeepEqual(expected3, cachedProgress) diff --git a/service/history/replication/stream_receiver_monitor_test.go b/service/history/replication/stream_receiver_monitor_test.go index 58889585dd2..6ed5c03d264 100644 --- a/service/history/replication/stream_receiver_monitor_test.go +++ b/service/history/replication/stream_receiver_monitor_test.go @@ -271,7 +271,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Add() { serverKey := NewClusterShardKey(int32(cluster.TestCurrentClusterInitialFailoverVersion), rand.Int31()) s.streamReceiverMonitor.Lock() - s.Equal(0, len(s.streamReceiverMonitor.inboundStreams)) + s.Empty(s.streamReceiverMonitor.inboundStreams) s.streamReceiverMonitor.Unlock() streamKeys := map[ClusterShardKeyPair]struct{}{ @@ -291,7 +291,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Add() { s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) + s.Len(s.streamReceiverMonitor.inboundStreams, 1) stream, ok := s.streamReceiverMonitor.inboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -315,14 +315,14 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Remove() { s.streamReceiverMonitor.RegisterInboundStream(streamSender) s.streamReceiverMonitor.Lock() - s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) + s.Len(s.streamReceiverMonitor.inboundStreams, 1) s.streamReceiverMonitor.Unlock() s.streamReceiverMonitor.doReconcileInboundStreams(map[ClusterShardKeyPair]struct{}{}) s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Equal(0, len(s.streamReceiverMonitor.inboundStreams)) + s.Empty(s.streamReceiverMonitor.inboundStreams) } func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Reactivate() { @@ -339,7 +339,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Reactivate() s.streamReceiverMonitor.RegisterInboundStream(streamSenderStale) s.streamReceiverMonitor.Lock() - s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) + s.Len(s.streamReceiverMonitor.inboundStreams, 1) s.streamReceiverMonitor.Unlock() streamSenderValid := NewMockStreamSender(s.controller) @@ -351,7 +351,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileInboundStreams_Reactivate() s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Equal(1, len(s.streamReceiverMonitor.inboundStreams)) + s.Len(s.streamReceiverMonitor.inboundStreams, 1) stream, ok := s.streamReceiverMonitor.inboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -443,7 +443,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Add() { serverKey := NewClusterShardKey(int32(cluster.TestAlternativeClusterInitialFailoverVersion), rand.Int31()) s.streamReceiverMonitor.Lock() - s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) + s.Empty(s.streamReceiverMonitor.outboundStreams) s.streamReceiverMonitor.Unlock() streamKeys := map[ClusterShardKeyPair]struct{}{ @@ -456,7 +456,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Add() { s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Equal(1, len(s.streamReceiverMonitor.outboundStreams)) + s.Len(s.streamReceiverMonitor.outboundStreams, 1) stream, ok := s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -479,7 +479,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Remove() { streamReceiver.EXPECT().Stop() s.streamReceiverMonitor.Lock() - s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) + s.Empty(s.streamReceiverMonitor.outboundStreams) s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -490,7 +490,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Remove() { s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) + s.Empty(s.streamReceiverMonitor.outboundStreams) } func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Reactivate() { @@ -508,7 +508,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Reactivate() streamReceiverStale.EXPECT().Stop() s.streamReceiverMonitor.Lock() - s.Equal(0, len(s.streamReceiverMonitor.outboundStreams)) + s.Empty(s.streamReceiverMonitor.outboundStreams) s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, @@ -524,7 +524,7 @@ func (s *streamReceiverMonitorSuite) TestDoReconcileOutboundStreams_Reactivate() s.streamReceiverMonitor.Lock() defer s.streamReceiverMonitor.Unlock() - s.Equal(1, len(s.streamReceiverMonitor.outboundStreams)) + s.Len(s.streamReceiverMonitor.outboundStreams, 1) stream, ok := s.streamReceiverMonitor.outboundStreams[ClusterShardKeyPair{ Client: clientKey, Server: serverKey, diff --git a/service/history/replication/stream_receiver_test.go b/service/history/replication/stream_receiver_test.go index 4744c1dd25e..f800c67d7b9 100644 --- a/service/history/replication/stream_receiver_test.go +++ b/service/history/replication/stream_receiver_test.go @@ -124,7 +124,7 @@ func (s *streamReceiverSuite) TestAckMessage_Noop() { s.streamReceiver.ackMessage(s.stream) - s.Equal(0, len(s.stream.requests)) + s.Empty(s.stream.requests) } func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeUnset() { @@ -134,7 +134,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeUnset() { s.highPriorityTaskTracker.EXPECT().Size().Return(0) s.lowPriorityTaskTracker.EXPECT().Size().Return(0) _, err := s.streamReceiver.ackMessage(s.stream) - s.Equal(0, len(s.stream.requests)) + s.Empty(s.stream.requests) s.NoError(err) } @@ -177,7 +177,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeSingleStack_ _, err := s.streamReceiver.ackMessage(s.stream) s.Error(err) - s.Equal(0, len(s.stream.requests)) + s.Empty(s.stream.requests) } func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeSingleStack_HasBothWatermark() { @@ -194,7 +194,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeSingleStack_ _, err := s.streamReceiver.ackMessage(s.stream) s.Error(err) - s.Equal(0, len(s.stream.requests)) + s.Empty(s.stream.requests) } func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeTieredStack_NoHighPriorityWatermark() { @@ -208,7 +208,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeTieredStack_ s.highPriorityTaskTracker.EXPECT().Size().Return(0) s.lowPriorityTaskTracker.EXPECT().Size().Return(0) _, err := s.streamReceiver.ackMessage(s.stream) - s.Equal(0, len(s.stream.requests)) + s.Empty(s.stream.requests) s.NoError(err) } @@ -223,7 +223,7 @@ func (s *streamReceiverSuite) TestAckMessage_SyncStatus_ReceiverModeTieredStack_ s.highPriorityTaskTracker.EXPECT().Size().Return(0) s.lowPriorityTaskTracker.EXPECT().Size().Return(0) _, err := s.streamReceiver.ackMessage(s.stream) - s.Equal(0, len(s.stream.requests)) + s.Empty(s.stream.requests) s.NoError(err) } @@ -292,7 +292,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_SingleStack() { func(highWatermarkInfo WatermarkInfo, tasks ...TrackableExecutableTask) []TrackableExecutableTask { s.Equal(streamResp.Resp.GetMessages().ExclusiveHighWatermark, highWatermarkInfo.Watermark) s.Equal(streamResp.Resp.GetMessages().ExclusiveHighWatermarkTime.AsTime(), highWatermarkInfo.Timestamp) - s.Equal(1, len(tasks)) + s.Len(tasks, 1) s.IsType(&ExecutableUnknownTask{}, tasks[0]) return []TrackableExecutableTask{tasks[0]} }, @@ -300,7 +300,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_SingleStack() { err := s.streamReceiver.processMessages(s.stream) s.NoError(err) - s.Equal(1, len(s.taskScheduler.tasks)) + s.Len(s.taskScheduler.tasks, 1) s.IsType(&ExecutableUnknownTask{}, s.taskScheduler.tasks[0]) s.Equal(ReceiverModeSingleStack, s.streamReceiver.receiverMode) } @@ -331,7 +331,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_SingleStack_Receive // no TrackTasks call should be made err := s.streamReceiver.processMessages(s.stream) s.ErrorAs(err, new(*StreamError)) - s.Equal(0, len(s.taskScheduler.tasks)) + s.Empty(s.taskScheduler.tasks) } func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack_ReceivedNonPrioritizedTask() { @@ -358,7 +358,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack_Receive // no TrackTasks call should be made err := s.streamReceiver.processMessages(s.stream) s.ErrorAs(err, new(*StreamError)) - s.Equal(0, len(s.taskScheduler.tasks)) + s.Empty(s.taskScheduler.tasks) } func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { @@ -409,7 +409,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { func(highWatermarkInfo WatermarkInfo, tasks ...TrackableExecutableTask) []TrackableExecutableTask { s.Equal(streamResp1.Resp.GetMessages().ExclusiveHighWatermark, highWatermarkInfo.Watermark) s.Equal(streamResp1.Resp.GetMessages().ExclusiveHighWatermarkTime.AsTime(), highWatermarkInfo.Timestamp) - s.Equal(1, len(tasks)) + s.Len(tasks, 1) s.IsType(&ExecutableUnknownTask{}, tasks[0]) return []TrackableExecutableTask{tasks[0]} }, @@ -418,7 +418,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { func(highWatermarkInfo WatermarkInfo, tasks ...TrackableExecutableTask) []TrackableExecutableTask { s.Equal(streamResp2.Resp.GetMessages().ExclusiveHighWatermark, highWatermarkInfo.Watermark) s.Equal(streamResp2.Resp.GetMessages().ExclusiveHighWatermarkTime.AsTime(), highWatermarkInfo.Timestamp) - s.Equal(1, len(tasks)) + s.Len(tasks, 1) s.IsType(&ExecutableUnknownTask{}, tasks[0]) return []TrackableExecutableTask{tasks[0]} }, @@ -426,7 +426,7 @@ func (s *streamReceiverSuite) TestProcessMessage_TrackSubmit_TieredStack() { err := s.streamReceiver.processMessages(s.stream) s.NoError(err) - s.Equal(2, len(s.taskScheduler.tasks)) + s.Len(s.taskScheduler.tasks, 2) s.Equal(ReceiverModeTieredStack, s.streamReceiver.receiverMode) } diff --git a/service/history/replication/stream_sender_test.go b/service/history/replication/stream_sender_test.go index 44685bacb27..de07578682a 100644 --- a/service/history/replication/stream_sender_test.go +++ b/service/history/replication/stream_sender_test.go @@ -693,8 +693,8 @@ func (s *streamSenderSuite) TestSendLive() { channel, watermark0, ) - s.Nil(err) - s.True(!s.streamSender.IsValid()) + s.NoError(err) + s.False(s.streamSender.IsValid()) } func (s *streamSenderSuite) TestSendTasks_Noop() { diff --git a/service/history/replication/sync_state_retriever_test.go b/service/history/replication/sync_state_retriever_test.go index ac56b79ae2b..049d79ac1e7 100644 --- a/service/history/replication/sync_state_retriever_test.go +++ b/service/history/replication/sync_state_retriever_test.go @@ -243,15 +243,15 @@ func (s *syncWorkflowStateSuite) TestSyncWorkflowState_ReturnMutation() { mutation := syncAttributes.StateMutation // ensure it's a copy by checking the pointers are pointing to different memory addresses - s.True(executionInfo != mutation.ExecutionInfo) + s.NotSame(executionInfo, mutation.ExecutionInfo) s.Nil(mutation.ExecutionInfo.UpdateInfos) s.Nil(mutation.ExecutionInfo.SubStateMachinesByType) s.Nil(mutation.ExecutionInfo.SubStateMachineTombstoneBatches) s.Zero(mutation.ExecutionInfo.LastFirstEventTxnId) // field should be sanitized s.Empty(mutation.UpdatedActivityInfos) - s.Len(mutation.UpdatedTimerInfos, 0) + s.Empty(mutation.UpdatedTimerInfos) s.Len(mutation.UpdatedChildExecutionInfos, 1) - s.Len(mutation.UpdatedRequestCancelInfos, 0) + s.Empty(mutation.UpdatedRequestCancelInfos) s.Len(mutation.UpdatedSignalInfos, 1) s.Len(mutation.UpdatedChasmNodes, 1) s.Nil(mutation.UpdatedChildExecutionInfos[13].Clock) // field should be sanitized @@ -355,7 +355,7 @@ func (s *syncWorkflowStateSuite) TestGetSyncStateRetrieverForNewWorkflow_WithEve mutation := syncAttributes.StateMutation // ensure it's a copy by checking the pointers are pointing to different memory addresses - s.True(executionInfo != mutation.ExecutionInfo) + s.NotSame(executionInfo, mutation.ExecutionInfo) s.Nil(mutation.ExecutionInfo.UpdateInfos) s.Nil(mutation.ExecutionInfo.SubStateMachinesByType) s.Nil(mutation.ExecutionInfo.SubStateMachineTombstoneBatches) @@ -1213,15 +1213,15 @@ func (s *syncWorkflowStateSuite) TestGetUpdatedSubStateMachine() { s.NoError(err) root.InternalRepr().LastUpdateVersionedTransition = &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 10} child1, err := root.AddChild(hsm.Key{Type: def1.Type(), ID: "child1"}, hsmtest.NewData(hsmtest.State1)) - s.Nil(err) + s.NoError(err) child1.InternalRepr().LastUpdateVersionedTransition = &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 8} child2, err := root.AddChild(hsm.Key{Type: def1.Type(), ID: "child2"}, hsmtest.NewData(hsmtest.State1)) - s.Nil(err) + s.NoError(err) child2.InternalRepr().LastUpdateVersionedTransition = &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 10} result, err := s.syncStateRetriever.getUpdatedSubStateMachine(root, &persistencespb.VersionedTransition{NamespaceFailoverVersion: 1, TransitionCount: 9}) s.NoError(err) - s.Equal(1, len(result)) - s.Equal(len(child2.Path()), len(result[0].Path.Path)) + s.Len(result, 1) + s.Len(result[0].Path.Path, len(child2.Path())) s.Equal(child2.Path()[0].ID, result[0].Path.Path[0].Id) } diff --git a/service/history/replication/task_processor_test.go b/service/history/replication/task_processor_test.go index bf2bce80887..65ef741a90b 100644 --- a/service/history/replication/task_processor_test.go +++ b/service/history/replication/task_processor_test.go @@ -538,7 +538,7 @@ func (s *taskProcessorSuite) TestPaginationFn_Success_More() { tasks, _, err := s.replicationTaskProcessor.paginationFn(nil) s.NoError(err) - s.Equal(1, len(tasks)) + s.Len(tasks, 1) s.Equal(task, tasks[0].(*replicationspb.ReplicationTask)) s.Equal(syncShardTask, <-s.replicationTaskProcessor.syncShardChan) s.Equal(lastRetrievedMessageID, s.replicationTaskProcessor.maxRxReceivedTaskID) @@ -611,7 +611,7 @@ func (s *taskProcessorSuite) TestPaginationFn_Success_NoMore() { tasks, _, err := s.replicationTaskProcessor.paginationFn(nil) s.NoError(err) - s.Equal(1, len(tasks)) + s.Len(tasks, 1) s.Equal(task, tasks[0].(*replicationspb.ReplicationTask)) s.Equal(syncShardTask, <-s.replicationTaskProcessor.syncShardChan) s.Equal(lastRetrievedMessageID, s.replicationTaskProcessor.maxRxReceivedTaskID) diff --git a/service/worker/migration/handover_workflow_test.go b/service/worker/migration/handover_workflow_test.go index b8b6bde53fe..3e66fbbe186 100644 --- a/service/worker/migration/handover_workflow_test.go +++ b/service/worker/migration/handover_workflow_test.go @@ -1,7 +1,6 @@ package migration import ( - "errors" "testing" "time" @@ -120,7 +119,7 @@ func TestHandoverWorkflow_SetTimeout(t *testing.T) { require.Error(t, workflowErr) var applicationErr *temporal.ApplicationError - require.True(t, errors.As(workflowErr, &applicationErr)) + require.ErrorAs(t, workflowErr, &applicationErr) assert.Equal(t, "InvalidTimeout", applicationErr.Type()) assert.True(t, applicationErr.NonRetryable()) }