commit be539dbd88e7bf0203ddf9e78e21e837b681d8c9
author Ray Milkey <ray@onlab.us> Fri Sep 04 11:00:43 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 04 18:26:56 2015 +0000
tree 55f17806a6aa9c3e70085a9ac7a9cc3b3b736a34
parent b856b813b5a42f07fc1092781cf0f13e24ea41c0

JSON for flows should return the app name, not the app ID

Change-Id: I12d217b07bffb59615dfeefd40242f01669989c2

web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
index 9cb63e7..4fb5821 100644
--- a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
@@ -299,10 +299,12 @@
      */
     public static class FlowJsonMatcher extends TypeSafeMatcher<JsonObject> {
         private final FlowEntry flow;
+        private final String expectedAppId;
         private String reason = "";
 
-        public FlowJsonMatcher(FlowEntry flowValue) {
+        public FlowJsonMatcher(FlowEntry flowValue, String expectedAppIdValue) {
             flow = flowValue;
+            expectedAppId = expectedAppIdValue;
         }
 
         @Override
@@ -316,8 +318,8 @@
             }
 
             // check application id
-            final int jsonAppId = jsonFlow.get("appId").asInt();
-            if (jsonAppId != flow.appId()) {
+            final String jsonAppId = jsonFlow.get("appId").asString();
+            if (!jsonAppId.equals(expectedAppId)) {
                 reason = "appId " + Short.toString(flow.appId());
                 return false;
             }
@@ -399,8 +401,8 @@
      * @param flow flow object we are looking for
      * @return matcher
      */
-    private static FlowJsonMatcher matchesFlow(FlowEntry flow) {
-        return new FlowJsonMatcher(flow);
+    private static FlowJsonMatcher matchesFlow(FlowEntry flow, String expectedAppName) {
+        return new FlowJsonMatcher(flow, expectedAppName);
     }
 
     /**
@@ -430,7 +432,7 @@
                     flowFound = true;
 
                     //  We found the correct flow, check attribute values
-                    assertThat(jsonFlow, matchesFlow(flow));
+                    assertThat(jsonFlow, matchesFlow(flow, APP_ID.name()));
                 }
             }
             if (!flowFound) {