[ONOS-3494] Add test case for TCPFlags Criterion

Change-Id: I2575e52dc316039e528ff6216cec7c1d3195fe81

@@ -28,92 +28,136 @@ public interface Criterion {
     enum Type {
     enum Type {
         /** Switch input port. */
         /** Switch input port. */
         IN_PORT,
         IN_PORT,
+
         /** Switch physical input port. */
         /** Switch physical input port. */
         IN_PHY_PORT,
         IN_PHY_PORT,
+
         /** Metadata passed between tables. */
         /** Metadata passed between tables. */
         METADATA,
         METADATA,
+
         /** Ethernet destination address. */
         /** Ethernet destination address. */
         ETH_DST,
         ETH_DST,
+
         /** Ethernet source address. */
         /** Ethernet source address. */
         ETH_SRC,
         ETH_SRC,
+
         /** Ethernet frame type. */
         /** Ethernet frame type. */
         ETH_TYPE,
         ETH_TYPE,
+
         /** VLAN id. */
         /** VLAN id. */
         VLAN_VID,
         VLAN_VID,
+
         /** VLAN priority. */
         /** VLAN priority. */
         VLAN_PCP,
         VLAN_PCP,
+
         /** IP DSCP (6 bits in ToS field). */
         /** IP DSCP (6 bits in ToS field). */
         IP_DSCP,
         IP_DSCP,
+
         /** IP ECN (2 bits in ToS field). */
         /** IP ECN (2 bits in ToS field). */
         IP_ECN,
         IP_ECN,
+
         /** IP protocol. */
         /** IP protocol. */
         IP_PROTO,
         IP_PROTO,
+
         /** IPv4 source address. */
         /** IPv4 source address. */
         IPV4_SRC,
         IPV4_SRC,
+
         /** IPv4 destination address. */
         /** IPv4 destination address. */
         IPV4_DST,
         IPV4_DST,
+
         /** TCP source port. */
         /** TCP source port. */
         TCP_SRC,
         TCP_SRC,
+
         /** TCP destination port. */
         /** TCP destination port. */
         TCP_DST,
         TCP_DST,
+
         /** UDP source port. */
         /** UDP source port. */
         UDP_SRC,
         UDP_SRC,
+
         /** UDP destination port. */
         /** UDP destination port. */
         UDP_DST,
         UDP_DST,
+
         /** SCTP source port. */
         /** SCTP source port. */
         SCTP_SRC,
         SCTP_SRC,
+
         /** SCTP destination port. */
         /** SCTP destination port. */
         SCTP_DST,
         SCTP_DST,
+
         /** ICMP type. */
         /** ICMP type. */
         ICMPV4_TYPE,
         ICMPV4_TYPE,
+
         /** ICMP code. */
         /** ICMP code. */
         ICMPV4_CODE,
         ICMPV4_CODE,
+
         /** ARP opcode. */
         /** ARP opcode. */
         ARP_OP,
         ARP_OP,
+
         /** ARP source IPv4 address. */
         /** ARP source IPv4 address. */
         ARP_SPA,
         ARP_SPA,
+
         /** ARP target IPv4 address. */
         /** ARP target IPv4 address. */
         ARP_TPA,
         ARP_TPA,
+
         /** ARP source hardware address. */
         /** ARP source hardware address. */
         ARP_SHA,
         ARP_SHA,
+
         /** ARP target hardware address. */
         /** ARP target hardware address. */
         ARP_THA,
         ARP_THA,
+
         /** IPv6 source address. */
         /** IPv6 source address. */
         IPV6_SRC,
         IPV6_SRC,
+
         /** IPv6 destination address. */
         /** IPv6 destination address. */
         IPV6_DST,
         IPV6_DST,
+
         /** IPv6 Flow Label. */
         /** IPv6 Flow Label. */
         IPV6_FLABEL,
         IPV6_FLABEL,
+
         /** ICMPv6 type. */
         /** ICMPv6 type. */
         ICMPV6_TYPE,
         ICMPV6_TYPE,
+
         /** ICMPv6 code. */
         /** ICMPv6 code. */
         ICMPV6_CODE,
         ICMPV6_CODE,
+
         /** Target address for ND. */
         /** Target address for ND. */
         IPV6_ND_TARGET,
         IPV6_ND_TARGET,
+
         /** Source link-layer for ND. */
         /** Source link-layer for ND. */
         IPV6_ND_SLL,
         IPV6_ND_SLL,
+
         /** Target link-layer for ND. */
         /** Target link-layer for ND. */
         IPV6_ND_TLL,
         IPV6_ND_TLL,
+
         /** MPLS label. */
         /** MPLS label. */
         MPLS_LABEL,
         MPLS_LABEL,
+
         /** MPLS TC. */
         /** MPLS TC. */
         MPLS_TC,
         MPLS_TC,
+
         /**  MPLS BoS bit. */
         /**  MPLS BoS bit. */
         MPLS_BOS,
         MPLS_BOS,
+
         /** PBB I-SID. */
         /** PBB I-SID. */
         PBB_ISID,
         PBB_ISID,
+
         /** Logical Port Metadata. */
         /** Logical Port Metadata. */
         TUNNEL_ID,
         TUNNEL_ID,
+
         /** IPv6 Extension Header pseudo-field. */
         /** IPv6 Extension Header pseudo-field. */
         IPV6_EXTHDR,
         IPV6_EXTHDR,
+
         /** Unassigned value: 40. */
         /** Unassigned value: 40. */
         UNASSIGNED_40,
         UNASSIGNED_40,
+
         /** PBB UCA header field. */
         /** PBB UCA header field. */
         PBB_UCA,
         PBB_UCA,
+
         /** TCP flags. */
         /** TCP flags. */
         TCP_FLAGS,
         TCP_FLAGS,
+
         /** Output port from action set metadata. */
         /** Output port from action set metadata. */
         ACTSET_OUTPUT,
         ACTSET_OUTPUT,
+
         /** Packet type value. */
         /** Packet type value. */
         PACKET_TYPE,
         PACKET_TYPE,
 
 
@@ -123,16 +167,17 @@ public interface Criterion {
         //
         //
         /** Optical channel signal ID (lambda). */
         /** Optical channel signal ID (lambda). */
         OCH_SIGID,
         OCH_SIGID,
+
         /** Optical channel signal type (fixed or flexible). */
         /** Optical channel signal type (fixed or flexible). */
         OCH_SIGTYPE,
         OCH_SIGTYPE,
+
         /** ODU (Optical channel Data Unit) signal ID. */
         /** ODU (Optical channel Data Unit) signal ID. */
         ODU_SIGID,
         ODU_SIGID,
+
         /** ODU (Optical channel Data Unit) signal type. */
         /** ODU (Optical channel Data Unit) signal type. */
         ODU_SIGTYPE,
         ODU_SIGTYPE,
 
 
-        /**
-         * An empty criterion.
-         */
+        /** An empty criterion. */
         DUMMY
         DUMMY
     }
     }
 
 
@@ -182,4 +227,41 @@ public interface Criterion {
             return this.value;
             return this.value;
         }
         }
     }
     }
