Fix problems detected by the latest version of errorprone
Change-Id: I532d3627fa232e93ee6860bd10db64c99e78f915
diff --git a/utils/misc/src/test/java/org/onlab/graph/DisjointPathPairTest.java b/utils/misc/src/test/java/org/onlab/graph/DisjointPathPairTest.java
index 620fe40..7ab78c1 100644
--- a/utils/misc/src/test/java/org/onlab/graph/DisjointPathPairTest.java
+++ b/utils/misc/src/test/java/org/onlab/graph/DisjointPathPairTest.java
@@ -53,7 +53,8 @@
public void testSwappingPrimarySecondaryDoesntImpactEquality() {
new EqualsTester()
.addEqualityGroup(new DisjointPathPair<>(ABC, ADC),
- new DisjointPathPair<>(ADC, ABC));
+ new DisjointPathPair<>(ADC, ABC))
+ .testEquals();
}
}
diff --git a/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
index 672362f..59e24e5 100644
--- a/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
@@ -26,14 +26,16 @@
@Test
public void testEquality() {
VlanId vlan1 = VlanId.vlanId("None");
- VlanId vlan2 = VlanId.vlanId((short) -1);
+ VlanId vlan2 = VlanId.vlanId((short) -10);
VlanId vlan3 = VlanId.vlanId((short) 100);
- VlanId vlan4 = VlanId.vlanId((short) 100);
+ VlanId vlan4 = VlanId.vlanId((short) 200);
new EqualsTester().addEqualityGroup(VlanId.vlanId(), vlan1)
- .addEqualityGroup(vlan1, vlan2)
- .addEqualityGroup(vlan3, vlan4)
- .addEqualityGroup(VlanId.vlanId((short) 10));
+ .addEqualityGroup(vlan2)
+ .addEqualityGroup(vlan3)
+ .addEqualityGroup(vlan4)
+ .addEqualityGroup(VlanId.vlanId((short) 10))
+ .testEquals();
}
diff --git a/utils/misc/src/test/java/org/onlab/util/CounterTest.java b/utils/misc/src/test/java/org/onlab/util/CounterTest.java
index e62672d..491b632 100644
--- a/utils/misc/src/test/java/org/onlab/util/CounterTest.java
+++ b/utils/misc/src/test/java/org/onlab/util/CounterTest.java
@@ -96,7 +96,8 @@
.addEqualityGroup(tt, same)
.addEqualityGroup(400)
.addEqualityGroup("")
- .addEqualityGroup(diff);
+ .addEqualityGroup(diff)
+ .testEquals();
}