Skip to content

Commit 2399070

Browse files
tswasttswast
authored
BigQuery: Remove unnecessary _Table class from test_job.py (googleapis#5126)
* BigQuery: Remove unnecessary _Table class from test_job.py The way the `_Table` class is used in test_job.py is redundant with the TABLE_REF property.
1 parent 2880fef commit 2399070

File tree

1 file changed

+28
-45
lines changed

1 file changed

+28
-45
lines changed

‎bigquery/tests/unit/test_job.py‎

Lines changed: 28 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ def test_props_set_by_server(self):
542542
'reason': 'REASON'}
543543

544544
client = _make_client(project=self.PROJECT)
545-
table = _Table()
546-
job = self._make_one(self.JOB_ID, [self.SOURCE1], table, client)
545+
job = self._make_one(
546+
self.JOB_ID, [self.SOURCE1], self.TABLE_REF, client)
547547
job._properties['etag'] = 'ETAG'
548548
job._properties['id'] = FULL_JOB_ID
549549
job._properties['selfLink'] = URL
@@ -872,8 +872,8 @@ def test_exists_miss_w_bound_client(self):
872872
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
873873
conn = _make_connection()
874874
client = _make_client(project=self.PROJECT, connection=conn)
875-
table = _Table()
876-
job = self._make_one(self.JOB_ID, [self.SOURCE1], table, client)
875+
job = self._make_one(
876+
self.JOB_ID, [self.SOURCE1], self.TABLE_REF, client)
877877

878878
self.assertFalse(job.exists())
879879

@@ -888,8 +888,8 @@ def test_exists_hit_w_alternate_client(self):
888888
client1 = _make_client(project=self.PROJECT, connection=conn1)
889889
conn2 = _make_connection({})
890890
client2 = _make_client(project=self.PROJECT, connection=conn2)
891-
table = _Table()
892-
job = self._make_one(self.JOB_ID, [self.SOURCE1], table, client1)
891+
job = self._make_one(
892+
self.JOB_ID, [self.SOURCE1], self.TABLE_REF, client1)
893893

894894
self.assertTrue(job.exists(client=client2))
895895

@@ -920,8 +920,8 @@ def test_reload_w_bound_client(self):
920920
RESOURCE = self._make_resource()
921921
conn = _make_connection(RESOURCE)
922922
client = _make_client(project=self.PROJECT, connection=conn)
923-
table = _Table()
924-
job = self._make_one(self.JOB_ID, [self.SOURCE1], table, client)
923+
job = self._make_one(
924+
self.JOB_ID, [self.SOURCE1], self.TABLE_REF, client)
925925

926926
job.reload()
927927

@@ -938,8 +938,8 @@ def test_reload_w_alternate_client(self):
938938
client1 = _make_client(project=self.PROJECT, connection=conn1)
939939
conn2 = _make_connection(RESOURCE)
940940
client2 = _make_client(project=self.PROJECT, connection=conn2)
941-
table = _Table()
942-
job = self._make_one(self.JOB_ID, [self.SOURCE1], table, client1)
941+
job = self._make_one(
942+
self.JOB_ID, [self.SOURCE1], self.TABLE_REF, client1)
943943

944944
job.reload(client=client2)
945945

@@ -976,8 +976,8 @@ def test_cancel_w_bound_client(self):
976976
RESPONSE = {'job': RESOURCE}
977977
conn = _make_connection(RESPONSE)
978978
client = _make_client(project=self.PROJECT, connection=conn)
979-
table = _Table()
980-
job = self._make_one(self.JOB_ID, [self.SOURCE1], table, client)
979+
job = self._make_one(
980+
self.JOB_ID, [self.SOURCE1], self.TABLE_REF, client)
981981

982982
job.cancel()
983983

@@ -995,8 +995,8 @@ def test_cancel_w_alternate_client(self):
995995
client1 = _make_client(project=self.PROJECT, connection=conn1)
996996
conn2 = _make_connection(RESPONSE)
997997
client2 = _make_client(project=self.PROJECT, connection=conn2)
998-
table = _Table()
999-
job = self._make_one(self.JOB_ID, [self.SOURCE1], table, client1)
998+
job = self._make_one(
999+
self.JOB_ID, [self.SOURCE1], self.TABLE_REF, client1)
10001000

