Fix missing location in error reports

[yangtools.git] / yang / yang-data-codec-xml / src / test / java / org / opendaylight / yangtools / yang / data / codec / xml / XmlToNormalizedNodesTest.java

diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java
index c233e00dfe352e118ac5f2b302237c88c8c11d6f..b3824db9800757e1acba913d50430e2b409f9676 100644 (file)
--- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java
+++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java
@@ -5,14 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.codec.xml;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -47,7 +46,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.xml.sax.SAXException;
@@ -81,7 +80,7 @@ public class XmlToNormalizedNodesTest {
     private static final QName MY_SECOND_KEY_LEAF = QName.create(BAZ_MODULE, "my-second-key-leaf");
     private static final QName MY_LEAF_IN_LIST_3 = QName.create(BAZ_MODULE, "my-leaf-in-list-3");
 
-    private static SchemaContext schemaContext;
+    private static EffectiveModelContext schemaContext;
     private static ContainerSchemaNode outerContainerSchema;
     private static ContainerSchemaNode parentContainerSchema;
 
@@ -154,13 +153,9 @@ public class XmlToNormalizedNodesTest {
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
 
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, parentContainerSchema);
-        try {
-            xmlParser.parse(reader);
-            fail("XMLStreamException should have been thrown because of duplicate leaf.");
-        } catch (XMLStreamException ex) {
-            assertThat(ex.getMessage(), containsString("Duplicate namespace \"foo-namespace\" element "
-                    + "\"decimal64-leaf\" in XML input"));
-        }
+        final XMLStreamException ex = assertThrows(XMLStreamException.class, () -> xmlParser.parse(reader));
+        assertThat(ex.getMessage(), containsString("Duplicate element \"decimal64-leaf\" in namespace"
+            + " \"foo-namespace\" with parent \"container leaf-container\" in XML input"));
     }
 
     @Test
@@ -174,12 +169,9 @@ public class XmlToNormalizedNodesTest {
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
 
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, parentContainerSchema);
-        try {
-            xmlParser.parse(reader);
-            fail("XMLStreamException should have been thrown because of duplicate anyxml");
-        } catch (XMLStreamException ex) {
-            assertThat(ex.getMessage(), containsString("Duplicate namespace \"foo-namespace\" element \"my-anyxml\""));
-        }
+        final XMLStreamException ex = assertThrows(XMLStreamException.class, () -> xmlParser.parse(reader));
+        assertThat(ex.getMessage(), containsString("Duplicate element \"my-anyxml\" in namespace"
+            + " \"foo-namespace\" with parent \"container anyxml-container\" in XML input"));
     }
 
     @Test
@@ -193,13 +185,9 @@ public class XmlToNormalizedNodesTest {
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
 
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, parentContainerSchema);
-        try {
-            xmlParser.parse(reader);
-            fail("XMLStreamException should have been thrown because of duplicate container");
-        } catch (XMLStreamException ex) {
-            assertThat(ex.getMessage(), containsString("Duplicate namespace \"foo-namespace\" element "
-                    + "\"leaf-container\" in XML input"));
-        }
+        final XMLStreamException ex = assertThrows(XMLStreamException.class, () -> xmlParser.parse(reader));
+        assertThat(ex.getMessage(), containsString("Duplicate element \"leaf-container\" in namespace"
+            + " \"foo-namespace\" with parent \"container parent-container\" in XML input"));
     }
 
     @Test
@@ -213,12 +201,8 @@ public class XmlToNormalizedNodesTest {
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
 
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, outerContainerSchema);
-        try {
-            xmlParser.parse(reader);
-            fail("XMLStreamException should have been thrown because of unterminated leaf element.");
-        } catch (XMLStreamException ex) {
-            assertThat(ex.getMessage(), containsString(" START_ELEMENT "));
-        }
+        final XMLStreamException ex = assertThrows(XMLStreamException.class, () -> xmlParser.parse(reader));
+        assertThat(ex.getMessage(), containsString(" START_ELEMENT "));
     }
 
     @Test
@@ -232,12 +216,8 @@ public class XmlToNormalizedNodesTest {
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
 
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, outerContainerSchema);
-        try {
-            xmlParser.parse(reader);
-            fail("XMLStreamException should have been thrown because of unterminated leaf element.");
-        } catch (XMLStreamException ex) {
-            assertThat(ex.getMessage(), containsString("</my-leaf-1>"));
-        }
+        final XMLStreamException ex = assertThrows(XMLStreamException.class, () -> xmlParser.parse(reader));
+        assertThat(ex.getMessage(), containsString("</my-leaf-1>"));
     }
 
     @Test
@@ -251,12 +231,8 @@ public class XmlToNormalizedNodesTest {
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
 
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, outerContainerSchema);
-        try {
-            xmlParser.parse(reader);
-            fail("XMLStreamException should have been thrown because of unterminated container element.");
-        } catch (XMLStreamException ex) {
-            assertThat(ex.getMessage(), containsString("</my-container-1>"));
-        }
+        final XMLStreamException ex = assertThrows(XMLStreamException.class, () -> xmlParser.parse(reader));
+        assertThat(ex.getMessage(), containsString("</my-container-1>"));
     }
 
     @Test
@@ -270,14 +246,11 @@ public class XmlToNormalizedNodesTest {
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
 
         final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, outerContainerSchema);
-        try {
-            xmlParser.parse(reader);
-            fail("XMLStreamException should have been thrown because of an unknown child node.");
-        } catch (XMLStreamException ex) {
-            assertEquals("Schema for node with name my-container-1 and namespace baz-namespace does not exist at "
-                    + "AbsoluteSchemaPath{path=[(baz-namespace)outer-container, (baz-namespace)my-container-1]}",
-                    ex.getMessage());
-        }
+        final XMLStreamException ex = assertThrows(XMLStreamException.class, () -> xmlParser.parse(reader));
+
+        assertThat(ex.getMessage(), containsString("Schema for node with name my-container-1 and namespace "
+            + "baz-namespace does not exist at "
+            + "AbsoluteSchemaPath{path=[(baz-namespace)outer-container, (baz-namespace)my-container-1]}"));
     }
 
     private static NormalizedNode<?, ?> buildOuterContainerNode() {