upd test coverage

README.rst

@@ -13,6 +13,11 @@
     :alt: Code Climate
 
 
+.. image:: https://codeclimate.com/github/foxmask/django-th/badges/coverage.svg
+   :target: https://codeclimate.com/github/foxmask/django-th/coverage
+   :alt: Test Coverage
+
+
 .. image:: https://scrutinizer-ci.com/g/foxmask/django-th/badges/quality-score.png?b=master
    :target: https://scrutinizer-ci.com/g/foxmask/django-th/?branch=master
    :alt: Scrutinizer Code Quality

th_instapush/my_instapush.py

@@ -1,10 +1,6 @@
 # coding: utf-8
 from instapush import Instapush, App
 
-# django classes
-from logging import getLogger
-
-# django_th classes
 from django_th.services.services import ServicesMgr
 from th_instapush.models import Instapush as InstapushModel
 
@@ -19,8 +15,6 @@
     )
 """
 
-logger = getLogger('django_th.trigger_happy')
-
 
 class ServiceInstapush(ServicesMgr):
     """
@@ -43,7 +37,7 @@ def read_data(self, **kwargs):
 
             :rtype: list
         """
-        pass
+        return {}
 
     def save_data(self, trigger_id, **data):
         """

th_instapush/tests.py

@@ -1,6 +1,6 @@
 # coding: utf-8
-from unittest.mock import MagicMock
-
+from unittest.mock import patch
+from instapush import App
 from django_th.tests.test_main import MainTest
 
 from th_instapush.models import Instapush as InstapushModel
@@ -69,15 +69,19 @@ def test_read_data(self):
         """
         kwargs = {}
         se = ServiceInstapush()
-        se.read_data(**kwargs)
+        res = se.read_data(**kwargs)
+        self.assertTrue(type(res) is dict)
 
-    def test_save_data(self):
+    @patch.object(App, 'notify')
+    def test_save_data(self, mock1):
         """
            Test if the creation of the Instapush object looks fine
         """
         self.create_instapush()
         data = {'title': 'foo', 'content': 'bar'}
-        self.service.save_data = MagicMock(name='save_data')
-        the_return = self.service.save_data(self.trigger_id, **data)
+        se = ServiceInstapush(self.token)
+        the_return = se.save_data(self.trigger_id, **data)
+        mock1.assert_called_once_with(event_name='signups',
+                                      trackers={'email': data['content']})
 
         self.assertTrue(the_return)

th_todoist/my_todoist.py

@@ -105,8 +105,7 @@ def save_data(self, trigger_id, **data):
                                                                **data)
 
         if self.token:
-            if title or content or \
-                            (data.get('link') and len(data.get('link'))) > 0:
+            if title or content or data.get('link'):
                 content = title + ' ' + content + ' ' + data.get('link')
 
                 self.todoist.add_item(content)

th_todoist/tests.py

@@ -94,8 +94,31 @@ def test_save_data(self):
                 'title': 'what else',
                 'content': 'foobar'}
         content = data['title'] + ' ' + data['content'] + ' ' + data['link']
-        print(content)
         with patch.object(TodoistAPI, 'add_item') as mock_save_data:
             se = ServiceTodoist(self.token)
             se.save_data(self.trigger_id, **data)
         mock_save_data.assert_called_once_with(content)
+
+    def test_save_data2(self):
+        """
+           data is empty
+        """
+        self.create_todoist()
+        data = {'link': '',
+                'title': '',
+                'content': ''}
+        se = ServiceTodoist(self.token)
+        res = se.save_data(self.trigger_id, **data)
+        self.assertFalse(res)
+
+    def test_save_data3(self):
+        """
+           token is empty
+        """
+        data = {'link': '',
+                'title': '',
+                'content': ''}
+        self.token = ''
+        se = ServiceTodoist(self.token)
+        res = se.save_data(self.trigger_id, **data)
+        self.assertFalse(res)

th_tumblr/my_tumblr.py

@@ -67,6 +67,7 @@ def read_data(self, **kwargs):
         trigger_id = kwargs.get('trigger_id')
         data = list()
         cache.set('th_tumblr_' + str(trigger_id), data)
+        return data
 
     def save_data(self, trigger_id, **data):
         """

th_tumblr/tests.py

@@ -2,10 +2,14 @@
 from django.test import TestCase
 from django.conf import settings
 from django.contrib.auth.models import User
-from th_tumblr.models import Tumblr
 from django_th.models import TriggerService, UserService, ServicesActivated
+from th_tumblr.models import Tumblr
+from th_tumblr.my_tumblr import ServiceTumblr
 from th_tumblr.forms import TumblrProviderForm, TumblrConsumerForm
 
+from pytumblr import TumblrRestClient
+from unittest.mock import patch
+
 
 class TumblrTest(TestCase):
 
