X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fosgi%2FNetconfOperationServiceImplTest.java;h=413aa5cc6787cb77e28e9274b1d51d8a3ebd012a;hp=1e650c08b124a460c7d19f65200c1b0868ccee17;hb=940603a5319c9a0eff30e92f2dc83817974d7f78;hpb=c1362c86eb19e92e6c64d10099a45deb499c6db1 diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java index 1e650c08b1..413aa5cc67 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java @@ -14,17 +14,15 @@ import static org.mockito.Mockito.mock; import com.google.common.collect.Maps; import com.google.common.collect.Sets; - import java.net.URI; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; import java.util.Set; - +import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; -import org.junit.matchers.JUnitMatchers; import org.opendaylight.controller.config.api.LookupRegistry; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.yangtools.yang.common.QName; @@ -72,11 +70,11 @@ public class NetconfOperationServiceImplTest { String message = e.getMessage(); Assert.assertThat( message, - JUnitMatchers + CoreMatchers .containsString("missing from config subsystem but present in yangstore: [(namespace?revision=1970-01-01)qname2]")); Assert.assertThat( message, - JUnitMatchers + CoreMatchers .containsString("All modules present in config: [(namespace?revision=1970-01-01)qname1]")); } }