X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Ftestingservices%2Fparallelapsp%2Ftest%2FDependentWiringTest.java;h=e6f54908643d17fe8f5206765327d6bf5dca79af;hp=f42b9559c4bb7e5a562aead7b7a60c0bc692602f;hb=f43b01b81319959b1907e3e04537f5169e7f33d8;hpb=027bc8f87341f432654c3aaa7771658c25d2ca7d

diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/DependentWiringTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/DependentWiringTest.java
index f42b9559c4..e6f5490864 100644
--- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/DependentWiringTest.java
+++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/DependentWiringTest.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,6 +7,14 @@
  */
 package org.opendaylight.controller.config.manager.testingservices.parallelapsp.test;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Map;
+import javax.management.ObjectName;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,29 +25,19 @@ import org.opendaylight.controller.config.manager.impl.factoriesresolver.Hardcod
 import org.opendaylight.controller.config.manager.testingservices.parallelapsp.TestingParallelAPSPConfigMXBean;
 import org.opendaylight.controller.config.manager.testingservices.parallelapsp.TestingParallelAPSPImpl;
 import org.opendaylight.controller.config.manager.testingservices.parallelapsp.TestingParallelAPSPModuleFactory;
+import org.opendaylight.controller.config.manager.testingservices.seviceinterface.TestingThreadPoolServiceInterface;
 import org.opendaylight.controller.config.manager.testingservices.threadpool.TestingFixedThreadPool;
 import org.opendaylight.controller.config.manager.testingservices.threadpool.TestingFixedThreadPoolConfigMXBean;
 import org.opendaylight.controller.config.manager.testingservices.threadpool.TestingFixedThreadPoolModuleFactory;
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
 
-import javax.management.ObjectName;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.internal.matchers.StringContains.containsString;
-
 public class DependentWiringTest extends AbstractParallelAPSPTest {
     private final String fixed1 = "fixed1";
-    private final String apsp1 = "apsp-parallel";
 
     @Before
     public void setUp() {
         super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,
-                new TestingFixedThreadPoolModuleFactory(),
-                new TestingParallelAPSPModuleFactory()));
+                new TestingFixedThreadPoolModuleFactory(), new TestingParallelAPSPModuleFactory()));
     }
 
     @After
