commit e2a59f4def4aa6c69436a81fc974ded5faba83b3
author Jian Li <pyguni@gmail.com> Wed May 18 15:15:53 2016 -0700
committer Jian Li <pyguni@gmail.com> Thu May 19 01:03:04 2016 +0000
tree 1a0c03d2657eb17bcade0843f168d63bee10afc3
parent 3276d1569a48a1112cc3e3cf073b6708b27b1f8b

Check TrafficTreatment and TrafficSelector in FlowRuleCodecTest

Change-Id: I1694dd9103899731c4e0fdbb1ee531ef36ed6a86

core/common/src/test/java/org/onosproject/codec/impl/TrafficTreatmentCodecTest.java

diff --git a/core/common/src/test/java/org/onosproject/codec/impl/TrafficTreatmentCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/TrafficTreatmentCodecTest.java
index f23e846..3a26a92 100644
--- a/core/common/src/test/java/org/onosproject/codec/impl/TrafficTreatmentCodecTest.java
+++ b/core/common/src/test/java/org/onosproject/codec/impl/TrafficTreatmentCodecTest.java
@@ -95,7 +95,7 @@
         assertThat(types.contains(insts.get(1).type().name()), is(true));
     }
 
-    private static final class TrafficTreatmentJsonMatcher
+    public static final class TrafficTreatmentJsonMatcher
             extends TypeSafeDiagnosingMatcher<JsonNode> {
 
         private final TrafficTreatment trafficTreatment;
@@ -163,19 +163,23 @@
             // check metered
             JsonNode meterNode = getInstNode(jsonInstructions, "METER");
             String jsonMeterId = meterNode != null ? meterNode.get("meterId").asText() : null;
-            String meterId = trafficTreatment.metered().meterId().toString();
-            if (!StringUtils.equals(jsonMeterId, meterId)) {
-                description.appendText("meter id was " + jsonMeterId);
-                return false;
+            if (trafficTreatment.metered() != null) {
+                String meterId = trafficTreatment.metered().meterId().toString();
+                if (!StringUtils.equals(jsonMeterId, meterId)) {
+                    description.appendText("meter id was " + jsonMeterId);
+                    return false;
+                }
             }
 
             // check table transition
             JsonNode tableNode = getInstNode(jsonInstructions, "TABLE");
             String jsonTableId = tableNode != null ? tableNode.get("tableId").asText() : null;
-            String tableId = trafficTreatment.tableTransition().tableId().toString();
-            if (!StringUtils.equals(jsonTableId, tableId)) {
-                description.appendText("table id was " + jsonMeterId);
-                return false;
+            if (trafficTreatment.tableTransition() != null) {
+                String tableId = trafficTreatment.tableTransition().tableId().toString();
+                if (!StringUtils.equals(jsonTableId, tableId)) {
+                    description.appendText("table id was " + jsonMeterId);
+                    return false;
+                }
             }
 
             // TODO: check deferred