+
+    enum TCPFlags {
+
+        /** ECN-nonce concealment protection. */
+        NS((short) (1 << 0)),
+        /** Congestion Window Reduced. */
+        CWR((short) (1 << 1)),
+        /** ECN-Echo. **/
+        ECE((short) (1 << 2)),
+        /** Urgent pointer field is significant. */
+        URG((short) (1 << 3)),
+        /** Acknowledgment field is significant. */
+        ACK((short) (1 << 4)),
+        /** Push the buffered data to the receiving application. */
+        PSH((short) (1 << 5)),
+        /** Reset the connection. */
+        RST((short) (1 << 6)),
+        /** Synchronize sequence numbers. */
+        SYN((short) (1 << 7)),
+        /** No more data from sender. */
+        FIN((short) (1 << 8));
+
+        private short value;
+
+        TCPFlags(short value) {
+            this.value = value;
+        }
+
+        /**
+         * Gets the value as an integer.
+         *
+         * @return the value as an integer
+         */
+        public short getValue() {
+            return this.value;
+        }
+    }
 }
 }

@@ -42,6 +42,7 @@ import org.onosproject.net.OduSignalType;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.PortNumber;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+
 /**
 /**
  * Unit tests for the Criteria class and its subclasses.
  * Unit tests for the Criteria class and its subclasses.
  */
  */
