X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Futil%2FNetconfUtilTest.java;h=16842040a57372f1bb35be0f48dedacb76050e08;hb=197acb99bed8c585e26091eafb761481533718a0;hp=6cf30edc891d3f5ffc220dca32f448f205b893ad;hpb=f402dcd49a468e018192c96151bef3a0cdf70d62;p=netconf.git

diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java
index 6cf30edc89..16842040a5 100644
--- a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java
+++ b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java
@@ -8,8 +8,8 @@
 package org.opendaylight.netconf.util;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import java.util.Collections;
 import javax.xml.transform.dom.DOMResult;
@@ -47,12 +47,10 @@ public class NetconfUtilTest {
     public void testConflictingVersionDetection() throws Exception {
         final Document document = XmlUtil.readXmlToDocument(getClass()
                 .getResourceAsStream("/netconfMessages/conflictingversion/conflictingVersionResponse.xml"));
-        try {
-            NetconfUtil.checkIsMessageOk(document);
-            fail();
-        } catch (final IllegalStateException e) {
-            assertThat(e.getMessage(), containsString("Optimistic lock failed. Expected parent version 21, was 18"));
-        }
+
+        final IllegalStateException e = assertThrows(IllegalStateException.class,
+            () -> NetconfUtil.checkIsMessageOk(document));
+        assertThat(e.getMessage(), containsString("Optimistic lock failed. Expected parent version 21, was 18"));
     }
 
     @Test
@@ -79,8 +77,8 @@ public class NetconfUtilTest {
         final DOMResult result = new DOMResult(XmlUtil.newDocument());
         final SchemaPath path = SchemaPath.create(true, NetconfState.QNAME);
         NetconfUtil.writeNormalizedNode(sessions, result, path, context);
-        final Document expected = XmlUtil.readXmlToDocument(getClass().getResourceAsStream("/sessions.xml"));
         final Document actual = (Document) result.getNode();
+        final Document expected = XmlUtil.readXmlToDocument(getClass().getResourceAsStream("/sessions.xml"));
         final Diff diff = XMLUnit.compareXML(expected, actual);
         Assert.assertTrue(diff.toString(), diff.similar());
     }