Update test generation to fix test failures

marcosvm · Aug 20, 2015 · e3d8359 · e3d8359
1 parent cf23956
commit e3d8359
Show file tree

Hide file tree

Showing 11 changed files with 213 additions and 212 deletions.
diff --git a/internal/protocol/ec2query/build_test.go b/internal/protocol/ec2query/build_test.go
@@ -41,7 +41,7 @@ type InputService1ProtocolTest struct {
 // New returns a new InputService1ProtocolTest client.
 func NewInputService1ProtocolTest(config *aws.Config) *InputService1ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice1protocoltest",
 			APIVersion:  "2014-01-01",
@@ -62,7 +62,7 @@ func NewInputService1ProtocolTest(config *aws.Config) *InputService1ProtocolTest
 // newRequest creates a new request for a InputService1ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService1ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -118,7 +118,7 @@ type InputService2ProtocolTest struct {
 // New returns a new InputService2ProtocolTest client.
 func NewInputService2ProtocolTest(config *aws.Config) *InputService2ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice2protocoltest",
 			APIVersion:  "2014-01-01",
@@ -139,7 +139,7 @@ func NewInputService2ProtocolTest(config *aws.Config) *InputService2ProtocolTest
 // newRequest creates a new request for a InputService2ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService2ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -197,7 +197,7 @@ type InputService3ProtocolTest struct {
 // New returns a new InputService3ProtocolTest client.
 func NewInputService3ProtocolTest(config *aws.Config) *InputService3ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice3protocoltest",
 			APIVersion:  "2014-01-01",
@@ -218,7 +218,7 @@ func NewInputService3ProtocolTest(config *aws.Config) *InputService3ProtocolTest
 // newRequest creates a new request for a InputService3ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService3ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -282,7 +282,7 @@ type InputService4ProtocolTest struct {
 // New returns a new InputService4ProtocolTest client.
 func NewInputService4ProtocolTest(config *aws.Config) *InputService4ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice4protocoltest",
 			APIVersion:  "2014-01-01",
@@ -303,7 +303,7 @@ func NewInputService4ProtocolTest(config *aws.Config) *InputService4ProtocolTest
 // newRequest creates a new request for a InputService4ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService4ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -357,7 +357,7 @@ type InputService5ProtocolTest struct {
 // New returns a new InputService5ProtocolTest client.
 func NewInputService5ProtocolTest(config *aws.Config) *InputService5ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice5protocoltest",
 			APIVersion:  "2014-01-01",
@@ -378,7 +378,7 @@ func NewInputService5ProtocolTest(config *aws.Config) *InputService5ProtocolTest
 // newRequest creates a new request for a InputService5ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService5ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -432,7 +432,7 @@ type InputService6ProtocolTest struct {
 // New returns a new InputService6ProtocolTest client.
 func NewInputService6ProtocolTest(config *aws.Config) *InputService6ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice6protocoltest",
 			APIVersion:  "2014-01-01",
@@ -453,7 +453,7 @@ func NewInputService6ProtocolTest(config *aws.Config) *InputService6ProtocolTest
 // newRequest creates a new request for a InputService6ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService6ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -507,7 +507,7 @@ type InputService7ProtocolTest struct {
 // New returns a new InputService7ProtocolTest client.
 func NewInputService7ProtocolTest(config *aws.Config) *InputService7ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice7protocoltest",
 			APIVersion:  "2014-01-01",
@@ -528,7 +528,7 @@ func NewInputService7ProtocolTest(config *aws.Config) *InputService7ProtocolTest
 // newRequest creates a new request for a InputService7ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService7ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -582,7 +582,7 @@ type InputService8ProtocolTest struct {
 // New returns a new InputService8ProtocolTest client.
 func NewInputService8ProtocolTest(config *aws.Config) *InputService8ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "inputservice8protocoltest",
 			APIVersion:  "2014-01-01",
@@ -603,7 +603,7 @@ func NewInputService8ProtocolTest(config *aws.Config) *InputService8ProtocolTest
 // newRequest creates a new request for a InputService8ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService8ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }

diff --git a/internal/protocol/ec2query/unmarshal_test.go b/internal/protocol/ec2query/unmarshal_test.go
@@ -41,7 +41,7 @@ type OutputService1ProtocolTest struct {
 // New returns a new OutputService1ProtocolTest client.
 func NewOutputService1ProtocolTest(config *aws.Config) *OutputService1ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice1protocoltest",
 			APIVersion:  "",
@@ -62,7 +62,7 @@ func NewOutputService1ProtocolTest(config *aws.Config) *OutputService1ProtocolTe
 // newRequest creates a new request for a OutputService1ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService1ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -130,7 +130,7 @@ type OutputService2ProtocolTest struct {
 // New returns a new OutputService2ProtocolTest client.
 func NewOutputService2ProtocolTest(config *aws.Config) *OutputService2ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice2protocoltest",
 			APIVersion:  "",
@@ -151,7 +151,7 @@ func NewOutputService2ProtocolTest(config *aws.Config) *OutputService2ProtocolTe
 // newRequest creates a new request for a OutputService2ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService2ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -205,7 +205,7 @@ type OutputService3ProtocolTest struct {
 // New returns a new OutputService3ProtocolTest client.
 func NewOutputService3ProtocolTest(config *aws.Config) *OutputService3ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice3protocoltest",
 			APIVersion:  "",
@@ -226,7 +226,7 @@ func NewOutputService3ProtocolTest(config *aws.Config) *OutputService3ProtocolTe
 // newRequest creates a new request for a OutputService3ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService3ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -280,7 +280,7 @@ type OutputService4ProtocolTest struct {
 // New returns a new OutputService4ProtocolTest client.
 func NewOutputService4ProtocolTest(config *aws.Config) *OutputService4ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice4protocoltest",
 			APIVersion:  "",
@@ -301,7 +301,7 @@ func NewOutputService4ProtocolTest(config *aws.Config) *OutputService4ProtocolTe
 // newRequest creates a new request for a OutputService4ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService4ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -355,7 +355,7 @@ type OutputService5ProtocolTest struct {
 // New returns a new OutputService5ProtocolTest client.
 func NewOutputService5ProtocolTest(config *aws.Config) *OutputService5ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice5protocoltest",
 			APIVersion:  "",
@@ -376,7 +376,7 @@ func NewOutputService5ProtocolTest(config *aws.Config) *OutputService5ProtocolTe
 // newRequest creates a new request for a OutputService5ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService5ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -430,7 +430,7 @@ type OutputService6ProtocolTest struct {
 // New returns a new OutputService6ProtocolTest client.
 func NewOutputService6ProtocolTest(config *aws.Config) *OutputService6ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice6protocoltest",
 			APIVersion:  "",
@@ -451,7 +451,7 @@ func NewOutputService6ProtocolTest(config *aws.Config) *OutputService6ProtocolTe
 // newRequest creates a new request for a OutputService6ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService6ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -515,7 +515,7 @@ type OutputService7ProtocolTest struct {
 // New returns a new OutputService7ProtocolTest client.
 func NewOutputService7ProtocolTest(config *aws.Config) *OutputService7ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice7protocoltest",
 			APIVersion:  "",
@@ -536,7 +536,7 @@ func NewOutputService7ProtocolTest(config *aws.Config) *OutputService7ProtocolTe
 // newRequest creates a new request for a OutputService7ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService7ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -590,7 +590,7 @@ type OutputService8ProtocolTest struct {
 // New returns a new OutputService8ProtocolTest client.
 func NewOutputService8ProtocolTest(config *aws.Config) *OutputService8ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:      defaults.DefaultConfig.Merge(config),
 			ServiceName: "outputservice8protocoltest",
 			APIVersion:  "",
@@ -611,7 +611,7 @@ func NewOutputService8ProtocolTest(config *aws.Config) *OutputService8ProtocolTe
 // newRequest creates a new request for a OutputService8ProtocolTest operation and runs any
 // custom request initialization.
 func (c *OutputService8ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }

diff --git a/internal/protocol/jsonrpc/build_test.go b/internal/protocol/jsonrpc/build_test.go
@@ -41,7 +41,7 @@ type InputService1ProtocolTest struct {
 // New returns a new InputService1ProtocolTest client.
 func NewInputService1ProtocolTest(config *aws.Config) *InputService1ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:       defaults.DefaultConfig.Merge(config),
 			ServiceName:  "inputservice1protocoltest",
 			APIVersion:   "",
@@ -64,7 +64,7 @@ func NewInputService1ProtocolTest(config *aws.Config) *InputService1ProtocolTest
 // newRequest creates a new request for a InputService1ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService1ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -119,7 +119,7 @@ type InputService2ProtocolTest struct {
 // New returns a new InputService2ProtocolTest client.
 func NewInputService2ProtocolTest(config *aws.Config) *InputService2ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:       defaults.DefaultConfig.Merge(config),
 			ServiceName:  "inputservice2protocoltest",
 			APIVersion:   "",
@@ -142,7 +142,7 @@ func NewInputService2ProtocolTest(config *aws.Config) *InputService2ProtocolTest
 // newRequest creates a new request for a InputService2ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService2ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -196,7 +196,7 @@ type InputService3ProtocolTest struct {
 // New returns a new InputService3ProtocolTest client.
 func NewInputService3ProtocolTest(config *aws.Config) *InputService3ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:       defaults.DefaultConfig.Merge(config),
 			ServiceName:  "inputservice3protocoltest",
 			APIVersion:   "",
@@ -219,7 +219,7 @@ func NewInputService3ProtocolTest(config *aws.Config) *InputService3ProtocolTest
 // newRequest creates a new request for a InputService3ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService3ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -307,7 +307,7 @@ type InputService4ProtocolTest struct {
 // New returns a new InputService4ProtocolTest client.
 func NewInputService4ProtocolTest(config *aws.Config) *InputService4ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:       defaults.DefaultConfig.Merge(config),
 			ServiceName:  "inputservice4protocoltest",
 			APIVersion:   "",
@@ -330,7 +330,7 @@ func NewInputService4ProtocolTest(config *aws.Config) *InputService4ProtocolTest
 // newRequest creates a new request for a InputService4ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService4ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }
@@ -385,7 +385,7 @@ type InputService5ProtocolTest struct {
 // New returns a new InputService5ProtocolTest client.
 func NewInputService5ProtocolTest(config *aws.Config) *InputService5ProtocolTest {
 	service := &service.Service{
-		Service: serviceinfo.ServiceInfo{
+		ServiceInfo: serviceinfo.ServiceInfo{
 			Config:       defaults.DefaultConfig.Merge(config),
 			ServiceName:  "inputservice5protocoltest",
 			APIVersion:   "",
@@ -408,7 +408,7 @@ func NewInputService5ProtocolTest(config *aws.Config) *InputService5ProtocolTest
 // newRequest creates a new request for a InputService5ProtocolTest operation and runs any
 // custom request initialization.
 func (c *InputService5ProtocolTest) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(c.Service, op, params, data)
+	req := c.NewRequest(op, params, data)
 
 	return req
 }