Fix bad merge.

Author: gazpachoking

tests.py

@@ -419,15 +419,13 @@ def maximum(self, expect, eM, instance):
         ("exact", "valid", [1]),
         ("longer", "valid", [1, 2]),
         ("too_short", "invalid", []),
-        ("ignores_strings", "valid", "a"),
     )(validation_test(minItems=1))
 
     maxItems = parametrized(
         ("exact", "valid", [1, 2]),
         ("shorter", "valid", [1]),
         ("empty", "valid", []),
         ("too_long", "invalid", [1, 2, 3]),
-        ("ignores_strings", "valid", "aaaa"),
     )(validation_test(maxItems=2))
 
     uniqueItems = parametrized(
@@ -450,19 +448,16 @@ def maximum(self, expect, eM, instance):
     pattern = parametrized(
         ("match", "valid", "aaa"),
         ("mismatch", "invalid", "ab"),
-        ("ignores_other_stuff", "valid", True),
     )(validation_test(pattern="^a*$"))
 
     minLength = parametrized(
         ("", "valid", "foo"),
         ("too_short", "invalid", "f"),
-        ("ignores_arrays", "valid", [1]),
     )(validation_test(minLength=2))
 
     maxLength = parametrized(
         ("", "valid", "f"),
         ("too_long", "invalid", "foo"),
-        ("ignores_arrays", "valid", [1, 2, 3]),
     )(validation_test(maxLength=2))
 
     @parametrized(
@@ -824,24 +819,45 @@ def test_tree(self):
 
 
 class TestIgnorePropertiesForIrrelevantTypes(unittest.TestCase):
-    def test_minimum(self):
+    def test_minimum_ignores_nonnumbers(self):
         validate("x", {"type": ["string", "number"], "minimum": 10})
 
-    def test_maximum(self):
+    def test_maximum_ignores_nonnumbers(self):
         validate("x", {"type": ["string", "number"], "maximum": 10})
 
-    def test_properties(self):
+    def test_properties_ignores_nonobjects(self):
         validate(1, {"type": ["integer", "object"], "properties": {"x": {}}})
 
-    def test_items(self):
+    def test_additionalProperties_ignores_nonobjects(self):
+        validate(None, {"additionalProperties" : False})
+
+    def test_minLength_ignores_nonstrings(self):
+        validate([1], {"minLength" : 3})
+
+    def test_maxLength_ignores_nonstrings(self):
+        validate([1, 2, 3], {"minLength" : 2})
+
+    def test_pattern_ignores_non_strings(self):
+        validate(True, {"pattern" : "^a*$"})
+
+    def test_items_ignores_nonarrays(self):
         validate(
             1, {"type": ["integer", "array"], "items": {"type": "string"}}
         )
 
-    def test_divisibleBy(self):
+    def test_minItems_ignores_nonarrays(self):
+        validate("x", {"minItems" : 3})
+
+    def test_maxItems_ignores_nonarrays(self):
+        validate("xxxx", {"maxItems" : 3})
+
+    def test_additionalItems_ignores_nonarrays(self):
+        validate(None, {"additionalItems" : False})
+
+    def test_divisibleBy_ignores_nonnumbers(self):
         validate("x", {"type": ["integer", "string"], "divisibleBy": 10})
 
-    def test_dependencies(self):
+    def test_dependencies_ignores_nonobjects(self):
         validate("foo", {"dependencies" : {"foo": "bar"}})