Improve extracting ids from URLs, tests

tests/test_cli.py

@@ -51,6 +51,17 @@ def test_args_search_mode(argparser):
     assert args == Namespace(**want_args)
 
 
+def test_args_search_mode_several_usernames(argparser):
+    args = argparser.parse_args('username1 username2'.split())
+
+    assert args.username == ['username1', 'username2']
+
+    want_args = dict(DEFAULT_ARGS)
+    want_args.update({'username': ['username1', 'username2']})
+
+    assert args == Namespace(**want_args)
+
+
 def test_args_self_check_mode(argparser):
     args = argparser.parse_args('--self-check --site GitHub'.split())
 
@@ -59,7 +70,7 @@ def test_args_self_check_mode(argparser):
         {
             'self_check': True,
             'site_list': ['GitHub'],
-            'username': [None],
+            'username': [],
         }
     )
 

tests/test_maigret.py

@@ -5,7 +5,8 @@ import copy
 import pytest
 from mock import Mock
 
-from maigret.maigret import self_check, maigret, extract_ids_from_page, extract_ids_from_results
+from maigret.maigret import self_check, maigret
+from maigret.maigret import extract_ids_from_page, extract_ids_from_results, extract_ids_from_url
 from maigret.sites import MaigretSite
 from maigret.result import QueryResult, QueryStatus
 
@@ -137,11 +138,18 @@ def test_maigret_results(test_db):
     assert results == RESULTS_EXAMPLE
 
 
+def test_extract_ids_from_url(default_db):
+    assert extract_ids_from_url('https://www.reddit.com/user/test', default_db) == {'test': 'username'}
+    assert extract_ids_from_url('https://vk.com/id123', default_db) == {'123': 'vk_id'}
+    assert extract_ids_from_url('https://vk.com/ida123', default_db) == {'ida123': 'username'}
+    assert extract_ids_from_url('https://my.mail.ru/yandex.ru/dipres8904/', default_db) == {'dipres8904': 'username'}
+    assert extract_ids_from_url('https://reviews.yandex.ru/user/adbced123', default_db) == {'adbced123': 'yandex_public_id'}
+
+
 @pytest.mark.slow
 def test_extract_ids_from_page(test_db):
     logger = Mock()
-    found_ids = extract_ids_from_page('https://www.reddit.com/user/test', logger)
-    assert found_ids == {'test': 'username'}
+    extract_ids_from_page('https://www.reddit.com/user/test', logger) == {'test': 'username'}
 
 
 def test_extract_ids_from_results(test_db):
@@ -149,5 +157,4 @@ def test_extract_ids_from_results(test_db):
     TEST_EXAMPLE['Reddit']['ids_usernames'] = {'test1': 'yandex_public_id'}
     TEST_EXAMPLE['Reddit']['ids_links'] = ['https://www.reddit.com/user/test2']
 
-    found_ids = extract_ids_from_results(TEST_EXAMPLE, test_db)
-    assert found_ids == {'test1': 'yandex_public_id', 'test2': 'username'}
+    extract_ids_from_results(TEST_EXAMPLE, test_db) == {'test1': 'yandex_public_id', 'test2': 'username'}

tests/test_notify.py

@@ -0,0 +1,49 @@
+from maigret.errors import CheckError
+from maigret.notify import QueryNotifyPrint
+from maigret.result import QueryStatus, QueryResult
+
+
+def test_notify_illegal():
+    n = QueryNotifyPrint(color=False)
+
+    assert n.update(QueryResult(
+        username="test",
+        status=QueryStatus.ILLEGAL,
+        site_name="TEST_SITE",
+        site_url_user="http://example.com/test"
+    )) == "[-] TEST_SITE: Illegal Username Format For This Site!"
+
+
+def test_notify_claimed():
+    n = QueryNotifyPrint(color=False)
+
+    assert n.update(QueryResult(
+        username="test",
+        status=QueryStatus.CLAIMED,
+        site_name="TEST_SITE",
+        site_url_user="http://example.com/test"
+    )) == "[+] TEST_SITE: http://example.com/test"
+
+
+def test_notify_available():
+    n = QueryNotifyPrint(color=False)
+
+    assert n.update(QueryResult(
+        username="test",
+        status=QueryStatus.AVAILABLE,
+        site_name="TEST_SITE",
+        site_url_user="http://example.com/test"
+    )) == "[-] TEST_SITE: Not found!"
+
+
+def test_notify_unknown():
+    n = QueryNotifyPrint(color=False)
+    result = QueryResult(
+        username="test",
+        status=QueryStatus.UNKNOWN,
+        site_name="TEST_SITE",
+        site_url_user="http://example.com/test"
+    )
+    result.error = CheckError('Type', 'Reason')
+
+    assert n.update(result) == "[?] TEST_SITE: Type error: Reason"

tests/test_utils.py

@@ -68,8 +68,10 @@ def test_url_extract_main_part():
     ]
 
     url_regexp = re.compile('^https?://(www.)?flickr.com/photos/(.+?)$')
+    # combine parts variations
     for url_parts in itertools.product(*parts):
         url = ''.join(url_parts)
+        # ensure all combinations give valid main part
         assert URLMatcher.extract_main_part(url) == url_main_part
         assert not url_regexp.match(url) is None
 
@@ -84,8 +86,10 @@ def test_url_make_profile_url_regexp():
         ['/', ''],
     ]
 
+    # combine parts variations
     for url_parts in itertools.product(*parts):
         url = ''.join(url_parts)
+        # ensure all combinations match pattern
         assert (
             URLMatcher.make_profile_url_regexp(url).pattern
             == r'^https?://(www.)?flickr\.com/photos/(.+?)$'