commit 1a42469471d2c0b25bf02341a2fb85f8e2324a4c
author Jian Li <pyguni@gmail.com> Wed Feb 03 16:21:18 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 17 01:24:04 2016 +0000
tree 84e2b76f5e2b5a996c45c9c7f4dc68149597e031
parent f53d0b2d1e29c0843e49f9dae955920d5c15ca6e

Refactor SystemInfo, and store SystemInfo into singleton instance

- Implement Bill Pugh singleton for ControlMetricsFactory and
  SystemInfo class

Change-Id: Ia97538d9f1be9ea900b0e87371bf50877eaf6483

apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java

diff --git a/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java b/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java
index 6fd8770..ac84e1d 100644
--- a/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java
+++ b/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsCollectorResourceTest.java
@@ -27,6 +27,8 @@
 import org.onlab.osgi.TestServiceDirectory;
 import org.onlab.rest.BaseResource;
 import org.onosproject.cpman.ControlPlaneMonitorService;
+import org.onosproject.cpman.SystemInfo;
+import org.onosproject.cpman.impl.SystemInfoFactory;
 import org.onosproject.net.DeviceId;
 
 import javax.ws.rs.core.MediaType;
@@ -123,8 +125,14 @@
     }
 
     @Test
-    public void testSystemSpecsPost() {
-        basePostTest("system-spec-post.json", PREFIX + "/system_specs");
+    public void testSystemInfoPost() {
+        basePostTest("system-info-post.json", PREFIX + "/system_info");
+
+        SystemInfo si = SystemInfoFactory.getInstance().getSystemInfo();
+        assertThat(si.cpuSpeed(), is(2048));
+        assertThat(si.coreCount(), is(6));
+        assertThat(si.cpuCount(), is(2));
+        assertThat(si.totalMemory(), is(4096));
     }
 
     private ClientResponse baseTest(String jsonFile, String path) {