X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Futil%2FNetconfUtilTest.java;h=85eeb30a07339c3b379bd756328f7ed96926fbc2;hb=40b7bf5aaa289756525a775bf63b3783a914ed38;hp=b4b8aba81fc0513e5d7debf0aca749f1a592129b;hpb=6b98de000257414b2ae9b1db708c0f7962a0f033;p=controller.git diff --git a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/NetconfUtilTest.java b/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/NetconfUtilTest.java index b4b8aba81f..85eeb30a07 100644 --- a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/NetconfUtilTest.java +++ b/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/NetconfUtilTest.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.netconf.util; import org.junit.Test; -import org.opendaylight.controller.config.api.ConflictingVersionException; import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.w3c.dom.Document; @@ -25,7 +24,7 @@ public class NetconfUtilTest { try{ NetconfUtil.checkIsMessageOk(new NetconfMessage(document)); fail(); - }catch(ConflictingVersionException e){ + }catch(IllegalStateException e){ assertThat(e.getMessage(), containsString("Optimistic lock failed. Expected parent version 21, was 18")); } }