X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FConfigTransactionManagerImplTest.java;h=9595e60ff64ccc325f7d8079cd64fd51ba26ed3c;hb=5109d42de3cfd06bb3834b7f6fc9e4ab6e8bb3d2;hp=eaaee5eb5be5aa5d54d1525b11e101e6fa49ff92;hpb=9fb64948564e252018f9b1e13e7cea2c92f991aa;p=controller.git diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java index eaaee5eb5b..9595e60ff6 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java @@ -7,27 +7,23 @@ */ package org.opendaylight.controller.config.manager.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; - -import javax.management.InstanceAlreadyExistsException; - import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; -import org.opendaylight.controller.config.api.jmx.constants.ConfigRegistryConstants; import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver; import org.opendaylight.controller.config.util.ConfigTransactionJMXClient; -import org.opendaylight.controller.config.util.jolokia.ConfigTransactionJolokiaClient; + +import javax.management.InstanceAlreadyExistsException; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; public class ConfigTransactionManagerImplTest extends - AbstractConfigWithJolokiaTest { + AbstractConfigTest { @Before public void setUp() { - super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver()); + super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext)); } @@ -55,23 +51,4 @@ public class ConfigTransactionManagerImplTest extends transaction.commit(); } - @Test - public void testRemoteCallsUsingJolokia() throws Exception { - - ConfigTransactionJolokiaClient transactionClient = configRegistryJolokiaClient - .createTransaction(); - - assertEquals("ConfigTransaction-0-1", - ObjectNameUtil.getTransactionName(transactionClient - .getTransactionON())); - - assertEquals( - ConfigRegistryConstants.ON_DOMAIN - + ":TransactionName=ConfigTransaction-0-1,type=ConfigTransaction", - transactionClient.getTransactionON().getCanonicalName()); - - // commit - transactionClient.commit(); - - } }