X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-test%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Ftest%2Fimpl%2FNetconfTestImplModuleTest.java;h=c48959bdd0dfd713f15df8d65cc8193502db3550;hp=680fe5048a8a23568a91df18571f7b84bada52cd;hb=db89afdefb3cfa4454dfdc6008e1d54d3ede66fb;hpb=919145b1bf7d68e436efa9b22c174965005a174a diff --git a/opendaylight/config/yang-test/src/test/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleTest.java b/opendaylight/config/yang-test/src/test/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleTest.java index 680fe5048a..c48959bdd0 100644 --- a/opendaylight/config/yang-test/src/test/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleTest.java +++ b/opendaylight/config/yang-test/src/test/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleTest.java @@ -8,11 +8,8 @@ package org.opendaylight.controller.config.yang.test.impl; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.mockito.Mockito.doReturn; - import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Collections; @@ -27,9 +24,9 @@ import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; import org.opendaylight.controller.config.manager.impl.AbstractConfigTest; import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver; import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; +import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.test.types.rev131127.TestIdentity1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.test.types.rev131127.TestIdentity2; -import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeContext; public class NetconfTestImplModuleTest extends AbstractConfigTest { @@ -40,8 +37,8 @@ public class NetconfTestImplModuleTest extends AbstractConfigTest { @Before public void setUp() { - factory = new NetconfTestImplModuleFactory(); - super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,factory, + this.factory = new NetconfTestImplModuleFactory(); + super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.mockedContext,this.factory, new DepTestImplModuleFactory(), new IdentityTestModuleFactory())); } @@ -55,10 +52,10 @@ public class NetconfTestImplModuleTest extends AbstractConfigTest { @Test public void testIdentities() throws Exception { - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); + final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction(); - ObjectName nameCreated = transaction.createModule(IdentityTestModuleFactory.NAME, instanceName); - IdentityTestModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, IdentityTestModuleMXBean.class); + final ObjectName nameCreated = transaction.createModule(IdentityTestModuleFactory.NAME, this.instanceName); + final IdentityTestModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, IdentityTestModuleMXBean.class); final IdentitiesContainer c = new IdentitiesContainer(); c.setAfi(new IdentityAttributeRef(TestIdentity2.QNAME.toString())); @@ -68,23 +65,23 @@ public class NetconfTestImplModuleTest extends AbstractConfigTest { @Test public void testDependencyList() throws Exception { - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); + ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction(); - ObjectName on = createInstance(transaction, instanceName, 4); + final ObjectName on = createInstance(transaction, this.instanceName, 4); transaction.validateConfig(); - CommitStatus status1 = transaction.commit(); + final CommitStatus status1 = transaction.commit(); - assertBeanCount(1, factory.getImplementationName()); + assertBeanCount(1, this.factory.getImplementationName()); assertBeanCount(4 + 1, DepTestImplModuleFactory.NAME); assertStatus(status1, 1 + 4 + 1, 0, 0); - transaction = configRegistryClient.createTransaction(); + transaction = this.configRegistryClient.createTransaction(); - NetconfTestImplModuleMXBean proxy = transaction.newMXBeanProxy(ObjectNameUtil.withoutTransactionName(on), + final NetconfTestImplModuleMXBean proxy = transaction.newMXBeanProxy(ObjectNameUtil.withoutTransactionName(on), NetconfTestImplModuleMXBean.class); proxy.getComplexList(); - List testingDeps = proxy.getTestingDeps(); - ObjectName testingDep = proxy.getTestingDep(); + final List testingDeps = proxy.getTestingDeps(); + final ObjectName testingDep = proxy.getTestingDep(); assertEquals(TESTING_DEP_PREFIX, ObjectNameUtil.getInstanceName(testingDep)); assertTestingDeps(testingDeps, 4); @@ -92,57 +89,50 @@ public class NetconfTestImplModuleTest extends AbstractConfigTest { transaction.abortConfig(); // check that reuse logic works - equals on list of dependencies. - transaction = configRegistryClient.createTransaction(); - CommitStatus status2 = transaction.commit(); + transaction = this.configRegistryClient.createTransaction(); + final CommitStatus status2 = transaction.commit(); assertStatus(status2, 0, 0, 6); // replace single dependency - transaction = configRegistryClient.createTransaction(); - String instanceName1 = TESTING_DEP_PREFIX + 1; + transaction = this.configRegistryClient.createTransaction(); + final String instanceName1 = TESTING_DEP_PREFIX + 1; transaction.destroyModule(DepTestImplModuleFactory.NAME, instanceName1); transaction.createModule(DepTestImplModuleFactory.NAME, instanceName1); - CommitStatus status3 = transaction.commit(); + final CommitStatus status3 = transaction.commit(); assertStatus(status3, 1, 1, 4); } @Test public void testNullCheckInListOfDependencies() throws Exception { - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); - - ObjectName on = createInstance(transaction, instanceName, 4); - NetconfTestImplModuleMXBean proxy = transaction.newMXBeanProxy(on, NetconfTestImplModuleMXBean.class); - try{ - proxy.setTestingDeps(null); - fail(); - }catch(RuntimeException e) { - Throwable cause = e.getCause(); - assertNotNull(cause); - assertTrue("Invalid type " + cause, cause instanceof IllegalArgumentException); - assertEquals("Null not supported", cause.getMessage()); - } + final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction(); + + final ObjectName on = createInstance(transaction, this.instanceName, 4); + final NetconfTestImplModuleMXBean proxy = transaction.newMXBeanProxy(on, NetconfTestImplModuleMXBean.class); + proxy.setTestingDeps(null); + assertTrue(proxy.getTestingDeps().isEmpty()); proxy.setTestingDeps(Collections.emptyList()); } - private void assertTestingDeps(List testingDeps, int i) { + private void assertTestingDeps(final List testingDeps, final int i) { assertEquals(i, testingDeps.size()); int c = 1; - for (ObjectName testingDep : testingDeps) { + for (final ObjectName testingDep : testingDeps) { assertEquals(TESTING_DEP_PREFIX + Integer.toString(c++), ObjectNameUtil.getInstanceName(testingDep)); } } - private ObjectName createInstance(ConfigTransactionJMXClient transaction, String instanceName, int depsCount) + private ObjectName createInstance(final ConfigTransactionJMXClient transaction, final String instanceName, final int depsCount) throws InstanceAlreadyExistsException { - ObjectName nameCreated = transaction.createModule(factory.getImplementationName(), instanceName); - NetconfTestImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, NetconfTestImplModuleMXBean.class); + final ObjectName nameCreated = transaction.createModule(this.factory.getImplementationName(), instanceName); + final NetconfTestImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, NetconfTestImplModuleMXBean.class); ObjectName dep = transaction.createModule(DepTestImplModuleFactory.NAME, TESTING_DEP_PREFIX); mxBean.setTestingDep(dep); - ArrayList testingDeps = Lists.newArrayList(); + final ArrayList testingDeps = Lists.newArrayList(); for (int i = 0; i < depsCount; i++) { dep = transaction.createModule(DepTestImplModuleFactory.NAME, TESTING_DEP_PREFIX + Integer.toString(i + 1)); testingDeps.add(dep);