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=1e650c08b124a460c7d19f65200c1b0868ccee17;hp=a063f5786a8f4796d95023849fbc6243e873fa01;hb=d5702150e612565cd091f184064f017bc4cc3971;hpb=92f1fd15e99ce5b9e52612c0b52f70cd661b99cc 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 a063f5786a..1e650c08b1 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 @@ -8,14 +8,12 @@ package org.opendaylight.controller.netconf.confignetconfconnector.osgi; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; + import com.google.common.collect.Maps; import com.google.common.collect.Sets; -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; import java.net.URI; import java.text.ParseException; @@ -24,9 +22,12 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; +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; public class NetconfOperationServiceImplTest { @@ -72,15 +73,15 @@ public class NetconfOperationServiceImplTest { Assert.assertThat( message, JUnitMatchers - .containsString("missing from config subsystem but present in yangstore: [(namespace?revision=1970-01-01)qname2]")); + .containsString("missing from config subsystem but present in yangstore: [(namespace?revision=1970-01-01)qname2]")); Assert.assertThat( message, JUnitMatchers - .containsString("All modules present in config: [(namespace?revision=1970-01-01)qname1]")); + .containsString("All modules present in config: [(namespace?revision=1970-01-01)qname1]")); } } - private YangStoreSnapshot mockYangStoreSnapshot(String... qnames) { + private YangStoreSnapshot mockYangStoreSnapshot(final String... qnames) { YangStoreSnapshot mock = mock(YangStoreSnapshot.class); Map> map = Maps.newHashMap(); @@ -99,18 +100,18 @@ public class NetconfOperationServiceImplTest { return mock; } - private ModuleMXBeanEntry mockMBeanEntry(String qname) { + private ModuleMXBeanEntry mockMBeanEntry(final String qname) { ModuleMXBeanEntry mock = mock(ModuleMXBeanEntry.class); QName q = getQName(qname); doReturn(q).when(mock).getYangModuleQName(); return mock; } - private QName getQName(String qname) { - return new QName(URI.create("namespace"), date1970_01_01, qname); + private QName getQName(final String qname) { + return QName.create(URI.create("namespace"), date1970_01_01, qname); } - private LookupRegistry mockJmxClient(String... visibleQNames) { + private LookupRegistry mockJmxClient(final String... visibleQNames) { LookupRegistry mock = mock(LookupRegistry.class); Set qnames = Sets.newHashSet(); for (String visibleQName : visibleQNames) {