From 6ee75271f86374921e36ba1a411d93898c03f77f Mon Sep 17 00:00:00 2001 From: Chuntao Lu Date: Thu, 21 Jun 2018 14:44:50 -0700 Subject: [PATCH] Regenerate mock workflows --- .../contacts_savecontacts_workflow_mock.go | 35 +++++++------ .../endpoints/contacts/mock-workflow/type.go | 4 +- .../kappaservice_say_workflow_mock.go | 52 +++++++++++++------ .../endpoints/kappa/mock-workflow/type.go | 4 +- .../simpleservice_call_workflow_mock.go | 44 +++++++++------- .../tchannel/baz/mock-workflow/type.go | 4 +- 6 files changed, 88 insertions(+), 55 deletions(-) diff --git a/examples/example-gateway/build/endpoints/contacts/mock-workflow/contacts_savecontacts_workflow_mock.go b/examples/example-gateway/build/endpoints/contacts/mock-workflow/contacts_savecontacts_workflow_mock.go index 56dae24fc..2d64aa826 100644 --- a/examples/example-gateway/build/endpoints/contacts/mock-workflow/contacts_savecontacts_workflow_mock.go +++ b/examples/example-gateway/build/endpoints/contacts/mock-workflow/contacts_savecontacts_workflow_mock.go @@ -27,39 +27,44 @@ import ( "testing" "github.com/golang/mock/gomock" + zanzibar "github.com/uber/zanzibar/runtime" "go.uber.org/zap" - contactsclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/contacts/mock-client" + contactsclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/contacts" + contactsclientgeneratedmock "github.com/uber/zanzibar/examples/example-gateway/build/clients/contacts/mock-client" module "github.com/uber/zanzibar/examples/example-gateway/build/endpoints/contacts/module" workflow "github.com/uber/zanzibar/examples/example-gateway/build/endpoints/contacts/workflow" fixturecontactsclientgenerated "github.com/uber/zanzibar/examples/example-gateway/clients/contacts/fixture" contactsendpointstatic "github.com/uber/zanzibar/examples/example-gateway/endpoints/contacts" - zanzibar "github.com/uber/zanzibar/runtime" ) +// clientDependenciesNodes contains client dependencies +type clientDependenciesNodes struct { + Contacts contactsclientgenerated.Client +} + // NewContactsSaveContactsWorkflowMock creates a workflow with mock clients -func NewContactsSaveContactsWorkflowMock(t *testing.T) (workflow.ContactsSaveContactsWorkflow, *MockClients) { +func NewContactsSaveContactsWorkflowMock(t *testing.T) (workflow.ContactsSaveContactsWorkflow, *MockClientNodes) { ctrl := gomock.NewController(t) - mockClients := &MockClients{ - Contacts: contactsclientgenerated.New(ctrl, fixturecontactsclientgenerated.Fixture), + + initializedDefaultDependencies := &zanzibar.DefaultDependencies{ + Logger: zap.NewNop(), } - mockClientDependencies := &module.ClientDependencies{ - Contacts: mockClients.Contacts, + initializedClientDependencies := &clientDependenciesNodes{} + mockClientNodes := &MockClientNodes{ + Contacts: contactsclientgeneratedmock.New(ctrl, fixturecontactsclientgenerated.Fixture), } + initializedClientDependencies.Contacts = mockClientNodes.Contacts w := contactsendpointstatic.NewContactsSaveContactsWorkflow( &module.Dependencies{ - Default: &zanzibar.DefaultDependencies{ - Logger: zap.NewNop(), - Scope: nil, - Tracer: nil, - Config: nil, - Channel: nil, + Default: initializedDefaultDependencies, + Client: &module.ClientDependencies{ + Contacts: initializedClientDependencies.Contacts, }, - Client: mockClientDependencies, }, ) - return w, mockClients + return w, mockClientNodes } diff --git a/examples/example-gateway/build/endpoints/contacts/mock-workflow/type.go b/examples/example-gateway/build/endpoints/contacts/mock-workflow/type.go index bdf39a052..b8904c0a6 100644 --- a/examples/example-gateway/build/endpoints/contacts/mock-workflow/type.go +++ b/examples/example-gateway/build/endpoints/contacts/mock-workflow/type.go @@ -27,7 +27,7 @@ import ( contactsclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/contacts/mock-client" ) -// MockClients contains mock client dependencies for the contacts endpoint module -type MockClients struct { +// MockClientNodes contains mock client dependencies for the contacts endpoint module +type MockClientNodes struct { Contacts *contactsclientgenerated.MockClientWithFixture } diff --git a/examples/example-gateway/build/endpoints/kappa/mock-workflow/kappaservice_say_workflow_mock.go b/examples/example-gateway/build/endpoints/kappa/mock-workflow/kappaservice_say_workflow_mock.go index ae9c4f68f..d4273afa4 100644 --- a/examples/example-gateway/build/endpoints/kappa/mock-workflow/kappaservice_say_workflow_mock.go +++ b/examples/example-gateway/build/endpoints/kappa/mock-workflow/kappaservice_say_workflow_mock.go @@ -27,39 +27,59 @@ import ( "testing" "github.com/golang/mock/gomock" - "go.uber.org/zap" - - barclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/bar/mock-client" zanzibar "github.com/uber/zanzibar/runtime" + "go.uber.org/zap" + barclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/bar" + barclientgeneratedmock "github.com/uber/zanzibar/examples/example-gateway/build/clients/bar/mock-client" module "github.com/uber/zanzibar/examples/example-gateway/build/endpoints/kappa/module" workflow "github.com/uber/zanzibar/examples/example-gateway/build/endpoints/kappa/workflow" + foorepositorygenerated "github.com/uber/zanzibar/examples/example-gateway/build/repositories/foo" + foorepositorymodule "github.com/uber/zanzibar/examples/example-gateway/build/repositories/foo/module" kappaendpointstatic "github.com/uber/zanzibar/examples/example-gateway/endpoints/kappa" ) +// clientDependenciesNodes contains client dependencies +type clientDependenciesNodes struct { + Bar barclientgenerated.Client +} + +// repositoryDependenciesNodes contains repository dependencies +type repositoryDependenciesNodes struct { + Foo foorepositorygenerated.Repository +} + // NewKappaServiceSayWorkflowMock creates a workflow with mock clients -func NewKappaServiceSayWorkflowMock(t *testing.T) (workflow.KappaServiceSayWorkflow, *MockClients) { +func NewKappaServiceSayWorkflowMock(t *testing.T) (workflow.KappaServiceSayWorkflow, *MockClientNodes) { ctrl := gomock.NewController(t) - mockClients := &MockClients{ - Bar: barclientgenerated.NewMockClient(ctrl), + + initializedDefaultDependencies := &zanzibar.DefaultDependencies{ + Logger: zap.NewNop(), } - mockClientDependencies := &module.ClientDependencies{ - Bar: mockClients.Bar, + initializedClientDependencies := &clientDependenciesNodes{} + mockClientNodes := &MockClientNodes{ + Bar: barclientgeneratedmock.NewMockClient(ctrl), } + initializedClientDependencies.Bar = mockClientNodes.Bar + + initializedRepositoryDependencies := &repositoryDependenciesNodes{} + + initializedRepositoryDependencies.Foo = foorepositorygenerated.NewRepository(&foorepositorymodule.Dependencies{ + Default: initializedDefaultDependencies, + Client: &foorepositorymodule.ClientDependencies{ + Bar: initializedClientDependencies.Bar, + }, + }) w := kappaendpointstatic.NewKappaServiceSayWorkflow( &module.Dependencies{ - Default: &zanzibar.DefaultDependencies{ - Logger: zap.NewNop(), - Scope: nil, - Tracer: nil, - Config: nil, - Channel: nil, + Default: initializedDefaultDependencies, + Repository: &module.RepositoryDependencies{ + Foo: initializedRepositoryDependencies.Foo, }, - Repository: mockClientDependencies, }, ) - return w, mockClients + return w, mockClientNodes } diff --git a/examples/example-gateway/build/endpoints/kappa/mock-workflow/type.go b/examples/example-gateway/build/endpoints/kappa/mock-workflow/type.go index 763104336..ebef64a72 100644 --- a/examples/example-gateway/build/endpoints/kappa/mock-workflow/type.go +++ b/examples/example-gateway/build/endpoints/kappa/mock-workflow/type.go @@ -27,7 +27,7 @@ import ( barclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/bar/mock-client" ) -// MockClients contains mock client dependencies for the kappa endpoint module -type MockClients struct { +// MockClientNodes contains mock client dependencies for the kappa endpoint module +type MockClientNodes struct { Bar *barclientgenerated.MockClient } diff --git a/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/simpleservice_call_workflow_mock.go b/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/simpleservice_call_workflow_mock.go index 06df96cf6..a0253c763 100644 --- a/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/simpleservice_call_workflow_mock.go +++ b/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/simpleservice_call_workflow_mock.go @@ -27,42 +27,50 @@ import ( "testing" "github.com/golang/mock/gomock" + zanzibar "github.com/uber/zanzibar/runtime" "go.uber.org/zap" - bazclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/baz/mock-client" - quuxclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/quux/mock-client" + bazclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/baz" + bazclientgeneratedmock "github.com/uber/zanzibar/examples/example-gateway/build/clients/baz/mock-client" + quuxclientgeneratedmock "github.com/uber/zanzibar/examples/example-gateway/build/clients/quux/mock-client" module "github.com/uber/zanzibar/examples/example-gateway/build/endpoints/tchannel/baz/module" workflow "github.com/uber/zanzibar/examples/example-gateway/build/endpoints/tchannel/baz/workflow" + quuxclientstatic "github.com/uber/zanzibar/examples/example-gateway/clients/quux" fixturequuxclientstatic "github.com/uber/zanzibar/examples/example-gateway/clients/quux/fixture" baztchannelendpointstatic "github.com/uber/zanzibar/examples/example-gateway/endpoints/tchannel/baz" - zanzibar "github.com/uber/zanzibar/runtime" ) +// clientDependenciesNodes contains client dependencies +type clientDependenciesNodes struct { + Baz bazclientgenerated.Client + Quux quuxclientstatic.Client +} + // NewSimpleServiceCallWorkflowMock creates a workflow with mock clients -func NewSimpleServiceCallWorkflowMock(t *testing.T) (workflow.SimpleServiceCallWorkflow, *MockClients) { +func NewSimpleServiceCallWorkflowMock(t *testing.T) (workflow.SimpleServiceCallWorkflow, *MockClientNodes) { ctrl := gomock.NewController(t) - mockClients := &MockClients{ - Baz: bazclientgenerated.NewMockClient(ctrl), - Quux: quuxclientgenerated.New(ctrl, fixturequuxclientstatic.Fixture), + + initializedDefaultDependencies := &zanzibar.DefaultDependencies{ + Logger: zap.NewNop(), } - mockClientDependencies := &module.ClientDependencies{ - Baz: mockClients.Baz, - Quux: mockClients.Quux, + initializedClientDependencies := &clientDependenciesNodes{} + mockClientNodes := &MockClientNodes{ + Baz: bazclientgeneratedmock.NewMockClient(ctrl), + Quux: quuxclientgeneratedmock.New(ctrl, fixturequuxclientstatic.Fixture), } + initializedClientDependencies.Baz = mockClientNodes.Baz + initializedClientDependencies.Quux = mockClientNodes.Quux w := baztchannelendpointstatic.NewSimpleServiceCallWorkflow( &module.Dependencies{ - Default: &zanzibar.DefaultDependencies{ - Logger: zap.NewNop(), - Scope: nil, - Tracer: nil, - Config: nil, - Channel: nil, + Default: initializedDefaultDependencies, + Client: &module.ClientDependencies{ + Baz: initializedClientDependencies.Baz, + Quux: initializedClientDependencies.Quux, }, - Client: mockClientDependencies, }, ) - return w, mockClients + return w, mockClientNodes } diff --git a/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/type.go b/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/type.go index b35ed5b40..605fbdc84 100644 --- a/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/type.go +++ b/examples/example-gateway/build/endpoints/tchannel/baz/mock-workflow/type.go @@ -28,8 +28,8 @@ import ( quuxclientgenerated "github.com/uber/zanzibar/examples/example-gateway/build/clients/quux/mock-client" ) -// MockClients contains mock client dependencies for the bazTChannel endpoint module -type MockClients struct { +// MockClientNodes contains mock client dependencies for the bazTChannel endpoint module +type MockClientNodes struct { Baz *bazclientgenerated.MockClient Quux *quuxclientgenerated.MockClientWithFixture }