@@ -56,29 +54,24 @@ public class DependentWiringTest extends AbstractParallelAPSPTest {
     public void testDependencies() throws Exception {
         ObjectName apspON;
         {
-            ConfigTransactionJMXClient transaction = configRegistryClient
-                    .createTransaction();
+            ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
             // create fixed1
             ObjectName threadPoolTransactionON = createFixed1(transaction,
                     TestingParallelAPSPImpl.MINIMAL_NUMBER_OF_THREADS);
             // create apsp-parallel
-            ObjectName apspNameTransactionON = createParallelAPSP(transaction,
-                    threadPoolTransactionON);
-            TestingParallelAPSPConfigMXBean parallelAPSPConfigProxy = transaction
-                    .newMXBeanProxy(apspNameTransactionON, TestingParallelAPSPConfigMXBean.class);
+            ObjectName apspNameTransactionON = createParallelAPSP(transaction, threadPoolTransactionON);
+            TestingParallelAPSPConfigMXBean parallelAPSPConfigProxy = transaction.newMXBeanProxy(apspNameTransactionON,
+                    TestingParallelAPSPConfigMXBean.class);
             parallelAPSPConfigProxy.setSomeParam("");// trigger validation
-                                                     // failure
+                                                        // failure
             try {
                 transaction.validateConfig();
                 fail();
-            } catch (ValidationException e) {
-                for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e
-                        .getFailedValidations().entrySet()) {
-                    for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception
-                            .getValue().entrySet()) {
-                        assertThat(
-                                entry.getValue().getMessage(),
-                                containsString("Parameter 'SomeParam' is blank"));
+            } catch (final ValidationException e) {
+                for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e.getFailedValidations()
+                        .entrySet()) {
+                    for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception.getValue().entrySet()) {
+                        assertThat(entry.getValue().getMessage(), containsString("Parameter 'SomeParam' is blank"));
                     }
                 }
             }
@@ -87,14 +80,12 @@ public class DependentWiringTest extends AbstractParallelAPSPTest {
             try {
                 transaction.commit();
                 fail();
-            } catch (ValidationException e) {
-                for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e
-                        .getFailedValidations().entrySet()) {
-                    for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception
-                            .getValue().entrySet()) {
+            } catch (final ValidationException e) {
+                for (Map.Entry<String, Map<String, ExceptionMessageWithStackTrace>> exception : e.getFailedValidations()
+                        .entrySet()) {
+                    for (Map.Entry<String, ExceptionMessageWithStackTrace> entry : exception.getValue().entrySet()) {
                         String err = entry.getValue().getMessage();
-                        assertTrue("Unexpected error message: " + err,
-                                err.contains("Parameter 'SomeParam' is blank"));
+                        assertTrue("Unexpected error message: " + err, err.contains("Parameter 'SomeParam' is blank"));
                     }
                 }
             }
@@ -102,34 +93,41 @@ public class DependentWiringTest extends AbstractParallelAPSPTest {
             parallelAPSPConfigProxy.setSomeParam("abc");// fix validation
                                                         // failure
             transaction.commit();
-            apspON = ObjectNameUtil
-                    .withoutTransactionName(apspNameTransactionON);
+            apspON = ObjectNameUtil.withoutTransactionName(apspNameTransactionON);
         }
 
         // test reported apsp number of threads
-        TestingParallelAPSPConfigMXBean parallelAPSPRuntimeProxy = configRegistryClient
-                .newMBeanProxy(apspON, TestingParallelAPSPConfigMXBean.class);
-        assertEquals(
-                (Integer) TestingParallelAPSPImpl.MINIMAL_NUMBER_OF_THREADS,
+        TestingParallelAPSPConfigMXBean parallelAPSPRuntimeProxy = configRegistryClient.newMXBeanProxy(apspON,
+                TestingParallelAPSPConfigMXBean.class);
+        assertEquals((Integer) TestingParallelAPSPImpl.MINIMAL_NUMBER_OF_THREADS,
                 parallelAPSPRuntimeProxy.getMaxNumberOfThreads());
 
         // next transaction - recreate new thread pool
         int newNumberOfThreads = TestingParallelAPSPImpl.MINIMAL_NUMBER_OF_THREADS * 2;
         {
             // start new transaction
-            ConfigTransactionJMXClient transaction = configRegistryClient
-                    .createTransaction();
-            ObjectName threadPoolNames_newTx = transaction.lookupConfigBean(
-                    getThreadPoolImplementationName(), fixed1);
+            ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
+            ObjectName threadPoolNamesNewTx =
+                    transaction.lookupConfigBean(getThreadPoolImplementationName(), fixed1);
             TestingFixedThreadPoolConfigMXBean fixedConfigTransactionProxy = transaction
-                    .newMXBeanProxy(threadPoolNames_newTx, TestingFixedThreadPoolConfigMXBean.class);
+                    .newMXBeanProxy(threadPoolNamesNewTx, TestingFixedThreadPoolConfigMXBean.class);
             fixedConfigTransactionProxy.setThreadCount(newNumberOfThreads);
 
             transaction.commit();
         }
         // new reference should be copied to apsp-parallel
-        assertEquals((Integer) newNumberOfThreads,
-                parallelAPSPRuntimeProxy.getMaxNumberOfThreads());
+        assertEquals((Integer) newNumberOfThreads, parallelAPSPRuntimeProxy.getMaxNumberOfThreads());
+    }
 
+    @Test
+    public void testUsingServiceReferences() throws Exception {
+        ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
+        ObjectName threadPoolON = createFixed1(transaction, 10);
+        transaction.lookupConfigBean(getThreadPoolImplementationName(), fixed1);
+        String refName = "ref";
+        ObjectName serviceReferenceON = transaction.saveServiceReference(TestingThreadPoolServiceInterface.QNAME,
+                refName, threadPoolON);
+        createParallelAPSP(transaction, serviceReferenceON);
+        transaction.commit();
     }
 }