commit 1a15b063c70c3e7535e2e0d59d0f45fd69d90e57
author Aaron Kruglikov <aaron@onlab.us> Thu Jan 26 15:47:34 2017 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Jan 30 20:08:48 2017 +0000
tree b1082226817e594508aa30ba33c3ec86969f0c40
parent 05dcc21f6ce3c5abfeed3b9a8de9ab694886491e

Removing assert that will cause random failures and correcting range for mpls.

- fixes ONOS-5912

Change-Id: I870b5cec687470f43f9b44c4a9f650e4cb3ac9d5

core/net/src/test/java/org/onosproject/net/resource/impl/LabelAllocatorTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/resource/impl/LabelAllocatorTest.java b/core/net/src/test/java/org/onosproject/net/resource/impl/LabelAllocatorTest.java
index 4c47735..c05feca 100644
--- a/core/net/src/test/java/org/onosproject/net/resource/impl/LabelAllocatorTest.java
+++ b/core/net/src/test/java/org/onosproject/net/resource/impl/LabelAllocatorTest.java
@@ -43,7 +43,6 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
 import static org.onosproject.net.Link.Type.DIRECT;
@@ -218,7 +217,7 @@
         // value should not be a forbidden value
         Short value = Short.parseShort(id.toString());
         VlanId prevVlanId = VlanId.vlanId(value);
-        assertTrue(VlanId.NO_VID < prevVlanId.toShort() && prevVlanId.toShort() < VlanId.MAX_VLAN);
+        assertTrue(VlanId.NO_VID <= prevVlanId.toShort() && prevVlanId.toShort() <= VlanId.MAX_VLAN);
 
         allocation = this.allocator.assignLabelToLinks(
                 ImmutableSet.copyOf(links.subList(1, 2)),
@@ -229,8 +228,7 @@
         assertThat(id, instanceOf(VlanId.class));
         // value should not be a forbidden value
         VlanId vlanId = (VlanId) id;
-        assertTrue(VlanId.NO_VID < vlanId.toShort() && vlanId.toShort() < VlanId.MAX_VLAN);
-        assertNotEquals(vlanId, prevVlanId);
+        assertTrue(VlanId.NO_VID <= vlanId.toShort() && vlanId.toShort() <= VlanId.MAX_VLAN);
 
     }
 
@@ -252,7 +250,7 @@
         assertThat(id, instanceOf(MplsLabel.class));
         // value should not be a forbidden value
         MplsLabel prevMplsId = (MplsLabel) id;
-        assertTrue(0 < prevMplsId.toInt() && prevMplsId.toInt() < MplsLabel.MAX_MPLS);
+        assertTrue(0 <= prevMplsId.toInt() && prevMplsId.toInt() <= MplsLabel.MAX_MPLS);
 
         allocation = this.allocator.assignLabelToLinks(
                 ImmutableSet.copyOf(links.subList(1, 2)),
@@ -263,9 +261,7 @@
         assertThat(id, instanceOf(MplsLabel.class));
         // value should not be a forbidden value
         MplsLabel mplsId = (MplsLabel) id;
-        assertTrue(0 < mplsId.toInt() && mplsId.toInt() < MplsLabel.MAX_MPLS);
-        assertNotEquals(prevMplsId, mplsId);
-
+        assertTrue(0 <= mplsId.toInt() && mplsId.toInt() <= MplsLabel.MAX_MPLS);
     }
 
     /**