diff --git a/contracts/support/http/body.go b/contracts/support/http/body.go index 2c632e768..bda8dcd0c 100644 --- a/contracts/support/http/body.go +++ b/contracts/support/http/body.go @@ -12,6 +12,6 @@ type Body interface { } type Reader interface { - Reader() io.Reader + io.Reader ContentType() string } diff --git a/mocks/support/http/Reader.go b/mocks/support/http/Reader.go index 1dcfde575..3e2bdfadc 100644 --- a/mocks/support/http/Reader.go +++ b/mocks/support/http/Reader.go @@ -2,11 +2,7 @@ package http -import ( - io "io" - - mock "github.com/stretchr/testify/mock" -) +import mock "github.com/stretchr/testify/mock" // Reader is an autogenerated mock type for the Reader type type Reader struct { @@ -66,49 +62,58 @@ func (_c *Reader_ContentType_Call) RunAndReturn(run func() string) *Reader_Conte return _c } -// Reader provides a mock function with no fields -func (_m *Reader) Reader() io.Reader { - ret := _m.Called() +// Read provides a mock function with given fields: p +func (_m *Reader) Read(p []byte) (int, error) { + ret := _m.Called(p) if len(ret) == 0 { - panic("no return value specified for Reader") + panic("no return value specified for Read") } - var r0 io.Reader - if rf, ok := ret.Get(0).(func() io.Reader); ok { - r0 = rf() + var r0 int + var r1 error + if rf, ok := ret.Get(0).(func([]byte) (int, error)); ok { + return rf(p) + } + if rf, ok := ret.Get(0).(func([]byte) int); ok { + r0 = rf(p) } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(io.Reader) - } + r0 = ret.Get(0).(int) } - return r0 + if rf, ok := ret.Get(1).(func([]byte) error); ok { + r1 = rf(p) + } else { + r1 = ret.Error(1) + } + + return r0, r1 } -// Reader_Reader_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Reader' -type Reader_Reader_Call struct { +// Reader_Read_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Read' +type Reader_Read_Call struct { *mock.Call } -// Reader is a helper method to define mock.On call -func (_e *Reader_Expecter) Reader() *Reader_Reader_Call { - return &Reader_Reader_Call{Call: _e.mock.On("Reader")} +// Read is a helper method to define mock.On call +// - p []byte +func (_e *Reader_Expecter) Read(p interface{}) *Reader_Read_Call { + return &Reader_Read_Call{Call: _e.mock.On("Read", p)} } -func (_c *Reader_Reader_Call) Run(run func()) *Reader_Reader_Call { +func (_c *Reader_Read_Call) Run(run func(p []byte)) *Reader_Read_Call { _c.Call.Run(func(args mock.Arguments) { - run() + run(args[0].([]byte)) }) return _c } -func (_c *Reader_Reader_Call) Return(_a0 io.Reader) *Reader_Reader_Call { - _c.Call.Return(_a0) +func (_c *Reader_Read_Call) Return(n int, err error) *Reader_Read_Call { + _c.Call.Return(n, err) return _c } -func (_c *Reader_Reader_Call) RunAndReturn(run func() io.Reader) *Reader_Reader_Call { +func (_c *Reader_Read_Call) RunAndReturn(run func([]byte) (int, error)) *Reader_Read_Call { _c.Call.Return(run) return _c } diff --git a/support/http/body_test.go b/support/http/body_test.go index 5584ef7c1..69eda9ae8 100644 --- a/support/http/body_test.go +++ b/support/http/body_test.go @@ -43,7 +43,7 @@ func TestBuildJSONBody(t *testing.T) { assert.NoError(t, err) buf := new(bytes.Buffer) - _, err = buf.ReadFrom(reader.Reader()) + _, err = buf.ReadFrom(reader) assert.NoError(t, err) var result map[string]any @@ -62,7 +62,7 @@ func TestBuildFormBody(t *testing.T) { assert.NoError(t, err) buf := new(bytes.Buffer) - _, err = buf.ReadFrom(reader.Reader()) + _, err = buf.ReadFrom(reader) assert.NoError(t, err) formData, err := url.ParseQuery(buf.String()) @@ -87,7 +87,7 @@ func TestBuildMultipartBody(t *testing.T) { assert.NoError(t, err) buf := new(bytes.Buffer) - _, err = buf.ReadFrom(reader.Reader()) + _, err = buf.ReadFrom(reader) assert.NoError(t, err) contentType := reader.ContentType() @@ -139,7 +139,7 @@ func TestBuildFormBodyWithSpecialCharacters(t *testing.T) { assert.NoError(t, err) buf := new(bytes.Buffer) - _, err = buf.ReadFrom(reader.Reader()) + _, err = buf.ReadFrom(reader) assert.NoError(t, err) formData, err := url.ParseQuery(buf.String()) diff --git a/support/http/reader.go b/support/http/reader.go index 78dd7a04a..6cea57620 100644 --- a/support/http/reader.go +++ b/support/http/reader.go @@ -18,8 +18,8 @@ func newReader(body io.Reader, contentType string) http.Reader { } } -func (r *readerImpl) Reader() io.Reader { - return r.body +func (r *readerImpl) Read(p []byte) (n int, err error) { + return r.body.Read(p) } func (r *readerImpl) ContentType() string {