updated for more test coverage

caronc · Jul 9, 2023 · 74a3a28 · 74a3a28
1 parent 7a9d055
commit 74a3a28
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/apprise/plugins/NotifyPushy.py b/apprise/plugins/NotifyPushy.py
@@ -43,8 +43,8 @@
 from ..AppriseLocale import gettext_lazy as _
 
 # Used to detect a Device and Topic
-VALIDATE_DEVICE = re.compile(r'^[@]?(?P<device>[a-z0-9]+)$', re.I)
-VALIDATE_TOPIC = re.compile(r'^#(?P<topic>[a-z0-9]+)$', re.I)
+VALIDATE_DEVICE = re.compile(r'^@(?P<device>[a-z0-9]+)$', re.I)
+VALIDATE_TOPIC = re.compile(r'^[#]?(?P<topic>[a-z0-9]+)$', re.I)
 
 # Extend HTTP Error Messages
 PUSHY_HTTP_ERROR_MAP = {
@@ -146,14 +146,14 @@ def __init__(self, apikey, targets=None, sound=None, badge=None, **kwargs):
         self.topics = []
 
         for target in parse_list(targets):
-            result = VALIDATE_DEVICE.match(target)
+            result = VALIDATE_TOPIC.match(target)
             if result:
-                self.devices.append(result.group('device'))
+                self.topics.append(result.group('topic'))
                 continue
 
-            result = VALIDATE_TOPIC.match(target)
+            result = VALIDATE_DEVICE.match(target)
             if result:
-                self.topics.append(result.group('topic'))
+                self.devices.append(result.group('device'))
                 continue
 
             self.logger.warning(

diff --git a/test/helpers/rest.py b/test/helpers/rest.py
@@ -332,9 +332,14 @@ def __notify(self, url, obj, meta, asset, mock_patch, mock_del, mock_put,
             requests_response_text = dumps(requests_response_text)
             requests_response_content = requests_response_text.encode('utf-8')
 
+        else:
+            requests_response_content = u''
+            requests_response_text = ''
+
         # A request
         robj = mock.Mock()
         robj.content = u''
+        robj.text = ''
         mock_get.return_value = robj
         mock_post.return_value = robj
         mock_head.return_value = robj

diff --git a/test/test_plugin_pushy.py b/test/test_plugin_pushy.py
@@ -60,16 +60,38 @@
         # to actually notify anything if no device_key was specified
         'notify_response': False,
         'requests_response_text': GOOD_RESPONSE,
-
     }),
-    ('pushy://apikey/device', {
+    ('pushy://apikey/topic', {
+        # No Device/Topic specified
+        'instance': NotifyPushy,
+        # Expected notify() response False because the success flag
+        # was set to false
+        'notify_response': False,
+        'requests_response_text': {'success': False}
+    }),
+    ('pushy://apikey/%20(', {
+        # Invalid topic specified
+        'instance': NotifyPushy,
+        # Expected notify() response False because there is no one to notify
+        'notify_response': False,
+        'requests_response_text': GOOD_RESPONSE,
+    }),
+    ('pushy://apikey/@device', {
         # Everything is okay
         'instance': NotifyPushy,
         'requests_response_text': GOOD_RESPONSE,
 
         # Our expected url(privacy=True) startswith() response:
         'privacy_url': 'pushy://a...y/@device/',
     }),
+    ('pushy://apikey/topic', {
+        # Everything is okay; no prefix means it's a topic
+        'instance': NotifyPushy,
+        'requests_response_text': GOOD_RESPONSE,
+
+        # Our expected url(privacy=True) startswith() response:
+        'privacy_url': 'pushy://a...y/#topic/',
+    }),
     ('pushy://apikey/device/?sound=alarm.aiff', {
         # alarm.aiff sound loaded
         'instance': NotifyPushy,
@@ -95,7 +117,7 @@
         'instance': NotifyPushy,
         'requests_response_text': GOOD_RESPONSE,
     }),
-    ('pushy://apikey/?to=device', {
+    ('pushy://apikey/?to=@device', {
         # test use of to= argument
         'instance': NotifyPushy,
         'requests_response_text': GOOD_RESPONSE,