Tests: add testcase to check isUserBanned

Author: ananthanandanan

tests/test_twitter_bot.py

@@ -29,7 +29,7 @@ def tearDown(self):     ## destroy(destructor of object)
     def test_relevant(self):
 
         search_list = ['#netsec', '#DNS', '#DANE', '#DNSSEC', '#QUIC', '#TCP/UDP', '#BGP', '#Routing', '#IP', '#IPv4', '#IPv6'
-                       , '#SNI', '#HTTP/0.9', '#HTTP0.9', '#HTTP2', '#HTTP/2', '#HTTP3', '#HTTP/3', '#TLS', '#TCP', '#UDP']
+                    , '#SNI', '#HTTP/0.9', '#HTTP0.9', '#HTTP2', '#HTTP/2', '#HTTP3', '#HTTP/3', '#TLS', '#TCP', '#UDP']
 
         tweet_text1 = "iPhone SE delivery times suggest supply has caught up with demand https://t.co/yXoEdrLx5X TLS News"
         self.assertEqual(self.tw1.nawab_check_relevant(search_list,tweet_text1),1)
@@ -45,8 +45,8 @@ def test_check_id(self):
     def test_isUserBanned(self):
 
         """ Check for Banned user"""
-        self.assertEqual(self.tw1.isUserBanned("Ananthan2k","Ananthan2k"),True)
-        self.assertEqual(self.tw1.isUserBanned("Pornhub","Ananthan2k"),False)
+        self.assertEqual(self.tw1.isUserBanned("Ananthan2k","Ananthan2k"),False)
+        self.assertEqual(self.tw1.isUserBanned("freeman","jumbo_lane"),True)
 
     def test_isSafeword(self):
 

twitter_bot.py

@@ -90,15 +90,15 @@ def __isUserwhitelisted(self, userName):
             return True
         return False
 
-    def __isUserBanned(self, userName, admin_user):
+    def isUserBanned(self, userName, admin_user):
         """
         Search if the Blacklisted user is in file,and blacklist the bot's account
         """
         if not any((str(acc["Blacklist"]).lower() == userName.lower()) or (admin_user.lower() == userName.lower()) for index, acc in self.data.iterrows()):
             return True
         return False
 
-    def __isSafeKeyword(self, tweetText):
+    def isSafeKeyword(self, tweetText):
         """
         Search if tweettext is safe
         """ 
@@ -129,7 +129,7 @@ def nawab_find_prev_date(self):
                 break
         return previous_date
 
-    def __nawab_check_relevant(self, query, text):
+    def nawab_check_relevant(self, query, text):
         """
         check for count of keywords in text
         """
@@ -140,7 +140,7 @@ def __nawab_check_relevant(self, query, text):
                 cnt += text.count(key)
         return cnt
 
-    def __nawab_check_tweet(self, tweet_id):
+    def nawab_check_tweet(self, tweet_id):
         """
         Check if current tweet id is in tid_store or not
         """
@@ -179,13 +179,13 @@ def nawab_search(self, api, query):
                         ## minimum no of keywords required
                         min_freq = 2
 
-                        if (self.__nawab_check_tweet(id)) and ('RT @' in text):
+                        if (self.nawab_check_tweet(id)) and ('RT @' in text):
                             self.nawab_log(str(id) + ' already exists in the database or it is a retweet', 'error', 'Twitter_Bot ')
                         else:
-                            if (self.__isUserwhitelisted(user) or (self.__isUserBanned(user, admin_user) and self.__isSafeKeyword(text))):
-                                if not (self.__nawab_check_tweet(id)):
+                            if (self.__isUserwhitelisted(user) or (self.isUserBanned(user, admin_user) and self.isSafeKeyword(text))):
+                                if not (self.nawab_check_tweet(id)):
                                     ##check if it is a relevant tweet
-                                    if self.__nawab_check_relevant(query, text) >= min_freq:
+                                    if self.nawab_check_relevant(query, text) >= min_freq:
                                         self.nawab_log('Id: ' + str(id) + 'is a relevant tweet and is  stored to the db from this iteration', 'info', 'Twitter_Bot ')
                                         self.nawab_store_id(id, True)
                                     else: