Merge "Fix Connection manager to retrieve inventory when is up"

[controller.git] / opendaylight / sal / api / src / test / java / org / opendaylight / controller / sal / match / MatchTest.java

diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java
index 5dcb898dfbb9db5e4420e0cafa06b8977979d8af..f3c7a95b0ebcdfb44a5de81e8a5509572827d2f6 100644 (file)
--- a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java
+++ b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java
@@ -565,8 +565,9 @@ public class MatchTest {
         Assert.assertTrue(((InetAddress)i.getField(MatchType.NW_SRC).getValue()).equals(ip2));
         Assert.assertTrue(((InetAddress)i.getField(MatchType.NW_SRC).getMask()).equals(ipm2));
 
+        // Empty set
         i = m2.getIntersection(m3);
-        Assert.assertTrue(i.getMatches() == 0);
+        Assert.assertNull(i);
 
         Match m4 = new Match();
         m4.setField(MatchType.DL_TYPE, ethType);
@@ -608,9 +609,12 @@ public class MatchTest {
         Assert.assertTrue(m6.intersetcs(m6));
         Assert.assertTrue(m6.getIntersection(m6).equals(m6));
 
-        // Empty match, represents the empty set
-        Match o = new Match();
-        Assert.assertTrue(m6.getIntersection(o).equals(o));
-        Assert.assertTrue(o.getIntersection(m6).equals(o));
+        // Empty match, represents the universal set (all packets)
+        Match u = new Match();
+        Assert.assertTrue(m6.getIntersection(u).equals(m6));
+        Assert.assertTrue(u.getIntersection(m6).equals(m6));
+
+        // No intersection with null match, empty set
+        Assert.assertNull(m6.getIntersection(null));
     }
 }