replaced 3 portscan testcases with 1 and avoided mocking

code/Test/test_PortscanAttack.py

@@ -1,15 +1,11 @@
-import unittest.mock as mock
-
 import Test.ID2TAttackTest as Test
 
 sha_portscan_default = '6af539fb9f9a28f84a5c337a07dbdc1a11885c5c6de8f9a682bd74b89edc5130'
 sha_portscan_reverse_ports = '1c03342b7b94fdd1c9903d07237bc5239ebb7bd77a3dd137c9c378fa216c5382'
 sha_portscan_shuffle_dst_ports = '40485e47766438425900b787c4cda4ad1b5cd0d233b80f38bd45b5a88b70a797'
 sha_portscan_shuffle_src_ports = '48578b45e18bdbdc0a9f3f4cec160ccb58839250348ec4d3ec44c1b15da248de'
-sha_portscan_mss_value_zero = '8d32476a89262b78118a68867fff1d45c81f8ffb4970201f9d5ee3dfd94ba58a'
-sha_portscan_ttl_value_zero = 'ff8cf15d8e59856e0c6e43d81fa40180ebf2127042f376217cc2a20e4f21726e'
-sha_portscan_win_value_zero = 'b2fcbf72190ac3bf12192d0d7ee8c09ef87adb0d94a2610615ca76d8b577bbfb'
 sha_portscan_ip_src_random = 'c3939f30a40fa6e2164cc91dc4a7e823ca409492d44508e3edfc9d24748af0e5'
+sha_portscan_ips_not_in_pcap = '7f0f65beb8398fc1abe65b0819b6e3a5ce143fd8c9eafb2d5498b84f21cec9e1'
 
 # TODO: improve coverage
 
@@ -28,14 +24,5 @@ class UnitTestPortscanAttack(Test.ID2TAttackTest):
     def test_portscan_shuffle_src_ports(self):
         self.checksum_test([['PortscanAttack', 'port.src.shuffle=1']], sha_portscan_shuffle_src_ports)
 
-    @mock.patch('ID2TLib.Statistics.Statistics.get_mss_distribution', return_value='')
-    def test_portscan_mss_length_zero(self, mock_mss_dis):
-        self.checksum_test([['PortscanAttack']], sha_portscan_mss_value_zero)
-
-    @mock.patch('ID2TLib.Statistics.Statistics.get_ttl_distribution', return_value='')
-    def test_portscan_ttl_length_zero(self, mock_ttl_dis):
-        self.checksum_test([['PortscanAttack']], sha_portscan_ttl_value_zero)
-
-    @mock.patch('ID2TLib.Statistics.Statistics.get_win_distribution', return_value='')
-    def test_portscan_win_length_zero(self, mock_win_dis):
-        self.checksum_test([['PortscanAttack']], sha_portscan_win_value_zero)
+    def test_portscan_ips_not_in_pcap(self):
+        self.checksum_test([['PortscanAttack', 'ip.src=1.1.1.1', 'ip.dst=2.2.2.2']], sha_portscan_ips_not_in_pcap)