Added length matcher

Author: iv-p

Makefile

@@ -22,5 +22,10 @@ test/positive: build
 
 test/negative: build
 	@docker-compose -f tests/echo/docker-compose.yaml up -d  &>/dev/null
-	$(BIN) check -s "tests/**/*_fail.jsonnet"
+	$(BIN) check -s "tests/**/*_fail.jsonnet" --silent
+	@docker-compose -f tests/echo/docker-compose.yaml down  &>/dev/null
+
+test/local: build
+	@docker-compose -f tests/echo/docker-compose.yaml up -d  &>/dev/null
+	$(BIN) check -s "$(target)"
 	@docker-compose -f tests/echo/docker-compose.yaml down  &>/dev/null

spec/matcher/json_matcher.go

@@ -67,7 +67,7 @@ func (m jsonMatcher) Match(data interface{}, location string) (ok bool, pass []s
 					keysMatched[name] = true
 					break
 				} else {
-					errStr = fmt.Sprintf("%s does not match %s, got %v", key, valueMatcher, value)
+					errStr = fmt.Sprintf("%s is not %s, got %v", key, valueMatcher, value)
 				}
 			}
 			if !found {

spec/matcher/len_matcher.go

@@ -0,0 +1,53 @@
+package matcher
+
+import (
+	"fmt"
+
+	"github.com/getapid/apid/log"
+)
+
+type lenMatcher struct {
+	value int
+}
+
+func LenMatcherWithOptions(params interface{}) Matcher {
+	switch v := params.(type) {
+	case float64:
+		// check if value is int, json unmarshal puts
+		// numbers in float64
+		if v == float64(int(v)) {
+			return lenMatcher{int(v)}
+		}
+		log.L.Fatalf("invalid len matcher, got %v", params)
+	default:
+		log.L.Fatalf("invalid len matcher, got %v", params)
+	}
+	return nil
+}
+
+func (m lenMatcher) Match(data interface{}, location string) (bool, []string, []string) {
+	switch val := data.(type) {
+	case []interface{}:
+		if len(val) == m.value {
+			return true, []string{fmt.Sprintf("`%s` has length %d", location, m.value)}, nil
+		}
+		return true, nil, []string{fmt.Sprintf("`%s` of length %d wanted, got %d", location, m.value, len(val))}
+	case map[string]interface{}:
+		if len(val) == m.value {
+			return true, []string{fmt.Sprintf("`%s` has length %d", location, m.value)}, nil
+		}
+		return true, nil, []string{fmt.Sprintf("`%s` of length %d wanted, got %d", location, m.value, len(val))}
+	case string:
+		if len(val) == m.value {
+			return true, []string{fmt.Sprintf("`%s` has length %d", location, m.value)}, nil
+		}
+		return false, nil, []string{fmt.Sprintf("`%s` of length %d wanted, got %d", location, m.value, len(val))}
+	default:
+		return false, nil, []string{fmt.Sprintf("`%s` not a map, array or string", location)}
+	}
+
+}
+
+func (m lenMatcher) String() string {
+	return fmt.Sprintf("of lentgh %d", m.value)
+}

spec/matcher/matcher.go

@@ -50,6 +50,8 @@ func tryGetMatcherFromMap(m map[string]interface{}) Matcher {
 		return JSONMatcherWithOptions(params)
 	case "array":
 		return ArrayMatcherWithOptions(params)
+	case "len":
+		return LenMatcherWithOptions(params)
 	default:
 		log.L.Fatalf("unknown matcher type %s", t)
 		return nil

tests/passing/apid/is.libsonnet

@@ -51,6 +51,12 @@ local array_matcher(array, subset=false) =
     },
   };
 
+local len_matcher(len) =
+  {
+    '$$matcher_type$$': 'len',
+    '$$matcher_params$$': len,
+  };
+
 local json_to_string(json) = std.manifestJsonEx(json, '');
 
 {
@@ -59,6 +65,7 @@ local json_to_string(json) = std.manifestJsonEx(json, '');
     string(string, case_sensitive=true):: '%s%s' % [SHORTHAND_MATCHER_PREFIX, json_to_string(string_matcher(string, case_sensitive))],
     int(int):: '%s%s' % [SHORTHAND_MATCHER_PREFIX, json_to_string(int_matcher(int))],
     float(float):: '%s%s' % [SHORTHAND_MATCHER_PREFIX, json_to_string(float_matcher(float))],
+    len(len):: '%s%s' % [SHORTHAND_MATCHER_PREFIX, json_to_string(len_matcher(len))],
   },
 
   any():: any_matcher(),
@@ -68,4 +75,5 @@ local json_to_string(json) = std.manifestJsonEx(json, '');
   float(float):: float_matcher(float),
   json(json, subset=false):: json_matcher(json, subset),
   array(array, subset=false):: array_matcher(array, subset),
+  len(len):: len_matcher(len),
 }

tests/passing/body_pass.jsonnet

@@ -53,6 +53,7 @@ local steps(method, body, expected) = [
         'Marline',
         'Catharine',
       ],
+      countryCode: is.len(2),
     },
   ]
 }