fix tests

jvmvik · jvmvik · commit 1ce9794ccc60 · 2023-05-07T13:06:28.000-05:00
diff --git a/serpapi/serpapi.py b/serpapi/serpapi.py
@@ -189,7 +189,7 @@ def search_archive(self, search_id: str, decoder: str = 'json'):
         if decoder in self.SUPPORTED_DECODER:
             path += decoder
         else:
-            raise SerpApiException('Decoder must be json or html')
+            raise SerpApiException(f'Invalid decoder: {decoder}  must be json or html. ')
         return self.start(path, {}, decoder)
 
     def account(self, api_key: str = None):
diff --git a/tests/example_search_google_local_services_test.py b/tests/example_search_google_local_services_test.py
@@ -12,8 +12,8 @@ def test_search_google_local_services(self):
         'api_key': os.getenv("API_KEY")
       })
     data = client.search({
-        'q': 'Electrician',
-        'data_cid': 'ChIJOwg_06VPwokRYv534QaPC8g',
+        'q': 'electrician',
+        'data_cid': '6745062158417646970',
     })
     self.assertIsNone(data.get('error'))
     self.assertIsNotNone(data['local_ads'])
diff --git a/tests/test_location_api.py b/tests/test_location_api.py
@@ -10,6 +10,7 @@ def test_get_account(self):
         client = serpapi.Client({'api_key': os.getenv('API_KEY')})
         locations = client.location({'q':'Austin', 'limit': 3})
         self.assertGreater(len(locations), 1)
+        self.assertLessEqual(len(locations), 3)
         self.assertTrue('id' in locations[0])
-
-
+        self.assertTrue('name' in locations[0])
+        self.assertTrue('canonical_name' in locations[0])
diff --git a/tests/test_search_archive.py b/tests/test_search_archive.py
@@ -24,9 +24,14 @@ def test_search_archive(self):
       self.assertEqual(data_archive['organic_results'][0], data["organic_results"][0])
 
       # fetch results from the archive again (code coverage)
-      object_archive = client.search_archive(search_id, 'object')
+      object_archive = client.search_archive(search_id, 'json')
       self.assertIsNotNone(object_archive)
-      self.assertEqual(object_archive.organic_results[0].title, data["organic_results"][0]["title"])
+      self.assertEqual(object_archive['organic_results'][0]['title'], data["organic_results"][0]["title"])
 
+    def test_bad_decoder(self):
+      client = serpapi.Client({
+        "engine": "google",
+        "api_key": os.getenv("API_KEY")
+        })
       with pytest.raises(serpapi.SerpApiException, match=r'Decoder must be json or html'):
-        client.search_archive(search_id, 'bad')
+        client.search_archive('007', 'bad')
diff --git a/tests/test_serpapi.py b/tests/test_serpapi.py
@@ -34,25 +34,6 @@ def test_html(self):
       })
 			self.assertRegex(data, r'</html>$')
 
-		# test ObjectDecoder
-		@unittest.skipIf((os.getenv("API_KEY") == None), "no api_key provided")
-		def test_object(self):
-			client = serpapi.Client({
-				"engine": "google",
-				"api_key": os.getenv("API_KEY"),
-				'timeout': 120,
-				'retries': True
-			})
-			data = client.search({
-        "q": "Coffee", 
-				"location": "Austin,Texas"
-      }, decoder="object")
-			self.assertIsInstance(data, object)
-			self.assertIsNotNone(data.organic_results)
-			self.assertIsInstance(data.organic_results, list)
-			self.assertGreater(len(data.organic_results), 3)
-			self.assertIsInstance(data.organic_results[0].link, str)
-
 		def test_invalid_api_key(self):
 			client = serpapi.Client({
 				"engine": "google",
@@ -67,7 +48,7 @@ def test_invalid_api_key(self):
 		def test_invalid_decoder(self):
 			client = serpapi.Client({
 				"engine": "google",
-				"api_key": os.getenv("API_KEY"),
+				"api_key": os.getenv("API_KEY")
 			})
 			mockResponse = MockResponse()
 			self.assertEqual(mockResponse.status, 200)
