commit 436c60a1f65d3c7dbdbd664c7b0e65f5362ef24d
author Sean Condon <sean@opennetworking.org> Fri Jan 01 14:23:29 2021 +0000
committer Sean Condon <sean@opennetworking.org> Mon Jan 04 15:42:57 2021 +0000
tree 7c3a6ed46ce9fe3ae135275b6cb7043e54e20873
parent 5a936f5c8b5e47cbda9156ebddb6953feb9e6ca3

Upgraded to bazel 3.7.2 and rules_nodejs 2.3.2

Change-Id: If53686f2475c4f367909de577b4da95de8e16768

core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java b/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
index f5b26c2..9272668 100644
--- a/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
@@ -34,6 +34,7 @@
 import org.onosproject.net.mcast.McastRoute;
 import org.onosproject.store.service.TestStorageService;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static junit.framework.Assert.fail;
@@ -141,13 +142,13 @@
     private void validateEvents(McastEvent.Type... evs) {
         if (events.size() != evs.length) {
             fail(String.format("Mismatch number of events# obtained -> %s : expected %s",
-                               events, evs));
+                               events, Arrays.toString(evs)));
         }
 
         for (int i = 0; i < evs.length; i++) {
             if (evs[i] != events.get(i).type()) {
                 fail(String.format("Mismatched events# obtained -> %s : expected %s",
-                                   events, evs));
+                                   events, Arrays.toString(evs)));
             }
         }
     }

core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java b/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java
index ee27ef2..ce3584f 100644
--- a/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java
+++ b/core/net/src/test/java/org/onosproject/net/pi/impl/PiCriterionTranslatorsTest.java
@@ -319,7 +319,7 @@
 
     @Test
     public void testMplsCriterion() throws Exception {
-        MplsLabel mplsLabel = MplsLabel.mplsLabel(random.nextInt(2 ^ 20));
+        MplsLabel mplsLabel = MplsLabel.mplsLabel(random.nextInt(1 << 20));
         int bitWidth = 32;
 
         MplsCriterion criterion = (MplsCriterion) Criteria.matchMplsLabel(mplsLabel);
@@ -357,9 +357,9 @@
 
     @Test
     public void testSctpPortCriterion() throws Exception {
-        TpPort value1 = TpPort.tpPort(random.nextInt(2 ^ 16));
-        TpPort value2 = TpPort.tpPort(random.nextInt(2 ^ 16));
-        TpPort mask = TpPort.tpPort(random.nextInt(2 ^ 16));
+        TpPort value1 = TpPort.tpPort(random.nextInt(1 << 16));
+        TpPort value2 = TpPort.tpPort(random.nextInt(1 << 16));
+        TpPort mask = TpPort.tpPort(random.nextInt(1 << 16));
 
         int bitWidth = 16;
 
@@ -377,7 +377,7 @@
 
     @Test
     public void testTcpFlagsCriterion() throws Exception {
-        int pbbIsid = random.nextInt(2 ^ 12);
+        int pbbIsid = random.nextInt(1 << 12);
         int bitWidth = 12;
 
         TcpFlagsCriterion criterion = (TcpFlagsCriterion) Criteria.matchTcpFlags(pbbIsid);
@@ -389,9 +389,9 @@
 
     @Test
     public void testTcpPortCriterion() throws Exception {
-        TpPort value1 = TpPort.tpPort(random.nextInt(2 ^ 16));
-        TpPort value2 = TpPort.tpPort(random.nextInt(2 ^ 16));
-        TpPort mask = TpPort.tpPort(random.nextInt(2 ^ 16));
+        TpPort value1 = TpPort.tpPort(random.nextInt(1 << 16));
+        TpPort value2 = TpPort.tpPort(random.nextInt(1 << 16));
+        TpPort mask = TpPort.tpPort(random.nextInt(1 << 16));
 
         int bitWidth = 16;