Rewrote the tests

Author: egeucak

bigquery/tests/test_client.py

@@ -297,7 +297,9 @@ def test_query(self):
 
         mock_query_job.execute.return_value = {
             'jobReference': expected_job_ref,
-            'jobComplete': True
+            'jobComplete': True,
+            'cacheHit': False,
+            'totalBytesProcessed': 0
         }
 
         self.mock_job_collection.query.return_value = mock_query_job
@@ -329,6 +331,8 @@ def test_query_max_results_set(self):
         mock_query_job.execute.return_value = {
             'jobReference': expected_job_ref,
             'jobComplete': True,
+            'cacheHit': False,
+            'totalBytesProcessed': 0
         }
 
         self.mock_job_collection.query.return_value = mock_query_job
@@ -357,6 +361,8 @@ def test_query_timeout_set(self):
         mock_query_job.execute.return_value = {
             'jobReference': expected_job_ref,
             'jobComplete': True,
+            'cacheHit': False,
+            'totalBytesProcessed': 0
         }
 
         self.mock_job_collection.query.return_value = mock_query_job
@@ -382,6 +388,8 @@ def test_sync_query_timeout(self):
         mock_query_job.execute.return_value = {
             'jobReference': expected_job_ref,
             'jobComplete': False,
+            'cacheHit': False,
+            'totalBytesProcessed': 0
         }
 
         self.mock_job_collection.query.return_value = mock_query_job
@@ -400,6 +408,8 @@ def test_async_query_timeout(self):
         mock_query_job.execute.return_value = {
             'jobReference': expected_job_ref,
             'jobComplete': False,
+            'cacheHit': False,
+            'totalBytesProcessed': 0
         }
 
         self.mock_job_collection.query.return_value = mock_query_job
@@ -409,14 +419,18 @@ def test_async_query_timeout(self):
         self.assertEquals(results, [])
 
     def test_query_dry_run_valid(self):
-        """Ensure that None and an empty list is returned from the query when
+        """Ensure that None and [cacheHit, totalBytesProcessed] is returned from the query when
         dry_run is True and the query is valid.
         """
 
         mock_query_job = mock.Mock()
 
-        mock_query_job.execute.return_value = {'jobReference': {},
-                                               'jobComplete': True}
+        mock_query_job.execute.return_value = {
+            'jobReference': {},
+            'jobComplete': True, 
+            'cacheHit': False,
+            'totalBytesProcessed': 0
+        }
 
         self.mock_job_collection.query.return_value = mock_query_job
 
@@ -428,7 +442,7 @@ def test_query_dry_run_valid(self):
                   'dryRun': True}
         )
         self.assertIsNone(job_id)
-        self.assertEqual([], results)
+        self.assertEqual([False, 0], results)
 
     def test_query_dry_run_invalid(self):
         """Ensure that None and a dict is returned from the query when dry_run
@@ -468,6 +482,8 @@ def test_query_with_results(self):
             'schema': {'fields': [{'name': 'foo', 'type': 'INTEGER'}]},
             'rows': [{'f': [{'v': 10}]}],
             'jobComplete': True,
+            'cacheHit': False,
+            'totalBytesProcessed': 0
         }
 
         self.mock_job_collection.query.return_value = mock_query_job
@@ -491,7 +507,9 @@ def test_query_with_using_legacy_sql(self):
 
         mock_query_job.execute.return_value = {
             'jobReference': expected_job_ref,
-            'jobComplete': True
+            'jobComplete': True,
+            'cacheHit': False,
+            'totalBytesProcessed': 0
         }
 
         self.mock_job_collection.query.return_value = mock_query_job
@@ -873,7 +891,7 @@ def test_json_job_body_constructed_correctly(self):
         body = {
             "jobReference": {
                 "projectId": self.project_id,
-                "jobId": "job"
+                "jobId": "job",
             },
             "configuration": {
                 "load": {