Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor tests to use testify require library #25

Merged
merged 6 commits into from
Nov 16, 2022
+55 −148
Merged

Refactor tests to use testify require library #25

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da708b9
Refactor tests to use testify require library
miketonks-form3 Sep 28, 2022
72d51ac
Change `require` to `assert` to avoid calls to t.FailNow and ensure t…
miketonks-form3 Oct 6, 2022
34d6b13
remove test.go proof of concept
miketonks-form3 Oct 12, 2022
92d2976
Change `require` to `assert` in concurrent_proxy_stage as well. Remo…
miketonks-form3 Oct 19, 2022
089e842
Merge remote-tracking branch 'origin/master' into refactor-tests
miketonks-form3 Nov 3, 2022
ec4f5c1
Merge branch 'master' into refactor-tests
miketonks-form3 Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 19 additions & 44 deletions internal/app/concurrent_proxy_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/form3tech-oss/pact-proxy/pkg/pactproxy"
"github.com/pact-foundation/pact-go/dsl"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
)

const (
Expand All @@ -20,6 +21,7 @@ const (

type ConcurrentProxyStage struct {
t *testing.T
require *require.Assertions
proxy *pactproxy.PactProxy
pact *dsl.Pact
modifiedNameStatusCode int
Expand All @@ -40,9 +42,10 @@ func NewConcurrentProxyStage(t *testing.T) (*ConcurrentProxyStage, *ConcurrentPr
}

s := &ConcurrentProxyStage{
t: t,
pact: pact,
proxy: proxy,
t: t,
require: require.New(t),
pact: pact,
proxy: proxy,
}

t.Cleanup(func() {
Expand Down Expand Up @@ -144,42 +147,28 @@ func (s *ConcurrentProxyStage) the_concurrent_requests_are_sent() {
return nil
})

if err != nil {
s.t.Error(err)
}
s.require.NoError(err)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a general comment about calling FailNow from @henrique-pinto-form3 . Doesn't this method still potentially end up calling t.FailNow under the hood?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is a problem, we're not creating a goroutine as part of the stage setup?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intended to change all to assert, mainly for consistence, just overlooked this file. Will change.

}

func (s *ConcurrentProxyStage) makeUserRequest() {
u := fmt.Sprintf("http://localhost:%s/users", proxyURL.Port())
req, err := http.NewRequest("POST", u, strings.NewReader(`{"name":"jim"}`))
if err != nil {
s.t.Error(err)
return
}
s.require.NoError(err)

req.Header.Set("Content-Type", "application/json")
res, err := http.DefaultClient.Do(req)
if err != nil {
s.t.Error(err)
return
}
s.require.NoError(err)
s.userResponses = append(s.userResponses, res)
}

func (s *ConcurrentProxyStage) makeAddressRequest() {
u := fmt.Sprintf("http://localhost:%s/addresses", proxyURL.Port())
req, err := http.NewRequest("POST", u, strings.NewReader(`{"address":"test"}`))
if err != nil {
s.t.Error(err)
return
}
s.require.NoError(err)

req.Header.Set("Content-Type", "application/json")
res, err := http.DefaultClient.Do(req)
if err != nil {
s.t.Error(err)
return
}
s.require.NoError(err)
s.addressResponses = append(s.addressResponses, res)
}

Expand Down Expand Up @@ -208,50 +197,36 @@ func sendConcurrentRequests(requests int, d time.Duration, f func()) {

func (s *ConcurrentProxyStage) all_the_user_responses_should_have_the_right_status_code() *ConcurrentProxyStage {
expectedLen := s.concurrentUserRequestsPerSecond * int(s.concurrentUserRequestsDuration/time.Second)
if len(s.userResponses) != expectedLen {
s.t.Errorf("expected %d user responses, but got %d", expectedLen, len(s.userResponses))
}
s.require.Len(s.userResponses, expectedLen, "number of user responses is not as expected")

for _, res := range s.userResponses {
if s.modifiedNameStatusCode != res.StatusCode {
s.t.Errorf("expected user status code of %d, but got %d", s.modifiedNameStatusCode, res.StatusCode)
}
s.require.Equal(res.StatusCode, s.modifiedNameStatusCode, "expected user status code")
}

return s
}

func (s *ConcurrentProxyStage) all_the_address_responses_should_have_the_right_status_code() *ConcurrentProxyStage {
expectedLen := s.concurrentAddressRequestsPerSecond * int(s.concurrentAddressRequestsDuration/time.Second)
if len(s.addressResponses) != expectedLen {
s.t.Errorf("expected %d address responses, but got %d", expectedLen, len(s.addressResponses))
}
s.require.Len(s.addressResponses, expectedLen, "number of address responses is not as expected")

for _, res := range s.addressResponses {
if s.modifiedAddressStatusCode != res.StatusCode {
s.t.Errorf("expected address status code of %d, but got %d", s.modifiedAddressStatusCode, res.StatusCode)
}
s.require.Equal(res.StatusCode, s.modifiedAddressStatusCode, "expected address status code")
}

return s
}

func (s *ConcurrentProxyStage) the_proxy_waits_for_all_user_responses() *ConcurrentProxyStage {
want := s.concurrentUserRequestsPerSecond * int(s.concurrentUserRequestsDuration/time.Second)
received := len(s.userResponses)
if received != want {
s.t.Errorf("expected %d user responses, but got %d", want, received)
s.t.Fail()
}
s.require.Len(s.userResponses, want, "number of user responses is not as expected")

return s
}

func (s *ConcurrentProxyStage) the_proxy_waits_for_all_address_responses() *ConcurrentProxyStage {
want := s.concurrentAddressRequestsPerSecond * int(s.concurrentAddressRequestsDuration/time.Second)
received := len(s.addressResponses)
if received != want {
s.t.Errorf("expected %d address responses, but got %d", want, received)
s.t.Fail()
}
s.require.Len(s.addressResponses, want, "number of address responses is not as expected")

return s
}
Loading