feat: Optimize testing.http

goravel · Dec 24, 2024 · 2f48470 · 2f48470
1 parent 6b30537
commit 2f48470
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 33 deletions.
diff --git 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
diff --git 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
@@ -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 {