修改：适配24.08版本知识库库表结构变化24.08

1 files changed, 26 insertions, 5 deletions

diff --git a/test/test_knowledgebase_monitor.py b/test/test_knowledgebase_monitor.py
index 8aa0297..1e76070 100644
--- a/test/test_knowledgebase_monitor.py
+++ b/test/test_knowledgebase_monitor.py
@@ -8,7 +8,7 @@
 import unittest
 
 from Config import Config
-from monitor.knowlegebase_monitor import KnowledgeBaseMonitor
+from knowledgebase_monitor import KnowledgeBaseMonitor
 
 class TestKnowledgeMonitor(unittest.TestCase):
     def setUp(self):
@@ -17,17 +17,17 @@ class TestKnowledgeMonitor(unittest.TestCase):
 
     def test_get_knowledgebase(self):
         self.assertEqual(self.knowledge_monitor.get_vpn_count(
-            vpn_service='protonvpn', start_t='2024-01-30 00:00:00',
+            plugin_name='protonvpn', start_t='2024-01-30 00:00:00',
             end_t='2024-01-31 00:00:00', timezone_gap_hour=0, node_type='ip', mode='new'),
             53655)
 
         self.assertEqual(self.knowledge_monitor.get_vpn_count(
-            vpn_service='protonvpn', start_t='2024-01-30 00:00:00',
+            plugin_name='protonvpn', start_t='2024-01-30 00:00:00',
             end_t='2024-01-31 00:00:00', timezone_gap_hour=0, node_type='ip', mode='active'),
             53675)
 
         self.assertEqual(self.knowledge_monitor.get_vpn_count(
-            vpn_service='ivacyvpn', start_t='2024-01-15 00:00:00',
+            plugin_name='ivacyvpn', start_t='2024-01-15 00:00:00',
             end_t='2024-01-31 00:00:00', timezone_gap_hour=0, node_type='domain', mode='new'),
             162)
 
@@ -53,4 +53,25 @@ class TestKnowledgeMonitor(unittest.TestCase):
         self.assertEqual(self.knowledge_monitor.get_vpn_count(node_type='domain', mode='active', start_t='2024-01-18 00:00:00'), 48396)
 
 
-
+    def test_get_vpn_count(self):
+        # self.assertEqual(self.knowledge_monitor.get_vpn_count(source_name='protonvpn', start_t='2024-01-30 00:00:00',
+        #     end_t='2024-01-31 00:00:00', timezone_gap_hour=0, node_type='ip', mode='new'), 0)
+
+        self.assertEqual(self.knowledge_monitor.get_vpn_count(plugin_name='windscribevpn', start_t='2024-01-15 00:00:00',
+                                                              end_t='2024-05-31 00:00:00', timezone_gap_hour=0, node_type='domain', mode='active'), 1031)
+
+        # # time gap test
+        # self.assertEqual(self.knowledge_monitor.get_vpn_count(start_t='2024-01-31 00:00:00',
+        #     end_t='2024-01-31 08:00:00', timezone_gap_hour=0, node_type='domain', mode='active'), 1041)
+        #
+        # self.assertEqual(self.knowledge_monitor.get_vpn_count(start_t='2024-01-30 21:00:00',
+        #     end_t='2024-01-31 05:00:00', timezone_gap_hour=3, node_type='domain', mode='active'), 1041)
+        #
+        # self.assertEqual(self.knowledge_monitor.get_vpn_count(start_t='2024-01-31 03:00:00',
+        #     end_t='2024-01-31 11:00:00', timezone_gap_hour=-3, node_type='domain', mode='active'), 1041)
+        #
+        # # all domains
+        # self.assertEqual(self.knowledge_monitor.get_vpn_count(node_type='domain'), 71622)
+        #
+        # # all active domains after '2024-01-18 00:00:00'
+        # self.assertEqual(self.knowledge_monitor.get_vpn_count(node_type='domain', mode='active', start_t='2024-01-18 00:00:00'), 48396)