Remove yang-test

[controller.git] / opendaylight / config / config-manager / src / test / java / org / opendaylight / controller / config / manager / impl / ConfigTransactionManagerImplTest.java

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 eaaee5eb5be5aa5d54d1525b11e101e6fa49ff92..ede2a805a8c0a2814fd1d027bd276a645503a4ac 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -7,27 +7,22 @@
  */
 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;
 
 public class ConfigTransactionManagerImplTest extends
-        AbstractConfigWithJolokiaTest {
+        AbstractConfigTest {
 
     @Before
     public void setUp() {
-        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver());
+        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext));
 
     }
 
@@ -37,7 +32,7 @@ public class ConfigTransactionManagerImplTest extends
         try {
             configRegistryJMXRegistrator.registerToJMX(mockedRegistry);
             fail();
-        } catch (Exception e) {
+        } catch (final InstanceAlreadyExistsException e) {
             assertTrue(e instanceof InstanceAlreadyExistsException);
         }
     }
@@ -54,24 +49,4 @@ public class ConfigTransactionManagerImplTest extends
                 .createTransaction();
         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();
-
-    }
 }