Refactor test cases for utils: check that ParameterMissing is re-reaised.

1 files changed, 23 insertions, 16 deletions

diff --git a/tests/test_pydora/test_utils.py b/tests/test_pydora/test_utils.py
index 8298e28..64cdf74 100644
--- a/tests/test_pydora/test_utils.py
+++ b/tests/test_pydora/test_utils.py
@@ -1,32 +1,39 @@
 from unittest import TestCase
-from pandora import errors
 
 from pandora.client import APIClient
-from pandora.errors import InvalidAuthToken
-from pandora.models.pandora import Station, AdItem
+from pandora.errors import InvalidAuthToken, ParameterMissing
+from pandora.models.pandora import Station, AdItem, PlaylistItem
 from pandora.py2compat import Mock, patch
 from pydora.utils import iterate_forever
-from tests.test_pandora.test_models import TestAdItem
 
 
 class TestIterateForever(TestCase):
 
     def setUp(self):
-        transport = Mock(side_effect=[InvalidAuthToken(), None])
-        client = APIClient(transport, None, None, None, None)
-        client._authenticate = Mock()
-        self.result = AdItem.from_json(client, TestAdItem.JSON_DATA)
+        self.transport = Mock(side_effect=[InvalidAuthToken(), None])
+        self.client = APIClient(self.transport, None, None, None, None)
+        self.client._authenticate = Mock()
 
     def test_handle_missing_params_exception_due_to_missing_ad_tokens(self):
-        with patch.object(APIClient, 'register_ad', side_effect=errors.ParameterMissing("ParameterMissing")):
+        with patch.object(APIClient, 'get_playlist') as get_playlist_mock:
+            with patch.object(APIClient, 'register_ad', side_effect=ParameterMissing("ParameterMissing")):
 
-            station = Mock(spec=Station)
-            station.token = 'mock_token'
+                station = Station.from_json(self.client, {'stationToken': 'dummy_token'})
+                dummy_ad = AdItem.from_json(self.client, {'station_id': 'dummy_id'})
+                get_playlist_mock.return_value=iter([dummy_ad])
 
-            self.result.tracking_tokens = []
+                station_iter = iterate_forever(station.get_playlist)
 
-            station.get_playlist.return_value = iter([self.result])
-            station_iter = iterate_forever(station.get_playlist)
+                next_track = station_iter.next()
+                self.assertEqual(dummy_ad, next_track)
 
-            next_track = station_iter.next()
-            self.assertEqual(self.result, next_track)
+    def test_reraise_missing_params_exception(self):
+        with patch.object(APIClient, 'get_playlist', side_effect=ParameterMissing("ParameterMissing")) as get_playlist_mock:
+                with self.assertRaises(ParameterMissing):
+
+                    station = Station.from_json(self.client, {'stationToken': 'dummy_token'})
+                    dummy_track = PlaylistItem.from_json(self.client, {'token': 'dummy_token'})
+                    get_playlist_mock.return_value=iter([dummy_track])
+
+                    station_iter = iterate_forever(station.get_playlist)
+                    station_iter.next()