test/test_ruby_schema.rb in json-schema-2.4.1 vs test/test_ruby_schema.rb in json-schema-2.5.0

@@ -1,24 +1,19 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/json-schema'
+require File.expand_path('../test_helper', __FILE__)
 
-class RubySchemaTest < Test::Unit::TestCase
+class RubySchemaTest < Minitest::Test
   def test_string_keys
     schema = {
       "type" => 'object',
       "required" => ["a"],
       "properties" => {
         "a" => {"type" => "integer", "default" => 42},
         "b" => {"type" => "integer"}
       }
     }
 
-    data = {
-      "a" => 5
-    }
-
-    assert(JSON::Validator.validate(schema, data))
+    assert_valid schema, { "a" => 5 }
   end
 
   def test_symbol_keys
     schema = {
       :type => 'object',
@@ -27,15 +22,11 @@
         :a => {:type => "integer", :default => 42},
         :b => {:type => "integer"}
       }
     }
 
-    data = {
-      :a => 5
-    }
-
-    assert(JSON::Validator.validate(schema, data))
+    assert_valid schema, { :a => 5 }
   end
 
   def test_symbol_keys_in_hash_within_array
     schema = {
       :type => 'object',
@@ -61,8 +52,8 @@
           :b => 1
         }
       ]
     }
 
-    assert(JSON::Validator.validate(schema, data, :validate_schema => true))
+    assert_valid schema, data, :validate_schema => true
   end
 end