additional tests, so all named queries are covered

code/Test/test_NamedQueries.py

@@ -13,6 +13,20 @@ allWinSize = [0, 822, 1330, 5082, 8192, 9900, 27060, 35657, 39917, 47030, 50782,
               63400, 63409, 63456, 63516, 63547, 63552, 63572, 63603, 63628, 63655, 63663, 63675, 63686, 63706, 63839,
               63842, 63886, 63893, 63917, 63954, 63963, 63982, 63991, 64000, 64005, 64088, 64110, 64148, 64165, 64177,
               64189, 64194, 64198, 64209, 64230, 64240, 65535]
+leastUsedWinASize = [822, 1330, 5082, 9900, 27060, 35657, 39917, 47030, 50782, 51310, 52202, 52740, 55062, 56492, 58520,
+                     59950, 59980, 61380, 63056, 63963, 63982, 64000, 64005, 64198, 64230]
+allPort = [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 UnitTestPyparsing(unittest.TestCase):
     def test_named_query(self):
         self.assertEqual(controller.statistics.process_db_query('least_used(portnumber)'),
@@ -63,5 +77,24 @@ class UnitTestPyparsing(unittest.TestCase):
                          ['A', 'A-private', 'B', 'C', 'C-private'])
         self.assertEqual(controller.statistics.process_db_query('all(winSize)'),
                          allWinSize)
-        self.assertEqual(controller.statistics.process_db_query('least_used(ipClass)'),
-                         ['A-private', 'C', 'C-private'])
+        self.assertEqual(controller.statistics.process_db_query('most_used(ipaddress)'),
+                         '10.0.2.15')
+        self.assertEqual(controller.statistics.process_db_query('most_used(macaddress)'),
+                         '52:54:00:12:35:02')
+        self.assertEqual(controller.statistics.process_db_query('least_used(ipaddress)'),
+                         '72.247.178.113')
+        self.assertEqual(controller.statistics.process_db_query('least_used(macaddress)'),
+                         '08:00:27:a3:83:43')
+        self.assertEqual(controller.statistics.process_db_query('least_used(winsize)'),
+                         leastUsedWinASize)
+        self.assertEqual(controller.statistics.process_db_query('all(macaddress)'),
+                         ['08:00:27:a3:83:43', '52:54:00:12:35:02'])
+        self.assertEqual(controller.statistics.process_db_query('all(ttlvalue)'),
+                         [64, 128, 255])
+        self.assertEqual(controller.statistics.process_db_query('all(mss)'),
+                         1460)
+        self.assertEqual(controller.statistics.process_db_query('all(portnumber)'),
+                         allPort)
+        self.assertEqual(controller.statistics.process_db_query('all(protocolname)'),
+                         ['IPv4', 'TCP', 'UDP'])
+