Merge pull request #10 from sandvikcode/develop

Allow mock server to accept 0 when verifying number of calls

Author: sfro

README.md

@@ -40,6 +40,7 @@ Expectation Defaults:
 * unlimited calls will respond to a match
 * calls are not delayed
 * status of matched calls is 200 OK
+* body of matched calls is empty
 
 Verification Defaults:
 * matched request occurs once i.e. at 1 least call and at most 1 call 

cloudbuild.yaml

@@ -4,4 +4,4 @@ steps:
 - name: 'gcr.io/cloud-builders/docker'
   args: ['build', '-t', '${_LIBRARY_NAME}', '.', '--cache-from', 'eu.gcr.io/$PROJECT_ID/${_LIBRARY_NAME}']
 substitutions:
-  _LIBRARY_NAME: flames-library-mockserver-client
+  _LIBRARY_NAME: mockserver-client-go

pkg/mockclient/expectations.go

@@ -37,8 +37,8 @@ type ResponseBody struct {
 // Times defines how many times the MockServer will serve a given request in expectation mode whilst
 // in verification mode defines the expected number of calls
 type Times struct {
-	AtLeast        int   `json:"atLeast,omitempty"`        // valid for verifications only
-	AtMost         int   `json:"atMost,omitempty"`         // valid for verifications only
+	AtLeast        *int  `json:"atLeast,omitempty"`        // valid for verifications only
+	AtMost         *int  `json:"atMost,omitempty"`         // valid for verifications only
 	RemainingTimes int   `json:"remainingTimes,omitempty"` // valid for expectations only
 	Unlimited      *bool `json:"unlimited,omitempty"`      // valid for expectations only
 }
@@ -134,7 +134,7 @@ func WhenTimes(times int) ExpectationOption {
 	return func(e *Expectation) *Expectation {
 		e.Times = &Times{
 			RemainingTimes: times,
-			Unlimited:      newBool(false),
+			Unlimited:      boolPointer(false),
 		}
 		return e
 	}
@@ -196,7 +196,7 @@ func ThenResponseDelay(delay time.Duration) ExpectationOption {
 	}
 }
 
-func newBool(value bool) *bool {
-    b := value
-    return &b
+func boolPointer(value bool) *bool {
+	b := value
+	return &b
 }

pkg/mockclient/verifications.go

@@ -13,8 +13,8 @@ func CreateVerification(opts ...ExpectationOption) *Expectation {
 			Path: "/(.*)",
 		},
 		Times: &Times{
-			AtLeast: 1,
-			AtMost:  1,
+			AtLeast: integerPointer(1),
+			AtMost:  integerPointer(1),
 		},
 	}
 	// Append all options that are set (discard defaults)
@@ -28,15 +28,15 @@ func CreateVerification(opts ...ExpectationOption) *Expectation {
 // ThenAtLeastCalls creates a verification that a matching call was received at least x times by MockServer
 func ThenAtLeastCalls(times int) ExpectationOption {
 	return func(v *Expectation) *Expectation {
-		v.Times.AtLeast = times
+		v.Times.AtLeast = integerPointer(times)
 		return v
 	}
 }
 
 // ThenAtMostCalls creates a verification that a matching call was received at most x times by MockServer
 func ThenAtMostCalls(times int) ExpectationOption {
 	return func(v *Expectation) *Expectation {
-		v.Times.AtMost = times
+		v.Times.AtMost = integerPointer(times)
 		return v
 	}
 }
@@ -63,3 +63,7 @@ func VerifyPath(path string) VerificationOption {
 	}
 }
 */
+
+func integerPointer(i int) *int {
+	return &i
+}

pkg/mockclient/verifications_test.go

@@ -28,13 +28,13 @@ func TestVerifications(t *testing.T) {
         	    "atMost": 1
 			}
 		}`},
-		{"Verify the MockServer was called at least 0 times, and at most 1 times, for a given path, by using the default atMost.", CreateVerification(WhenRequestPath("/path"), ThenAtLeastCalls(1)), `
+		{"Verify the MockServer was called at least 0 times, and at most 1 times, for a given path, by using the default atMost.", CreateVerification(WhenRequestPath("/path"), ThenAtLeastCalls(0)), `
 		{
 			"httpRequest": {
 				"path": "/path"
 			},
 			"times": {
-				"atLeast": 1,
+				"atLeast": 0,
         	    "atMost": 1
 			}
 		}`},