@@ -111,3 +115,35 @@ def test_get_config_th(self):
             does this settings exists ?
         """
         self.assertTrue(settings.TH_TUMBLR_KEY)
+
+
+class ServiceTumblrTest(TumblrTest):
+
+    def setUp(self):
+        super(ServiceTumblrTest, self).setUp()
+        self.data = {'title': 'a title post', 'content': 'content of the post'}
+        self.token = 'QWERTY123#TH#12345'
+        self.trigger_id = 1
+        self.service = ServiceTumblr(self.token)
+
+    def test_read_data(self):
+        t = self.create_tumblr()
+        kwargs = dict({'date_triggered': '2013-05-11 13:23:58+00:00',
+                       'model_name': 'Tumblr',
+                       'trigger_id': t.trigger_id})
+        self.token = '123#TH#truc'
+        se = ServiceTumblr(self.token)
+        res = se.read_data(**kwargs)
+        self.assertTrue(type(res) is list)
+
+    @patch.object(TumblrRestClient, 'create_text')
+    def test_save_data(self, mock1):
+        t = self.create_tumblr()
+
+        se = ServiceTumblr(self.token)
+        se.save_data(self.trigger_id, **self.data)
+        mock1.assert_called_with(blogname=t.blogname,
+                                 title=self.data['title'],
+                                 body=self.data['content'],
+                                 state='published',
+                                 tags=t.tag)

th_twitter/my_twitter.py

@@ -336,7 +336,4 @@ def set_twitter_content(self, content):
         """
         content = html.strip_tags(content)
 
-        if len(content) > 140:
-            return content[:140]
-
-        return content
+        return content[:140] if len(content) > 140 else content

th_twitter/tests.py

@@ -92,13 +92,10 @@ def setUp(self):
         self.trigger_id = 1
         self.service = ServiceTwitter(self.token)
 
-    @patch.object(Twython, 'search')
-    def test_read_data_tag(self, mock1):
-        t = self.create_twitter(tag='twitter', screen='', fav=False)
-        search = {'count': 100,
-                  'q': 'twitter',
-                  'result_type': 'recent',
-                  'since_id': 1}
+    @patch.object(Twython, 'get_user_timeline')
+    def test_read_data_screen(self, mock1):
+        search = {'count': 200, 'screen_name': 'johndoe', 'since_id': 1}
+        t = self.create_twitter(tag='', screen='johndoe', fav=False)
         kwargs = dict({'date_triggered': '2013-05-11 13:23:58+00:00',
                        'model_name': 'Twitter',
                        'trigger_id': t.trigger_id})
@@ -107,10 +104,23 @@ def test_read_data_tag(self, mock1):
         se.read_data(**kwargs)
         mock1.assert_called_with(**search)
 
-    @patch.object(Twython, 'get_user_timeline')
-    def test_read_data_screen(self, mock1):
-        search = {'count': 200, 'screen_name': 'johndoe', 'since_id': 1}
-        t = self.create_twitter(tag='', screen='johndoe', fav=False)
+    @patch.object(Twython, 'get_favorites')
+    def test_read_data_fav(self, mock1):
+        search = {'count': 20, 'screen_name': 'johndoe', 'since_id': 1}
+        t = self.create_twitter(tag='', screen='johndoe', fav=True)
+        kwargs = dict({'date_triggered': '2013-05-11 13:23:58+00:00',
+                       'model_name': 'Twitter',
+                       'trigger_id': t.trigger_id})
+
+        se = ServiceTwitter(self.token)
+        se.read_data(**kwargs)
+        mock1.assert_called_with(**search)
+
+    @patch.object(Twython, 'search')
+    def test_read_data_tag(self, mock1):
+        search = {'count': 100, 'result_type': 'recent', 'since_id': 1,
+                  'q': 'foobar'}
+        t = self.create_twitter(tag='foobar', screen='johndoe', fav=False)
         kwargs = dict({'date_triggered': '2013-05-11 13:23:58+00:00',
                        'model_name': 'Twitter',
                        'trigger_id': t.trigger_id})
@@ -125,13 +135,38 @@ def test_save_data(self, mock1):
         token = self.token
         trigger_id = self.trigger_id
 
+        self.data['title'] = 'Toot from'
+        self.data['link'] = 'http://domain.ltd'
+
+        content = str("{title} {link}").format(
+            title=self.data.get('title'),
+            link=self.data.get('link'))
+        content += ' #twitter'
+        self.data['content'] = content
+
+        self.assertTrue(token)
+        self.assertTrue(isinstance(trigger_id, int))
+        self.assertIn('text', self.data)
+        self.assertNotEqual(self.data['text'], '')
+
+        se = ServiceTwitter(self.token)
+        se.save_data(trigger_id, **self.data)
+        mock1.assert_called_with(status=content)
+
+    @patch.object(Twython, 'update_status')
+    def test_save_data2(self, mock1):
+        self.create_twitter()
+        token = self.token
+        trigger_id = self.trigger_id
+
         self.data['title'] = 'a title'
         self.data['link'] = 'http://domain.ltd'
 
         content = str("{title} {link}").format(
             title=self.data.get('title'),
             link=self.data.get('link'))
         content += ' #twitter'
+        self.data['content'] = content
 
         self.assertTrue(token)
         self.assertTrue(isinstance(trigger_id, int))
@@ -140,4 +175,21 @@ def test_save_data(self, mock1):
 
         se = ServiceTwitter(self.token)
         se.save_data(trigger_id, **self.data)
-        mock1.assert_called_once_with(status=content)
+        mock1.assert_called_with(status=content)
+
+    @patch.object(Twython, 'get_authorized_tokens')
+    def test_get_access_token(self, mock1):
+        self.create_twitter(tag='twitter', screen='', fav=False)
+        oauth_token = 'truc'
+        oauth_token_secret = 'secret'
+        oauth_verifier = 'verifier'
+        se = ServiceTwitter(self.token)
+        se.get_access_token(oauth_token, oauth_token_secret,
+                            oauth_verifier)
+        mock1.assert_called_with(oauth_verifier)
+
+    def test_auth(self):
+        pass
+
+    def test_callback(self):
+        pass