Add more unit tests for control plane manager

- Add unit test for ControlMessageMetricMapper
- Add unit test for ControlMessageManager

Change-Id: I83e2eda8ca5ed3dabae2fb262a20b7d45de4c75d
diff --git a/apps/cpman/app/src/test/java/org/onosproject/cpman/impl/ControlPlaneManagerTest.java b/apps/cpman/app/src/test/java/org/onosproject/cpman/impl/ControlPlaneManagerTest.java
index bb9e844..cb666c2 100644
--- a/apps/cpman/app/src/test/java/org/onosproject/cpman/impl/ControlPlaneManagerTest.java
+++ b/apps/cpman/app/src/test/java/org/onosproject/cpman/impl/ControlPlaneManagerTest.java
@@ -15,6 +15,8 @@
  */
 package org.onosproject.cpman.impl;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.onosproject.core.CoreServiceAdapter;
 import org.onosproject.cpman.impl.message.ControlMessageServiceAdaptor;
@@ -30,7 +32,7 @@
     /**
      * Sets up the services required by the CPMan application.
      */
-    //@Before
+    @Before
     public void setUp() {
         cpMan = new ControlPlaneManager();
         cpMan.coreService = new CoreServiceAdapter();
@@ -42,7 +44,7 @@
     /**
      * Tears down the CPMan application.
      */
-    //@After
+    @After
     public void tearDown() {
         cpMan.deactivate();
     }