@@ -135,6 +136,24 @@ public class CriteriaTest {
     Criterion sameAsMatchUdpPort1 = Criteria.matchUdpSrc(tpPort1);
     Criterion sameAsMatchUdpPort1 = Criteria.matchUdpSrc(tpPort1);
     Criterion matchUdpPort2 = Criteria.matchUdpDst(tpPort2);
     Criterion matchUdpPort2 = Criteria.matchUdpDst(tpPort2);
 
 
+
+    int tcpFlags1 =
+        Criterion.TCPFlags.NS.getValue() |
+        Criterion.TCPFlags.CWR.getValue() |
+        Criterion.TCPFlags.ECE.getValue() |
+        Criterion.TCPFlags.URG.getValue() |
+        Criterion.TCPFlags.ACK.getValue() |
+        Criterion.TCPFlags.PSH.getValue() |
+        Criterion.TCPFlags.RST.getValue() |
+        Criterion.TCPFlags.SYN.getValue();
+
+    int tcpFlags2 = tcpFlags1 |
+        Criterion.TCPFlags.FIN.getValue();
+
+    Criterion matchTcpFlags1 = Criteria.matchTcpFlags(tcpFlags1);
+    Criterion sameAsmatchTcpFlags1 = Criteria.matchTcpFlags(tcpFlags1);
+    Criterion matchTcpFlags2 = Criteria.matchTcpFlags(tcpFlags2);
+
     Criterion matchSctpPort1 = Criteria.matchSctpSrc(tpPort1);
     Criterion matchSctpPort1 = Criteria.matchSctpSrc(tpPort1);
     Criterion sameAsMatchSctpPort1 = Criteria.matchSctpSrc(tpPort1);
     Criterion sameAsMatchSctpPort1 = Criteria.matchSctpSrc(tpPort1);
     Criterion matchSctpPort2 = Criteria.matchSctpDst(tpPort2);
     Criterion matchSctpPort2 = Criteria.matchSctpDst(tpPort2);
@@ -242,8 +261,8 @@ public class CriteriaTest {
     Criterion matchOchSignal2 =
     Criterion matchOchSignal2 =
             Criteria.matchLambda(Lambda.ochSignal(GridType.DWDM, ChannelSpacing.CHL_50GHZ, 4, 8));
             Criteria.matchLambda(Lambda.ochSignal(GridType.DWDM, ChannelSpacing.CHL_50GHZ, 4, 8));
 
 
-    final OduSignalId odu1 = oduSignalId(1, 80, new byte [] {1, 1, 2, 2, 1, 2, 2, 1, 2, 2});
-    final OduSignalId odu2 = oduSignalId(3, 8, new byte [] {1, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+    final OduSignalId odu1 = oduSignalId(1, 80, new byte[]{1, 1, 2, 2, 1, 2, 2, 1, 2, 2});
+    final OduSignalId odu2 = oduSignalId(3, 8, new byte[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0});
     Criterion matchOduSignalId1 = Criteria.matchOduSignalId(odu1);
     Criterion matchOduSignalId1 = Criteria.matchOduSignalId(odu1);
     Criterion sameAsMatchOduSignalId1 = Criteria.matchOduSignalId(odu1);
     Criterion sameAsMatchOduSignalId1 = Criteria.matchOduSignalId(odu1);
     Criterion matchOduSignalId2 = Criteria.matchOduSignalId(odu2);
     Criterion matchOduSignalId2 = Criteria.matchOduSignalId(odu2);
@@ -297,6 +316,7 @@ public class CriteriaTest {
         assertThatClassIsImmutable(IPCriterion.class);
         assertThatClassIsImmutable(IPCriterion.class);
         assertThatClassIsImmutable(TcpPortCriterion.class);
         assertThatClassIsImmutable(TcpPortCriterion.class);
         assertThatClassIsImmutable(UdpPortCriterion.class);
         assertThatClassIsImmutable(UdpPortCriterion.class);
+        assertThatClassIsImmutable(TcpFlagsCriterion.class);
         assertThatClassIsImmutable(SctpPortCriterion.class);
         assertThatClassIsImmutable(SctpPortCriterion.class);
         assertThatClassIsImmutable(IcmpTypeCriterion.class);
         assertThatClassIsImmutable(IcmpTypeCriterion.class);
         assertThatClassIsImmutable(IcmpCodeCriterion.class);
         assertThatClassIsImmutable(IcmpCodeCriterion.class);
@@ -729,6 +749,19 @@ public class CriteriaTest {
                 .testEquals();
                 .testEquals();
     }
     }
 
 
+    // TcpFlagsCriterion class
+
+    /**
+     * Test the equals() method of the TcpFlagsCriterion class.
+     */
+    @Test
+    public void testTcpFlagsCriterionEquals() {
+        new EqualsTester()
+                .addEqualityGroup(matchTcpFlags1, sameAsmatchTcpFlags1)
+                .addEqualityGroup(matchTcpFlags2)
+                .testEquals();
+    }
+
     // SctpPortCriterion class
     // SctpPortCriterion class
 
 
     /**
     /**