finished some TODOs in query tests

code/Test/test_Queries.py

@@ -1,16 +1,15 @@
 import unittest
 
-from definitions import ROOT_DIR
+import definitions as defs
+import random as rand
 import ID2TLib.Controller as Ctrl
 
-
-pcap = ROOT_DIR + "/../resources/test/reference_1998.pcap"
+pcap = defs.ROOT_DIR + "/../resources/test/reference_1998.pcap"
 
 controller = Ctrl.Controller(pcap_file_path=pcap, do_extra_tests=False)
 controller.load_pcap_statistics(flag_write_file=False, flag_recalculate_stats=True, flag_print_statistics=False)
 
-
-file_information = [('Pcap file', ROOT_DIR + '/../resources/test/reference_1998.pcap'),
+file_information = [('Pcap file', defs.ROOT_DIR + '/../resources/test/reference_1998.pcap'),
                     ('Packets', 1998, 'packets'), ('Capture length', '25.4294414520264', 'seconds'),
                     ('Capture start', '1970-01-01 01:01:45.647675'), ('Capture end', '1970-01-01 01:08:10.102034')]
 
@@ -18,12 +17,22 @@ file_statistics = [('Avg. packet rate', 78.57034301757812, 'packets/sec'), ('Avg
                    ('Avg. packets sent', 90.0, 'packets'), ('Avg. bandwidth in', 9.5290, 'kbit/s'),
                    ('Avg. bandwidth out', 9.5290, 'kbit/s')]
 
-# FIXME: currently sorted ascending
-ip_addresses = ["10.0.2.15", "104.83.103.45", "13.107.21.200", "131.253.61.100","172.217.23.142",
+ip_addresses = ["10.0.2.15", "104.83.103.45", "13.107.21.200", "131.253.61.100", "172.217.23.142",
                 "172.217.23.174", "192.168.33.254", "204.79.197.200", "23.51.123.27", "35.161.3.50",
                 "52.11.17.245", "52.34.37.177", "52.39.210.199", "52.41.250.141", "52.85.173.182",
                 "54.149.74.139", "54.187.98.195", "54.192.44.108", "54.192.44.177", "72.247.178.113",
                 "72.247.178.67", "93.184.220.29"]
+ports = [53, 80, 443, 49157, 49160, 49163, 49164, 49165, 49166, 49167, 49168, 49169, 49170, 49171, 49172, 49173, 49174,
+         49175, 49176, 49177, 49178, 49179, 49180, 49181, 49182, 49183, 49184, 49185, 49186, 49187, 49188, 49189, 49190,
+         49191, 49192, 49193, 49194, 49195, 49196, 49197, 49247, 49323, 49470, 49636, 49695, 49798, 49927, 49935, 49945,
+         50262, 50836, 50968, 51143, 51166, 51350, 51451, 51669, 51713, 52033, 52135, 52399, 52520, 52644, 52697, 52743,
+         52786, 52964, 52981, 53059, 53234, 53461, 53691, 53708, 53745, 53836, 54049, 54446, 54593, 54598, 54652, 54663,
+         54717, 54853, 54930, 55004, 55018, 55119, 55125, 55299, 55310, 55463, 55650, 55667, 55752, 55843, 55851, 56146,
+         56325, 56567, 56589, 56750, 57049, 57179, 57275, 57520, 57653, 57840, 57957, 57991, 58401, 58440, 58645, 58797,
+         58814, 58905, 58913, 58943, 59380, 59408, 59461, 59467, 59652, 59660, 59718, 59746, 59844, 60006, 60209, 60414,
+         60422, 60659, 60696, 60708, 60756, 60827, 60840, 61181, 61300, 61592, 61718, 61738, 61769, 61807, 62412, 62428,
+         62447, 62490, 62625, 62626, 62664, 63425, 64096, 64121, 64137, 64252, 64334, 64337, 64479, 64509, 64637, 64807,
+         64811, 65448, 65487]
 
 
 class TestQueries(unittest.TestCase):
@@ -78,10 +87,6 @@ class TestQueries(unittest.TestCase):
     def test_get_win_distribution_1(self):
         self.assertEqual(controller.statistics.get_win_distribution(ipAddress='72.247.178.67'), {65535: 5})
 
-    # TODO: get win_distribution for this ip
-    #def test_get_win_distribution_2(self):
-    #    self.assertEqual(controller.statistics.get_win_distribution(ipAddress='10.0.2.15'),'')
-
     def test_get_tos_distribution_1(self):
         self.assertEqual(controller.statistics.get_tos_distribution(ipAddress='72.247.178.67'), {0: 5})
 
@@ -94,10 +99,14 @@ class TestQueries(unittest.TestCase):
     def test_get_ip_addresses(self):
         self.assertEqual(controller.statistics.get_ip_addresses(), ip_addresses)
 
-    # TODO: move random outside of query and use seed to test
-    #def test_get_random_ip_address(self):
+    # TODO: move random for count = 1 outside of query and use seed to test
+    # def test_get_random_ip_address(self):
     #    self.assertEqual(controller.statistics.get_random_ip_address(), '')
 
+    def test_get_random_ip_address_count_2(self):
+        rand.seed(5)
+        self.assertEqual(controller.statistics.get_random_ip_address(2), ['72.247.178.113', '23.51.123.27'])
+
     def test_get_mac_address_1(self):
         self.assertEqual(controller.statistics.get_mac_address(ipAddress='72.247.178.67'), '52:54:00:12:35:02')
 
@@ -123,16 +132,16 @@ class TestQueries(unittest.TestCase):
         self.assertEqual(controller.statistics.calculate_standard_deviation([1, 1, 2, 3, 5, 8, 13, 21]),
                          6.609652033201143)
 
-    def test_calculate_entropy_unnormalized(self):
+    def test_calculate_entropy(self):
         self.assertEqual(controller.statistics.calculate_entropy([1, 1, 2, 3, 5, 8, 13, 21]), 2.371389165297016)
 
     def test_calculate_entropy_normalized(self):
         self.assertEqual(controller.statistics.calculate_entropy([1, 1, 2, 3, 5, 8, 13, 21], normalized=True),
-                                                                (2.371389165297016, 0.7904630550990053))
+                         (2.371389165297016, 0.7904630550990053))
 
     # TODO: get complement packet rates and a reasonable pps
-    #def test_calculate_complement_packet_rates(self):
-    #    self.assertEqual(controller.statistics.calculate_complement_packet_rates(42), '')
+    # def test_calculate_complement_packet_rates(self):
+    #    self.assertEqual(controller.statistics.calculate_complement_packet_rates(0), '')
 
     # NAMED QUERY TESTS
     def test_most_used_ipaddress(self):
@@ -204,10 +213,8 @@ class TestQueries(unittest.TestCase):
     def test_all_macaddress(self):
         self.assertEqual(controller.statistics.process_db_query('all(macaddress)'), ['08:00:27:a3:83:43',
                                                                                      '52:54:00:12:35:02'])
-
-    # TODO: get list of ports
-    #def test_all_portnumber(self):
-    #    self.assertEqual(controller.statistics.process_db_query('all(portnumber)'), '')
+    def test_all_portnumber(self):
+        self.assertEqual(controller.statistics.process_db_query('all(portnumber)'), ports)
 
     def test_all_protocolname(self):
         self.assertEqual(controller.statistics.process_db_query('all(protocolname)'), ['IPv4', 'TCP', 'UDP'])