test/test_jsonschema_draft4.rb in json-schema-2.2.5 vs test/test_jsonschema_draft4.rb in json-schema-2.3.0

@@ -885,11 +885,11 @@
 
   def test_format_ipv4
     schema = {
       "$schema" => "http://json-schema.org/draft-04/schema#",
       "type" => "object",
-      "properties" => { "a" => {"type" => "string", "format" => "ip-address"}}
+      "properties" => { "a" => {"type" => "string", "format" => "ipv4"}}
     }
 
     data = {"a" => "1.1.1.1"}
     assert(JSON::Validator.validate(schema,data))
     data = {"a" => "1.1.1"}
@@ -927,57 +927,11 @@
     assert(!JSON::Validator.validate(schema,data))
     data = {"a" => "1111:2222:8888:9999:aaaa:cccc:eeee:ffff:bbbb"}
     assert(!JSON::Validator.validate(schema,data))
   end
 
-  def test_format_time
-    schema = {
-      "$schema" => "http://json-schema.org/draft-04/schema#",
-      "type" => "object",
-      "properties" => { "a" => {"type" => "string", "format" => "time"}}
-    }
 
-    data = {"a" => "12:00:00"}
-    assert(JSON::Validator.validate(schema,data))
-    data = {"a" => "12:00"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "12:00:60"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "12:60:00"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "24:00:00"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "0:00:00"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "-12:00:00"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "12:00:00b"}
-    assert(!JSON::Validator.validate(schema,data))
-  end
-
-
-  def test_format_date
-    schema = {
-      "$schema" => "http://json-schema.org/draft-04/schema#",
-      "type" => "object",
-      "properties" => { "a" => {"type" => "string", "format" => "date"}}
-    }
-
-    data = {"a" => "2010-01-01"}
-    assert(JSON::Validator.validate(schema,data))
-    data = {"a" => "2010-01-32"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "n2010-01-01"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "2010-1-01"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "2010-01-1"}
-    assert(!JSON::Validator.validate(schema,data))
-    data = {"a" => "2010-01-01n"}
-    assert(!JSON::Validator.validate(schema,data))
-  end
-
   def test_format_datetime
     schema = {
       "$schema" => "http://json-schema.org/draft-04/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "string", "format" => "date-time"}}
@@ -1023,18 +977,30 @@
     assert(JSON::Validator.validate(schema,data1))
     assert(!JSON::Validator.validate(schema,data2))
     assert(JSON::Validator.validate(schema,data3))
   end
 
+  def test_format_unknown
+    schema = {
+      "type" => "object",
+      "properties" => { "a" => {"type" => "string", "format" => "unknown"}}
+    }
 
+    data = {"a" => "I can write what I want here"}
+    assert(JSON::Validator.validate(schema,data,:version => :draft4))
+    data = {"a" => ""}
+    assert(JSON::Validator.validate(schema,data,:version => :draft4))
+  end
+
+
   def test_format_union
     data1 = {"a" => "boo"}
     data2 = {"a" => nil}
 
     schema = {
       "$schema" => "http://json-schema.org/draft-04/schema#",
       "type" => "object",
-      "properties" => { "a" => {"type" => ["string","null"], "format" => "ip-address"}}
+      "properties" => { "a" => {"type" => ["string","null"], "format" => "ipv4"}}
     }
     assert(!JSON::Validator.validate(schema,data1))
     assert(JSON::Validator.validate(schema,data2))
   end