Merge pull request #14 from go-openapi/fix-enum-validation

fix int enum validation

Author: casualjim

fixtures/schemas/int-enum.json

@@ -0,0 +1,39 @@
+{
+  "schema": {
+    "type": "object",
+    "properties": {
+      "sizes": {
+        "type": "object",
+        "properties": {
+          "first": {
+            "type": "object",
+            "properties": {
+              "count": {
+                "type": "integer",
+                "default": 3,
+                "enum": [3, 5, 7]
+              }
+            },
+            "required": ["count"]
+          }
+        },
+        "required": ["first"]
+      }
+    },
+    "required": ["sizes"]
+  },
+  "valid": {
+    "sizes": {
+      "first": {
+        "count": 3
+      }
+    }
+  },
+  "invalid": {
+    "sizes": {
+      "first": {
+        "count": 2
+      }
+    }
+  }
+}

type_test.go

@@ -39,7 +39,14 @@ type schemaTestT struct {
 	}
 }
 
+type schemasTestT struct {
+	Schema  *spec.Schema `json:"schema"`
+	Valid   interface{}  `json:"valid"`
+	Invalid interface{}  `json:"invalid"`
+}
+
 var jsonSchemaFixturesPath = filepath.Join("fixtures", "jsonschema_suite")
+var schemaFixturesPath = filepath.Join("fixtures", "schemas")
 
 var ints = []interface{}{
 	1,
@@ -164,3 +171,41 @@ func TestJSONSchemaSuite(t *testing.T) {
 		}
 	}
 }
+
+func TestSchemaFixtures(t *testing.T) {
+	files, err := ioutil.ReadDir(schemaFixturesPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, f := range files {
+		if f.IsDir() {
+			continue
+		}
+		fileName := f.Name()
+		specName := strings.TrimSuffix(fileName, filepath.Ext(fileName))
+
+		t.Log("Running " + specName)
+		b, _ := ioutil.ReadFile(filepath.Join(schemaFixturesPath, fileName))
+
+		var testDescriptions []schemasTestT
+		json.Unmarshal(b, &testDescriptions)
+
+		for _, testDescription := range testDescriptions {
+
+			err := spec.ExpandSchema(testDescription.Schema, nil, nil /*new(noopResCache)*/)
+			if assert.NoError(t, err) {
+
+				validator := NewSchemaValidator(testDescription.Schema, nil, "data", strfmt.Default)
+				valid := validator.Validate(testDescription.Valid)
+				if assert.NotNil(t, valid, specName+" should validate") {
+					assert.Empty(t, valid.Errors, specName+".valid should not have errors")
+				}
+				invalid := validator.Validate(testDescription.Invalid)
+				if assert.NotNil(t, invalid, specName+" should validate") {
+					assert.NotEmpty(t, invalid.Errors, specName+".invalid should have errors")
+				}
+			}
+		}
+	}
+}

validator.go

@@ -156,8 +156,15 @@ func (b *basicCommonValidator) Applies(source interface{}, kind reflect.Kind) bo
 func (b *basicCommonValidator) Validate(data interface{}) (res *Result) {
 	if len(b.Enum) > 0 {
 		for _, enumValue := range b.Enum {
-			if data != nil && reflect.DeepEqual(enumValue, data) {
-				return nil
+			actualType := reflect.TypeOf(enumValue)
+			if actualType == nil {
+				continue
+			}
+			expectedValue := reflect.ValueOf(data)
+			if expectedValue.IsValid() && expectedValue.Type().ConvertibleTo(actualType) {
+				if reflect.DeepEqual(expectedValue.Convert(actualType).Interface(), enumValue) {
+					return nil
+				}
 			}
 		}
 		return sErr(errors.EnumFail(b.Path, b.In, data, b.Enum))