chore: move testing.http to a single folder (#814)

goravel · Jan 10, 2025 · bc907a5 · bc907a5
1 parent 634f3b3
commit bc907a5
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 134 deletions.
diff --git a/testing/assertable_json.go → testing/http/assertable_json.go b/testing/assertable_json.go → testing/http/assertable_json.go
@@ -1,22 +1,24 @@
-package testing
+package http
 
 import (
 	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/goravel/framework/contracts/foundation"
 	contractstesting "github.com/goravel/framework/contracts/testing"
 	"github.com/goravel/framework/support/maps"
 )
 
 type AssertableJson struct {
 	t       *testing.T
-	json    string
+	json    foundation.Json
+	jsonStr string
 	decoded map[string]any
 }
 
-func NewAssertableJSON(t *testing.T, jsonStr string) (contractstesting.AssertableJSON, error) {
+func NewAssertableJSON(t *testing.T, json foundation.Json, jsonStr string) (contractstesting.AssertableJSON, error) {
 	var decoded map[string]any
 	err := json.Unmarshal([]byte(jsonStr), &decoded)
 	if err != nil {
@@ -25,7 +27,8 @@ func NewAssertableJSON(t *testing.T, jsonStr string) (contractstesting.Assertabl
 
 	return &AssertableJson{
 		t:       t,
-		json:    jsonStr,
+		json:    json,
+		jsonStr: jsonStr,
 		decoded: decoded,
 	}, nil
 }
@@ -111,9 +114,9 @@ func (r *AssertableJson) First(key string, callback func(contractstesting.Assert
 	}
 
 	firstItem := array[0]
-	itemJson, err := json.Marshal(firstItem)
+	itemJson, err := r.json.Marshal(firstItem)
 	if assert.NoError(r.t, err, "Failed to marshal the first item") {
-		newJson, err := NewAssertableJSON(r.t, string(itemJson))
+		newJson, err := NewAssertableJSON(r.t, r.json, string(itemJson))
 		if assert.NoError(r.t, err, "Failed to create AssertableJSON for first item") {
 			callback(newJson)
 		}
@@ -138,12 +141,12 @@ func (r *AssertableJson) HasWithScope(key string, length int, callback func(cont
 	}
 
 	if len(array) > 0 {
-		itemJson, err := json.Marshal(array[0])
+		itemJson, err := r.json.Marshal(array[0])
 		if !assert.NoError(r.t, err, "Failed to marshal the first item of array") {
 			return r
 		}
 
-		newJson, err := NewAssertableJSON(r.t, string(itemJson))
+		newJson, err := NewAssertableJSON(r.t, r.json, string(itemJson))
 		if !assert.NoError(r.t, err, "Failed to create AssertableJSON for first item in scoped array") {
 			return r
 		}
@@ -166,12 +169,12 @@ func (r *AssertableJson) Each(key string, callback func(contractstesting.Asserta
 	}
 
 	for _, item := range array {
-		itemJson, err := json.Marshal(item)
+		itemJson, err := r.json.Marshal(item)
 		if !assert.NoError(r.t, err) {
 			continue
 		}
 
-		newJson, err := NewAssertableJSON(r.t, string(itemJson))
+		newJson, err := NewAssertableJSON(r.t, r.json, string(itemJson))
 		if !assert.NoError(r.t, err) {
 			continue
 		}

diff --git a/testing/assertable_json_test.go → testing/http/assertable_json_test.go b/testing/assertable_json_test.go → testing/http/assertable_json_test.go
@@ -1,4 +1,4 @@
-package testing
+package http
 
 import (
 	"testing"
@@ -13,35 +13,28 @@ type AssertableJsonTestSuite struct {
 }
 
 func TestAssertableJsonTestSuite(t *testing.T) {
-	json = &testJson{}
-
 	suite.Run(t, new(AssertableJsonTestSuite))
 }
 
 func (s *AssertableJsonTestSuite) SetupTest() {
-
-}
-
-func (s *AssertableJsonTestSuite) TearDownSuite() {
-	json = nil
 }
 
 func (s *AssertableJsonTestSuite) TestNewAssertableJSON() {
 	validJSON := `{"key1": "value1", "key2": [1, 2, 3]}`
 	invalidJSON := `{"key1": "value1", "key2": [1, 2, 3]`
 
-	assertable, err := NewAssertableJSON(s.T(), validJSON)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, validJSON)
 	s.NoError(err)
 	s.NotNil(assertable)
 
-	assertable, err = NewAssertableJSON(s.T(), invalidJSON)
+	assertable, err = NewAssertableJSON(s.T(), &testJson{}, invalidJSON)
 	s.Error(err)
 	s.Nil(assertable)
 }
 
 func (s *AssertableJsonTestSuite) TestCount() {
 	jsonStr := `{"items": [1, 2, 3], "otherKey": "value"}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	assertable.Count("items", 3)
@@ -56,7 +49,7 @@ func (s *AssertableJsonTestSuite) TestHas() {
 		"nested": {"deep": "value"},
 		"nullKey": null
 	}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	assertable.Has("key1")
@@ -67,7 +60,7 @@ func (s *AssertableJsonTestSuite) TestHas() {
 
 func (s *AssertableJsonTestSuite) TestHasAll() {
 	jsonStr := `{"key1": "value1", "key2": [1, 2, 3]}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test all keys exist
@@ -79,7 +72,7 @@ func (s *AssertableJsonTestSuite) TestHasAll() {
 
 func (s *AssertableJsonTestSuite) TestHasAny() {
 	jsonStr := `{"key1": "value1", "key2": [1, 2, 3]}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test at least one key exists
@@ -91,7 +84,7 @@ func (s *AssertableJsonTestSuite) TestHasAny() {
 
 func (s *AssertableJsonTestSuite) TestMissing() {
 	jsonStr := `{"key1": "value1"}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test key is missing
@@ -103,7 +96,7 @@ func (s *AssertableJsonTestSuite) TestMissing() {
 
 func (s *AssertableJsonTestSuite) TestMissingAll() {
 	jsonStr := `{"key1": "value1"}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test all keys are missing
@@ -122,7 +115,7 @@ func (s *AssertableJsonTestSuite) TestWhere() {
 		"objKey": {"nested": "value"},
 		"arrayKey": [1, 2, 3]
 	}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test correct value
@@ -143,7 +136,7 @@ func (s *AssertableJsonTestSuite) TestWhere() {
 
 func (s *AssertableJsonTestSuite) TestWhereNot() {
 	jsonStr := `{"key1": "value1", "key2": [1, 2, 3]}`
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test value is not as expected
@@ -156,7 +149,7 @@ func (s *AssertableJsonTestSuite) TestWhereNot() {
 func (s *AssertableJsonTestSuite) TestFirst() {
 	jsonStr := `{"items": [{"id": 1}, {"id": 2}]}`
 
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test fetching the first item
@@ -176,7 +169,7 @@ func (s *AssertableJsonTestSuite) TestFirst() {
 func (s *AssertableJsonTestSuite) TestHasWithScope() {
 	jsonStr := `{"items": [{"id": 1}, {"id": 2}]}`
 
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test has with correct length
@@ -198,7 +191,7 @@ func (s *AssertableJsonTestSuite) TestEach() {
 		"nonArray": "value"
 	}`
 
-	assertable, err := NewAssertableJSON(s.T(), jsonStr)
+	assertable, err := NewAssertableJSON(s.T(), &testJson{}, jsonStr)
 	s.NoError(err)
 
 	// Test iterating over each item
@@ -214,7 +207,7 @@ func (s *AssertableJsonTestSuite) TestEach() {
 
 	// Test with an empty array
 	emptyJsonStr := `{"items": []}`
-	emptyAssertable, err := NewAssertableJSON(s.T(), emptyJsonStr)
+	emptyAssertable, err := NewAssertableJSON(s.T(), &testJson{}, emptyJsonStr)
 	s.NoError(err)
 
 	emptyCallCount := 0

diff --git a/testing/test_request.go → testing/http/test_request.go b/testing/test_request.go → testing/http/test_request.go
@@ -1,4 +1,4 @@
-package testing
+package http
 
 import (
 	"context"
@@ -9,6 +9,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/goravel/framework/contracts/foundation"
+	"github.com/goravel/framework/contracts/route"
+	"github.com/goravel/framework/contracts/session"
 	contractstesting "github.com/goravel/framework/contracts/testing"
 	"github.com/goravel/framework/errors"
 	"github.com/goravel/framework/support/collect"
@@ -22,15 +25,21 @@ type TestRequest struct {
 	bind              any
 	defaultHeaders    map[string]string
 	defaultCookies    map[string]string
+	json              foundation.Json
+	route             route.Route
+	session           session.Manager
 	sessionAttributes map[string]any
 }
 
-func NewTestRequest(t *testing.T) contractstesting.TestRequest {
+func NewTestRequest(t *testing.T, json foundation.Json, route route.Route, session session.Manager) contractstesting.TestRequest {
 	return &TestRequest{
 		t:                 t,
 		ctx:               context.Background(),
 		defaultHeaders:    make(map[string]string),
 		defaultCookies:    make(map[string]string),
+		json:              json,
+		route:             route,
+		session:           session,
 		sessionAttributes: make(map[string]any),
 	}
 }
@@ -153,23 +162,23 @@ func (r *TestRequest) call(method string, uri string, body io.Reader) (contracts
 		req.AddCookie(&cookie)
 	}
 
-	if routeFacade == nil {
+	if r.route == nil {
 		r.t.Fatal(errors.RouteFacadeNotSet.SetModule(errors.ModuleTesting))
 	}
 
-	response, err := routeFacade.Test(req)
+	response, err := r.route.Test(req)
 	if err != nil {
 		return nil, err
 	}
 
-	testResponse := NewTestResponse(r.t, response)
+	testResponse := NewTestResponse(r.t, response, r.json, r.session)
 	if r.bind != nil {
 		body, err := testResponse.Content()
 		if err != nil {
 			return nil, err
 		}
 
-		if err := json.Unmarshal([]byte(body), r.bind); err != nil {
+		if err := r.json.Unmarshal([]byte(body), r.bind); err != nil {
 			return nil, err
 		}
 	}
@@ -182,18 +191,18 @@ func (r *TestRequest) setSession() error {
 		return nil
 	}
 
-	if sessionFacade == nil {
+	if r.session == nil {
 		return errors.SessionFacadeNotSet
 	}
 
 	// Retrieve session driver
-	driver, err := sessionFacade.Driver()
+	driver, err := r.session.Driver()
 	if err != nil {
 		return err
 	}
 
 	// Build session
-	session, err := sessionFacade.BuildSession(driver)
+	session, err := r.session.BuildSession(driver)
 	if err != nil {
 		return err
 	}
@@ -209,6 +218,6 @@ func (r *TestRequest) setSession() error {
 	}
 
 	// Release session
-	sessionFacade.ReleaseSession(session)
+	r.session.ReleaseSession(session)
 	return nil
 }
diff --git a/testing/test_request_test.go → testing/http/test_request_test.go b/testing/test_request_test.go → testing/http/test_request_test.go
@@ -1,4 +1,4 @@
-package testing
+package http
 
 import (
 	"bytes"
@@ -31,24 +31,19 @@ func TestTestRequestSuite(t *testing.T) {
 func (s *TestRequestSuite) SetupTest() {
 	s.mockRoute = mocksroute.NewRoute(s.T())
 	s.mockSessionManager = mockssession.NewManager(s.T())
-	json = &testJson{}
-	routeFacade = s.mockRoute
-	sessionFacade = s.mockSessionManager
+
 	s.testRequest = &TestRequest{
 		t:                 s.T(),
 		ctx:               context.Background(),
 		defaultHeaders:    make(map[string]string),
 		defaultCookies:    make(map[string]string),
 		sessionAttributes: make(map[string]any),
+		json:              &testJson{},
+		route:             s.mockRoute,
+		session:           s.mockSessionManager,
 	}
 }
 
-func (s *TestRequestSuite) TearDownTest() {
-	json = nil
-	routeFacade = nil
-	sessionFacade = nil
-}
-
 func (s *TestRequestSuite) TestBindAndCall() {
 	s.mockRoute.EXPECT().Test(httptest.NewRequest("GET", "/", nil).WithContext(context.Background())).Return(&http.Response{
 		Body: io.NopCloser(bytes.NewBufferString(`{"name": "John", "age": 30}`)),