Add helper function to concatenate dictionaries. Add test cases for ad support.

2 files changed, 56 insertions, 4 deletions

diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index cfeebb7..01fb9ae 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -1,9 +1,8 @@
 from unittest import TestCase
 
-from pandora.client import BaseAPIClient
-from pandora.transport import APITransport
+from pandora.client import APIClient, BaseAPIClient
 from pandora.errors import InvalidAuthToken
-from pandora.py2compat import Mock, MagicMock, call
+from pandora.py2compat import Mock, MagicMock, call, patch
 
 
 class TestCallingAPIClient(TestCase):
@@ -19,3 +18,53 @@ class TestCallingAPIClient(TestCase):
 
         client._authenticate.assert_called_with()
         transport.assert_has_calls([call("method"), call("method")])
+
+    def test_get_params_dict_ad_support_enabled(self):
+        transport = Mock(side_effect=[InvalidAuthToken(), None])
+
+        reg_dict = dict(x=1, y=2)
+        ad_dict = dict(z=3)
+
+        client = BaseAPIClient(transport, None, None, None, None, True)
+        result_dict = client.get_params_dict(reg_dict, ad_dict)
+
+        assert 'z' in result_dict
+
+    def test_get_params_dict_ad_support_disabled(self):
+        transport = Mock(side_effect=[InvalidAuthToken(), None])
+
+        reg_dict = dict(x=1, y=2)
+        ad_dict = dict(z=3)
+
+        client = BaseAPIClient(transport, None, None, None, None, False)
+        result_dict = client.get_params_dict(reg_dict, ad_dict)
+
+        assert not 'z' in result_dict
+
+    def test_ad_support_enabled_parameters(self):
+        with patch.object(APIClient, '__call__') as playlist_mock:
+            transport = Mock(side_effect=[InvalidAuthToken(), None])
+
+            client = APIClient(transport, None, None, None, None, True)
+            client._authenticate = Mock()
+
+            client.get_playlist('mock_token')
+
+            playlist_mock.assert_has_calls([call("station.getPlaylist",
+                                             audioAdPodCapable=True,
+                                             includeTrackLength=True,
+                                             stationToken='mock_token',
+                                             xplatformAdCapable=True)])
+
+    def test_ad_support_disabled_parameters(self):
+        with patch.object(APIClient, '__call__') as playlist_mock:
+            transport = Mock(side_effect=[InvalidAuthToken(), None])
+
+            client = APIClient(transport, None, None, None, None)
+            client._authenticate = Mock()
+
+            client.get_playlist('mock_token')
+
+            playlist_mock.assert_has_calls([call("station.getPlaylist",
+                                             includeTrackLength=True,
+                                             stationToken='mock_token')])
diff --git a/tests/test_pandora/test_clientbuilder.py b/tests/test_pandora/test_clientbuilder.py
index 6c65cd1..1882c53 100644
--- a/tests/test_pandora/test_clientbuilder.py
+++ b/tests/test_pandora/test_clientbuilder.py
@@ -81,8 +81,8 @@ class TestSettingsDictBuilder(TestCase):
             "PARTNER_PASSWORD": "pass",
             "DEVICE": "dev",
             "PROXY": "proxy.example.com",
-            "AD_SUPPORT_ENABLED": "test_ad_support",
             "AUDIO_QUALITY": "high",
+            "AD_SUPPORT_ENABLED": True,
             "API_HOST": "example.com",
         }).build()
 
@@ -98,6 +98,8 @@ class TestSettingsDictBuilder(TestCase):
         self.assertEqual(DEFAULT_API_HOST, client.transport.api_host)
         self.assertEqual(APIClient.MED_AUDIO_QUALITY,
                 client.default_audio_quality)
+        self.assertEqual(False,
+                client.ad_support_enabled)
 
     def test_validate_client(self):
         client = TestSettingsDictBuilder._build_maximal()
@@ -116,6 +118,7 @@ class TestSettingsDictBuilder(TestCase):
         self.assertEqual(expected_proxies, client.transport._http.proxies)
         self.assertEqual("example.com", client.transport.api_host)
         self.assertEqual("high", client.default_audio_quality)
+        self.assertEqual(True, client.ad_support_enabled)
 
 
 class TestFileBasedBuilder(TestCase):