10011001
job.cancel(client=client2)
10021002

@@ -1567,11 +1567,15 @@ def _verifyResourceProperties(self, job, resource):
15671567
self.assertIsNone(job.print_header)
15681568

15691569
def test_ctor(self):
1570+
from google.cloud.bigquery.table import Table
1571+
15701572
client = _make_client(project=self.PROJECT)
1571-
source = _Table(self.SOURCE_TABLE)
1572-
job = self._make_one(self.JOB_ID, source, [self.DESTINATION_URI],
1573-
client)
1574-
self.assertEqual(job.source, source)
1573+
source = Table(self.TABLE_REF)
1574+
job = self._make_one(
1575+
self.JOB_ID, source, [self.DESTINATION_URI], client)
1576+
self.assertEqual(job.source.project, self.PROJECT)
1577+
self.assertEqual(job.source.dataset_id, self.DS_ID)
1578+
self.assertEqual(job.source.table_id, self.TABLE_ID)
15751579
self.assertEqual(job.destination_uris, [self.DESTINATION_URI])
15761580
self.assertIs(job._client, client)
15771581
self.assertEqual(job.job_type, self.JOB_TYPE)
@@ -1590,9 +1594,8 @@ def test_ctor(self):
15901594
def test_destination_uri_file_counts(self):
15911595
file_counts = 23
15921596
client = _make_client(project=self.PROJECT)
1593-
source = _Table(self.SOURCE_TABLE)
1594-
job = self._make_one(self.JOB_ID, source, [self.DESTINATION_URI],
1595-
client)
1597+
job = self._make_one(
1598+
self.JOB_ID, self.TABLE_REF, [self.DESTINATION_URI], client)
15961599
self.assertIsNone(job.destination_uri_file_counts)
15971600

15981601
statistics = job._properties['statistics'] = {}
@@ -1754,9 +1757,8 @@ def test_exists_miss_w_bound_client(self):
17541757
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
17551758
conn = _make_connection()
17561759
client = _make_client(project=self.PROJECT, connection=conn)
1757-
source = _Table(self.SOURCE_TABLE)
1758-
job = self._make_one(self.JOB_ID, source, [self.DESTINATION_URI],
1759-
client)
1760+
job = self._make_one(
1761+
self.JOB_ID, self.TABLE_REF, [self.DESTINATION_URI], client)
17601762

17611763
self.assertFalse(job.exists())
17621764

@@ -1771,9 +1773,8 @@ def test_exists_hit_w_alternate_client(self):
17711773
client1 = _make_client(project=self.PROJECT, connection=conn1)
17721774
conn2 = _make_connection({})
17731775
client2 = _make_client(project=self.PROJECT, connection=conn2)
1774-
source = _Table(self.SOURCE_TABLE)
1775-
job = self._make_one(self.JOB_ID, source, [self.DESTINATION_URI],
1776-
client1)
1776+
job = self._make_one(
1777+
self.JOB_ID, self.TABLE_REF, [self.DESTINATION_URI], client1)
17771778

17781779
self.assertTrue(job.exists(client=client2))
17791780

@@ -3337,21 +3338,3 @@ def test_from_api_repr_normal(self):
33373338
self.assertEqual(entry.records_written, self.RECORDS_WRITTEN)
33383339
self.assertEqual(entry.status, self.STATUS)
33393340
self.assertEqual(entry.steps, steps)
3340-
3341-
3342-
class _Table(object):
3343-
3344-
def __init__(self, table_id=None):
3345-
self._table_id = table_id
3346-
3347-
@property
3348-
def table_id(self):
3349-
return TestLoadJob.TABLE_ID
3350-
3351-
@property
3352-
def project(self):
3353-
return TestLoadJob.PROJECT
3354-
3355-
@property
3356-
def dataset_id(self):
3357-
return TestLoadJob.DS_ID

0 commit comments

Comments
 (0)