Skip to content

Issue 6759: Regenerate common/archiver/provider/provider_mock.go using mockgen #7266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidporter-id-au merged 2 commits into from
Sep 21, 2025
Merged

Issue 6759: Regenerate common/archiver/provider/provider_mock.go using mockgen #7266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b22fa7
test: regenerate common/archiver/provider/provider_mock.go
ansidev Sep 20, 2025
529786b
test: fix failed unit tests
ansidev Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/archiver/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import (
"github.com/uber/cadence/common/syncmap"
)

//go:generate mockgen -package=$GOPACKAGE -destination=provider_mock.go -self_package=github.com/uber/cadence/common/archiver/provider github.com/uber/cadence/common/archiver/provider ArchiverProvider

var (
// ErrUnknownScheme is the error for unknown archiver scheme
ErrUnknownScheme = errors.New("unknown archiver scheme")
Expand Down
132 changes: 62 additions & 70 deletions common/archiver/provider/provider_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion common/domain/handler_MasterCluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ func (s *domainHandlerGlobalDomainEnabledPrimaryClusterSuite) SetupTest() {

func (s *domainHandlerGlobalDomainEnabledPrimaryClusterSuite) TearDownTest() {
s.mockProducer.AssertExpectations(s.T())
s.mockArchiverProvider.AssertExpectations(s.T())
}

func (s *domainHandlerGlobalDomainEnabledPrimaryClusterSuite) TestRegisterGetDomain_LocalDomain_InvalidCluster() {
Expand Down
1 change: 0 additions & 1 deletion common/domain/handler_NotMasterCluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ func (s *domainHandlerGlobalDomainEnabledNotPrimaryClusterSuite) SetupTest() {

func (s *domainHandlerGlobalDomainEnabledNotPrimaryClusterSuite) TearDownTest() {
s.mockProducer.AssertExpectations(s.T())
s.mockArchiverProvider.AssertExpectations(s.T())
}

func (s *domainHandlerGlobalDomainEnabledNotPrimaryClusterSuite) TestRegisterGetDomain_LocalDomain_AllDefault() {
Expand Down
30 changes: 15 additions & 15 deletions common/domain/handler_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ type (
minRetentionDays int
maxBadBinaryCount int
failoverHistoryMaxSize int
domainManager persistence.DomainManager
mockProducer *mocks.KafkaProducer
mockDomainReplicator Replicator
archivalMetadata archiver.ArchivalMetadata
mockArchiverProvider *provider.MockArchiverProvider

domainManager persistence.DomainManager
mockProducer *mocks.KafkaProducer
mockDomainReplicator Replicator
archivalMetadata archiver.ArchivalMetadata
mockArchiverProvider *provider.MockArchiverProvider

handler *handlerImpl
}
Expand Down Expand Up @@ -110,7 +111,7 @@ func (s *domainHandlerCommonSuite) SetupTest() {
false,
&config.ArchivalDomainDefaults{},
)
s.mockArchiverProvider = &provider.MockArchiverProvider{}
s.mockArchiverProvider = provider.NewMockArchiverProvider(s.Controller)
domainConfig := Config{
MinRetentionDays: dynamicproperties.GetIntPropertyFn(s.minRetentionDays),
MaxBadBinaryCount: dynamicproperties.GetIntPropertyFilteredByDomain(s.maxBadBinaryCount),
Expand All @@ -131,7 +132,6 @@ func (s *domainHandlerCommonSuite) SetupTest() {

func (s *domainHandlerCommonSuite) TearDownTest() {
s.mockProducer.AssertExpectations(s.T())
s.mockArchiverProvider.AssertExpectations(s.T())
}

func (s *domainHandlerCommonSuite) TestMergeDomainData_Overriding() {
Expand Down Expand Up @@ -636,14 +636,14 @@ func TestHandlerImpl_UpdateIsolationGroups(t *testing.T) {

t0 := int64(1565914445 * time.Second)
t1 := int64(1685914445 * time.Second)
clock := clock.NewMockedTimeSourceAt(time.Unix(0, t1))
mockedTimeSourceAt := clock.NewMockedTimeSourceAt(time.Unix(0, t1))

info := persistence.DomainInfo{
ID: "10CF5859-C5CC-4CCC-888E-631F84D53F57",
Name: "test",
}

config := persistence.DomainConfig{
domainConfig := persistence.DomainConfig{
Retention: 10,
IsolationGroups: nil,
}
Expand Down Expand Up @@ -676,7 +676,7 @@ func TestHandlerImpl_UpdateIsolationGroups(t *testing.T) {

m.EXPECT().GetDomain(gomock.Any(), &persistence.GetDomainRequest{Name: "test"}).Return(&persistence.GetDomainResponse{
Info: &info,
Config: &config,
Config: &domainConfig,
ReplicationConfig: &replicationConfig,
IsGlobalDomain: false,
ConfigVersion: 1,
Expand Down Expand Up @@ -725,7 +725,7 @@ func TestHandlerImpl_UpdateIsolationGroups(t *testing.T) {
domainAttrValidator: nil,
archivalMetadata: nil,
archiverProvider: nil,
timeSource: clock,
timeSource: mockedTimeSourceAt,
config: Config{
MinRetentionDays: func(opts ...dynamicproperties.FilterOption) int { return 0 },
MaxBadBinaryCount: func(string) int { return 3 },
Expand All @@ -743,14 +743,14 @@ func TestHandlerImpl_UpdateIsolationGroups(t *testing.T) {
func TestHandlerImpl_UpdateAsyncWorkflowConfiguraton(t *testing.T) {
t0 := int64(1565914445 * time.Second)
t1 := int64(1685914445 * time.Second)
clock := clock.NewMockedTimeSourceAt(time.Unix(0, t1))
mockedTimeSourceAt := clock.NewMockedTimeSourceAt(time.Unix(0, t1))

info := persistence.DomainInfo{
ID: "10CF5859-C5CC-4CCC-888E-631F84D53F57",
Name: "test",
}

config := persistence.DomainConfig{
domainConfig := persistence.DomainConfig{
Retention: 10,
}
replicationConfig := persistence.DomainReplicationConfig{
Expand Down Expand Up @@ -787,7 +787,7 @@ func TestHandlerImpl_UpdateAsyncWorkflowConfiguraton(t *testing.T) {

m.EXPECT().GetDomain(gomock.Any(), &persistence.GetDomainRequest{Name: "test"}).Return(&persistence.GetDomainResponse{
Info: &info,
Config: &config,
Config: &domainConfig,
ReplicationConfig: &replicationConfig,
IsGlobalDomain: false,
ConfigVersion: 1,
Expand Down Expand Up @@ -833,7 +833,7 @@ func TestHandlerImpl_UpdateAsyncWorkflowConfiguraton(t *testing.T) {
domainManager: domainMgrMock,
clusterMetadata: cluster.Metadata{},
domainReplicator: replicator,
timeSource: clock,
timeSource: mockedTimeSourceAt,
config: Config{
MinRetentionDays: func(opts ...dynamicproperties.FilterOption) int { return 0 },
MaxBadBinaryCount: func(string) int { return 3 },
Expand Down
3 changes: 3 additions & 0 deletions common/persistence/persistence-tests/persistenceTestBase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/pborman/uuid"
"github.com/stretchr/testify/suite"
"github.com/uber-go/tally"
"go.uber.org/mock/gomock"

"github.com/uber/cadence/common"
"github.com/uber/cadence/common/backoff"
Expand Down Expand Up @@ -79,6 +80,7 @@ type (
// TestBase wraps the base setup needed to create workflows over persistence layer.
TestBase struct {
*suite.Suite
Controller *gomock.Controller
ShardMgr persistence.ShardManager
ExecutionMgrFactory client.Factory
ExecutionManager persistence.ExecutionManager
Expand Down Expand Up @@ -218,6 +220,7 @@ func (s *TestBase) Setup() {
shardID := 10
clusterName := s.ClusterMetadata.GetCurrentClusterName()

s.Controller = gomock.NewController(s.T())
s.Logger = testlogger.New(s.T())

s.DefaultTestCluster.SetupTestDatabase()
Expand Down
5 changes: 2 additions & 3 deletions common/resource/resource_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/uber-go/tally"
"go.uber.org/goleak"
"go.uber.org/mock/gomock"
Expand Down Expand Up @@ -148,8 +147,8 @@ func TestStartStop(t *testing.T) {
persistenceClientBean.EXPECT().Close().Times(1)

// archiver provider mocks
archiveProvider := &provider.MockArchiverProvider{}
archiveProvider.On("RegisterBootstrapContainer", mock.Anything, mock.Anything, mock.Anything).Return(nil).Times(1)
archiveProvider := provider.NewMockArchiverProvider(ctrl)
archiveProvider.EXPECT().RegisterBootstrapContainer(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).Times(1)

// params
params := &Params{
Expand Down
3 changes: 1 addition & 2 deletions common/resource/resource_test_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func NewTest(
PayloadSerializer: persistence.NewPayloadSerializer(),
MetricsClient: metrics.NewClient(scope, serviceMetricsIndex),
ArchivalMetadata: &archiver.MockArchivalMetadata{},
ArchiverProvider: &provider.MockArchiverProvider{},
ArchiverProvider: provider.NewMockArchiverProvider(controller),
BlobstoreClient: &blobstore.MockClient{},
MockPayloadSerializer: persistence.NewMockPayloadSerializer(controller),

Expand Down Expand Up @@ -464,7 +464,6 @@ func (s *Test) Finish(
t mock.TestingT,
) {
s.ArchivalMetadata.AssertExpectations(t)
s.ArchiverProvider.AssertExpectations(t)

s.MetadataMgr.AssertExpectations(t)
s.TaskMgr.AssertExpectations(t)
Expand Down
Loading
Loading