Add test case capturing the desired behaviour

Author: abravalheri

tests/conftest.py

@@ -33,7 +33,8 @@ def f(definition, value, expected, formats={}):
         if isinstance(expected, JsonSchemaValueException):
             with pytest.raises(JsonSchemaValueException) as exc:
                 validator(value)
-            assert exc.value.message == expected.message
+            if expected.message is not any:
+                assert exc.value.message == expected.message
             assert exc.value.value == (value if expected.value == '{data}' else expected.value)
             assert exc.value.name == expected.name
             assert exc.value.definition == (definition if expected.definition == '{definition}' else expected.definition)

tests/test_composition.py

@@ -0,0 +1,78 @@
+import pytest
+
+import fastjsonschema
+from fastjsonschema import JsonSchemaValueException
+
+
+def _composition_example(composition="oneOf"):
+    return {
+        "definitions": {
+            "multiple-of-3": {"type": "number", "multipleOf": 3},
+            "multiple-of-5": {"type": "number", "multipleOf": 5},
+        },
+        composition: [
+            {"$ref": "#/definitions/multiple-of-3"},
+            {"$ref": "#/definitions/multiple-of-5"},
+        ],
+    }
+
+
+@pytest.mark.parametrize(
+    "composition, value",
+    [("oneOf", 10), ("allOf", 15), ("anyOf", 9)]
+)
+def test_composition(asserter, composition, value):
+    asserter(_composition_example(composition), value, value)
+
+
+@pytest.mark.parametrize(
+    "composition, value",
+    [("oneOf", 2), ("anyOf", 2), ("allOf", 3)]
+)
+def test_ref_is_expanded_on_composition_error(composition, value):
+    with pytest.raises(JsonSchemaValueException) as exc:
+        fastjsonschema.validate(_composition_example(composition), value)
+
+    if composition in exc.value.definition:
+        assert exc.value.definition[composition] == [
+            {"type": "number", "multipleOf": 3},
+            {"type": "number", "multipleOf": 5},
+        ]
+    else:
+        # allOf will fail on the first invalid item,
+        # so the error message will not refer to the entire composition
+        assert composition == "allOf"
+        assert "$ref" not in exc.value.definition
+        assert exc.value.definition["type"] == "number"
+
+
+@pytest.mark.parametrize(
+    "composition, value",
+    [("oneOf", 2), ("anyOf", 2), ("allOf", 3)]
+)
+def test_ref_is_expanded_with_resolver(composition, value):
+    repo = {
+        "sch://multiple-of-3": {"type": "number", "multipleOf": 3},
+        "sch://multiple-of-5": {"type": "number", "multipleOf": 5},
+    }
+    schema = {
+        composition: [
+            {"$ref": "sch://multiple-of-3"},
+            {"$ref": "sch://multiple-of-5"},
+        ]
+    }
+
+    with pytest.raises(JsonSchemaValueException) as exc:
+        fastjsonschema.validate(schema, value, handlers={"sch": repo.__getitem__})
+
+    if composition in exc.value.definition:
+        assert exc.value.definition[composition] == [
+            {"type": "number", "multipleOf": 3},
+            {"type": "number", "multipleOf": 5},
+        ]
+    else:
+        # allOf will fail on the first invalid item,
+        # so the error message will not refer to the entire composition
+        assert composition == "allOf"
+        assert "$ref" not in exc.value.definition
+        assert exc.value.definition["type"] == "number"