Jian Li

[ONOS-3480] Add test case for MplsTc Criterion

* Also add missing test case of the matchTCPFlags method

Change-Id: Ic7bad1d1c47427c5964a72d946650459c6187a48
...@@ -222,6 +222,12 @@ public class CriteriaTest { ...@@ -222,6 +222,12 @@ public class CriteriaTest {
222 Criterion sameAsMatchMpls1 = Criteria.matchMplsLabel(mpls1); 222 Criterion sameAsMatchMpls1 = Criteria.matchMplsLabel(mpls1);
223 Criterion matchMpls2 = Criteria.matchMplsLabel(mpls2); 223 Criterion matchMpls2 = Criteria.matchMplsLabel(mpls2);
224 224
225 + byte mplsTc1 = 1;
226 + byte mplsTc2 = 2;
227 + Criterion matchMplsTc1 = Criteria.matchMplsTc(mplsTc1);
228 + Criterion sameAsMatchMplsTc1 = Criteria.matchMplsTc(mplsTc1);
229 + Criterion matchMplsTc2 = Criteria.matchMplsTc(mplsTc2);
230 +
225 long tunnelId1 = 1; 231 long tunnelId1 = 1;
226 long tunnelId2 = 2; 232 long tunnelId2 = 2;
227 Criterion matchTunnelId1 = Criteria.matchTunnelId(tunnelId1); 233 Criterion matchTunnelId1 = Criteria.matchTunnelId(tunnelId1);
...@@ -326,6 +332,7 @@ public class CriteriaTest { ...@@ -326,6 +332,7 @@ public class CriteriaTest {
326 assertThatClassIsImmutable(IPv6NDTargetAddressCriterion.class); 332 assertThatClassIsImmutable(IPv6NDTargetAddressCriterion.class);
327 assertThatClassIsImmutable(IPv6NDLinkLayerAddressCriterion.class); 333 assertThatClassIsImmutable(IPv6NDLinkLayerAddressCriterion.class);
328 assertThatClassIsImmutable(MplsCriterion.class); 334 assertThatClassIsImmutable(MplsCriterion.class);
335 + assertThatClassIsImmutable(MplsTcCriterion.class);
329 assertThatClassIsImmutable(IPv6ExthdrFlagsCriterion.class); 336 assertThatClassIsImmutable(IPv6ExthdrFlagsCriterion.class);
330 assertThatClassIsImmutable(LambdaCriterion.class); 337 assertThatClassIsImmutable(LambdaCriterion.class);
331 assertThatClassIsImmutable(OduSignalIdCriterion.class); 338 assertThatClassIsImmutable(OduSignalIdCriterion.class);
...@@ -752,6 +759,19 @@ public class CriteriaTest { ...@@ -752,6 +759,19 @@ public class CriteriaTest {
752 // TcpFlagsCriterion class 759 // TcpFlagsCriterion class
753 760
754 /** 761 /**
762 + * Test the matchTcpFlags method.
763 + */
764 + @Test
765 + public void testMatchTcpFlagsMethod() {
766 + Criterion matchTcpFlag = Criteria.matchTcpFlags(tcpFlags1);
767 + TcpFlagsCriterion tcpFlagsCriterion =
768 + checkAndConvert(matchTcpFlag,
769 + Criterion.Type.TCP_FLAGS,
770 + TcpFlagsCriterion.class);
771 + assertThat(tcpFlagsCriterion.flags(), is(equalTo(tcpFlags1)));
772 + }
773 +
774 + /**
755 * Test the equals() method of the TcpFlagsCriterion class. 775 * Test the equals() method of the TcpFlagsCriterion class.
756 */ 776 */
757 @Test 777 @Test
...@@ -1037,6 +1057,32 @@ public class CriteriaTest { ...@@ -1037,6 +1057,32 @@ public class CriteriaTest {
1037 .testEquals(); 1057 .testEquals();
1038 } 1058 }
1039 1059
1060 + // MplsTcCriterion class
1061 +
1062 + /**
1063 + * Test the matchMplsTc method.
1064 + */
1065 + @Test
1066 + public void testMatchMplsTcMethod() {
1067 + Criterion matchMplsTc = Criteria.matchMplsTc(mplsTc1);
1068 + MplsTcCriterion mplsTcCriterion =
1069 + checkAndConvert(matchMplsTc,
1070 + Criterion.Type.MPLS_TC,
1071 + MplsTcCriterion.class);
1072 + assertThat(mplsTcCriterion.tc(), is(equalTo(mplsTc1)));
1073 + }
1074 +
1075 + /**
1076 + * Test the equals() method of the MplsTcCriterion class.
1077 + */
1078 + @Test
1079 + public void testMplsTcCriterionEquals() {
1080 + new EqualsTester()
1081 + .addEqualityGroup(matchMplsTc1, sameAsMatchMplsTc1)
1082 + .addEqualityGroup(matchMplsTc2)
1083 + .testEquals();
1084 + }
1085 +
1040 // TunnelIdCriterion class 1086 // TunnelIdCriterion class
1041 1087
1042 /** 1088 /**
......