Remove ad support flag from tests

4 files changed, 1 insertions, 44 deletions

diff --git a/tests/test_pandora/pianobar.cfg b/tests/test_pandora/pianobar.cfg
index 7a0ffd8..7a915d8 100644
--- a/tests/test_pandora/pianobar.cfg
+++ b/tests/test_pandora/pianobar.cfg
@@ -1,6 +1,5 @@
 # high-quality audio (192k mp3, for Pandora One subscribers only!)
 audio_quality = test_quality
-ad_support_enabled = test_ad_support
 rpc_host = test_host
 partner_user = test_partner_username
 partner_password = test_partner_password
diff --git a/tests/test_pandora/pydora.cfg b/tests/test_pandora/pydora.cfg
index fb75e2f..854e377 100644
--- a/tests/test_pandora/pydora.cfg
+++ b/tests/test_pandora/pydora.cfg
@@ -6,7 +6,6 @@ username = test_partner_username
 password = test_partner_password
 device = test_device
 default_audio_quality = test_quality
-ad_support_enabled = test_ad_support
 
 [user]
 username = test_username
diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index 6c14f50..835dc0d 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -19,33 +19,11 @@ 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 = APIClient(transport, None, None, None, None)
             client._authenticate = Mock()
 
             client.get_playlist('mock_token')
@@ -55,16 +33,3 @@ class TestCallingAPIClient(TestCase):
                                              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, False)
-            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 d4f8db0..27117b0 100644
--- a/tests/test_pandora/test_clientbuilder.py
+++ b/tests/test_pandora/test_clientbuilder.py
@@ -82,7 +82,6 @@ class TestSettingsDictBuilder(TestCase):
             "DEVICE": "dev",
             "PROXY": "proxy.example.com",
             "AUDIO_QUALITY": "high",
-            "AD_SUPPORT_ENABLED": True,
             "API_HOST": "example.com",
         }).build()
 
@@ -98,8 +97,6 @@ class TestSettingsDictBuilder(TestCase):
         self.assertEqual(DEFAULT_API_HOST, client.transport.api_host)
         self.assertEqual(APIClient.MED_AUDIO_QUALITY,
                 client.default_audio_quality)
-        self.assertEqual(True,
-                client.ad_support_enabled)
 
     def test_validate_client(self):
         client = TestSettingsDictBuilder._build_maximal()
@@ -118,7 +115,6 @@ 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):
@@ -185,7 +181,6 @@ class TestPydoraConfigFileBuilder(TestCase):
 
         self.assertDictEqual(cfg, {
             "AUDIO_QUALITY": "test_quality",
-            "AD_SUPPORT_ENABLED": "test_ad_support",
             "DECRYPTION_KEY": "test_decryption_key",
             "DEVICE": "test_device",
             "ENCRYPTION_KEY": "test_encryption_key",
@@ -207,7 +202,6 @@ class TestPianobarConfigFileBuilder(TestCase):
 
         self.assertDictEqual(cfg, {
             "AUDIO_QUALITY": "test_qualityQuality",
-            "AD_SUPPORT_ENABLED": "test_ad_support",
             "DECRYPTION_KEY": "test_decryption_key",
             "DEVICE": "test_device",
             "ENCRYPTION_KEY": "test_encryption_key",