commit 4fd3ceb3df8b2ef29bad140f020d60fe93a37345
author Ray Milkey <ray@onlab.us> Thu Dec 10 14:43:08 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 17 17:39:44 2015 +0000
tree 2095d2c8a1fd2065c3a766dd7c8dfa0e72a650fa
parent baf705480d10f522eeee303bb1d3a3f83cdc0523

[Falcon] fixes for Sonar Critical bugs

Change-Id: I0a63578727693a2517f3002bd4f4c391b6f44aea

apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java

diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
index 4736aa1..1265cc1 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
@@ -216,7 +216,7 @@
         // Compose a intent, which is equal to intent5 but the id is different.
         MultiPointToSinglePointIntent intent5New =
                 staticIntentBuilder(intent5, routeEntry5, "00:00:00:00:00:01");
-        assertThat(IntentUtils.equals(intent5, intent5New), is(true));
+        assertThat(IntentUtils.intentsAreEqual(intent5, intent5New), is(true));
         assertFalse(intent5.equals(intent5New));
 
         MultiPointToSinglePointIntent intent6 = intentBuilder(

apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java

diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
index 4df7f9d..da17c78 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
@@ -84,7 +84,7 @@
             Intent providedIntent = (Intent) object;
             providedString = providedIntent.toString();
 
-            return IntentUtils.equals(intent, providedIntent);
+            return IntentUtils.intentsAreEqual(intent, providedIntent);
         }
     }