Skip to content

Commit 9396bc1

Browse files
dhermesdhermes
authored
Renaming makeResource -> make_resource. (#4355)
Done via: $ git grep -l makeResource | xargs sed -i s/makeResource/make_resource/g
1 parent 1ed56fd commit 9396bc1

7 files changed

Lines changed: 89 additions & 89 deletions

File tree

‎bigquery/tests/unit/test_dataset.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def _setUpConstants(self):
206206
self.DS_FULL_ID = '%s:%s' % (self.PROJECT, self.DS_ID)
207207
self.RESOURCE_URL = 'http://example.com/path/to/resource'
208208

209-
def _makeResource(self):
209+
def _make_resource(self):
210210
self._setUpConstants()
211211
USER_EMAIL = 'phred@example.com'
212212
GROUP_EMAIL = 'group-name@lists.example.com'
@@ -422,7 +422,7 @@ def test_from_api_repr_bare(self):
422422
self._verify_resource_properties(dataset, RESOURCE)
423423

424424
def test_from_api_repr_w_properties(self):
425-
RESOURCE = self._makeResource()
425+
RESOURCE = self._make_resource()
426426
klass = self._get_target_class()
427427
dataset = klass.from_api_repr(RESOURCE)
428428
self._verify_resource_properties(dataset, RESOURCE)

‎bigquery/tests/unit/test_job.py‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def _table_ref(self, table_id):
114114

115115
return TableReference(self.DS_REF, table_id)
116116

117-
def _makeResource(self, started=False, ended=False):
117+
def _make_resource(self, started=False, ended=False):
118118
self._setUpConstants()
119119
resource = {
120120
'configuration': {
@@ -219,8 +219,8 @@ def _setUpConstants(self):
219219
self.OUTPUT_BYTES = 23456
220220
self.OUTPUT_ROWS = 345
221221

222-
def _makeResource(self, started=False, ended=False):
223-
resource = super(TestLoadJob, self)._makeResource(
222+
def _make_resource(self, started=False, ended=False):
223+
resource = super(TestLoadJob, self)._make_resource(
224224
started, ended)
225225
config = resource['configuration']['load']
226226
config['sourceUris'] = [self.SOURCE1]
@@ -374,21 +374,21 @@ def test_ctor_w_config(self):
374374

375375
def test_done(self):
376376
client = _make_client(project=self.PROJECT)
377-
resource = self._makeResource(ended=True)
377+
resource = self._make_resource(ended=True)
378378
job = self._get_target_class().from_api_repr(resource, client)
379379
self.assertTrue(job.done())
380380

381381
def test_result(self):
382382
client = _make_client(project=self.PROJECT)
383-
resource = self._makeResource(ended=True)
383+
resource = self._make_resource(ended=True)
384384
job = self._get_target_class().from_api_repr(resource, client)
385385

386386
result = job.result()
387387

388388
self.assertIs(result, job)
389389

390390
def test_result_invokes_begin(self):
391-
begun_resource = self._makeResource()
391+
begun_resource = self._make_resource()
392392
done_resource = copy.deepcopy(begun_resource)
393393
done_resource['status'] = {'state': 'DONE'}
394394
connection = _Connection(begun_resource, done_resource)
@@ -537,7 +537,7 @@ def test_from_api_repr_bare(self):
537537

538538
def test_from_api_repr_w_properties(self):
539539
client = _make_client(project=self.PROJECT)
540-
RESOURCE = self._makeResource()
540+
RESOURCE = self._make_resource()
541541
load_config = RESOURCE['configuration']['load']
542542
load_config['createDisposition'] = 'CREATE_IF_NEEDED'
543543
klass = self._get_target_class()
@@ -557,7 +557,7 @@ def test_begin_w_already_running(self):
557557

558558
def test_begin_w_bound_client(self):
559559
PATH = '/projects/%s/jobs' % (self.PROJECT,)
560-
RESOURCE = self._makeResource()
560+
RESOURCE = self._make_resource()
561561
# Ensure None for missing server-set props
562562
del RESOURCE['statistics']['creationTime']
563563
del RESOURCE['etag']
@@ -595,7 +595,7 @@ def test_begin_w_bound_client(self):
595595

596596
def test_begin_w_autodetect(self):
597597
path = '/projects/{}/jobs'.format(self.PROJECT)
598-
resource = self._makeResource()
598+
resource = self._make_resource()
599599
resource['configuration']['load']['autodetect'] = True
600600
# Ensure None for missing server-set props
601601
del resource['statistics']['creationTime']
@@ -639,7 +639,7 @@ def test_begin_w_alternate_client(self):
639639
from google.cloud.bigquery.schema import SchemaField
640640

641641
PATH = '/projects/%s/jobs' % (self.PROJECT,)
642-
RESOURCE = self._makeResource(ended=True)
642+
RESOURCE = self._make_resource(ended=True)
643643
LOAD_CONFIGURATION = {
644644
'sourceUris': [self.SOURCE1],
645645
'destinationTable': {
@@ -743,7 +743,7 @@ def test_exists_hit_w_alternate_client(self):
743743

744744
def test_reload_w_bound_client(self):
745745
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
746-
RESOURCE = self._makeResource()
746+
RESOURCE = self._make_resource()
747747
conn = _Connection(RESOURCE)
748748
client = _make_client(project=self.PROJECT, connection=conn)
749749
table = _Table()
@@ -759,7 +759,7 @@ def test_reload_w_bound_client(self):
759759

760760
def test_reload_w_alternate_client(self):
761761
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
762-
RESOURCE = self._makeResource()
762+
RESOURCE = self._make_resource()
763763
conn1 = _Connection()
764764
client1 = _make_client(project=self.PROJECT, connection=conn1)
765765
conn2 = _Connection(RESOURCE)
@@ -778,7 +778,7 @@ def test_reload_w_alternate_client(self):
778778

779779
def test_cancel_w_bound_client(self):
780780
PATH = '/projects/%s/jobs/%s/cancel' % (self.PROJECT, self.JOB_ID)
781-
RESOURCE = self._makeResource(ended=True)
781+
RESOURCE = self._make_resource(ended=True)
782782
RESPONSE = {'job': RESOURCE}
783783
conn = _Connection(RESPONSE)
784784
client = _make_client(project=self.PROJECT, connection=conn)
@@ -795,7 +795,7 @@ def test_cancel_w_bound_client(self):
795795

796796
def test_cancel_w_alternate_client(self):
797797
PATH = '/projects/%s/jobs/%s/cancel' % (self.PROJECT, self.JOB_ID)
798-
RESOURCE = self._makeResource(ended=True)
798+
RESOURCE = self._make_resource(ended=True)
799799
RESPONSE = {'job': RESOURCE}
800800
conn1 = _Connection()
801801
client1 = _make_client(project=self.PROJECT, connection=conn1)
@@ -825,8 +825,8 @@ def _get_target_class():
825825

826826
return CopyJob
827827

828-
def _makeResource(self, started=False, ended=False):
829-
resource = super(TestCopyJob, self)._makeResource(
828+
def _make_resource(self, started=False, ended=False):
829+
resource = super(TestCopyJob, self)._make_resource(
830830
started, ended)
831831
config = resource['configuration']['copy']
832832
config['sourceTables'] = [{
@@ -997,7 +997,7 @@ def test_from_api_repr_wo_sources(self):
997997

998998
def test_from_api_repr_w_properties(self):
999999
client = _make_client(project=self.PROJECT)
1000-
RESOURCE = self._makeResource()
1000+
RESOURCE = self._make_resource()
10011001
copy_config = RESOURCE['configuration']['copy']
10021002
copy_config['createDisposition'] = 'CREATE_IF_NEEDED'
10031003
klass = self._get_target_class()
@@ -1007,7 +1007,7 @@ def test_from_api_repr_w_properties(self):
10071007

10081008
def test_begin_w_bound_client(self):
10091009
PATH = '/projects/%s/jobs' % (self.PROJECT,)
1010-
RESOURCE = self._makeResource()
1010+
RESOURCE = self._make_resource()
10111011
# Ensure None for missing server-set props
10121012
del RESOURCE['statistics']['creationTime']
10131013
del RESOURCE['etag']
@@ -1050,7 +1050,7 @@ def test_begin_w_bound_client(self):
10501050

10511051
def test_begin_w_alternate_client(self):
10521052
PATH = '/projects/%s/jobs' % (self.PROJECT,)
1053-
RESOURCE = self._makeResource(ended=True)
1053+
RESOURCE = self._make_resource(ended=True)
10541054
COPY_CONFIGURATION = {
10551055
'sourceTables': [{
10561056
'projectId': self.PROJECT,
@@ -1134,7 +1134,7 @@ def test_exists_hit_w_alternate_client(self):
11341134

11351135
def test_reload_w_bound_client(self):
11361136
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
1137-
RESOURCE = self._makeResource()
1137+
RESOURCE = self._make_resource()
11381138
conn = _Connection(RESOURCE)
11391139
client = _make_client(project=self.PROJECT, connection=conn)
11401140
source = self._table_ref(self.SOURCE_TABLE)
@@ -1151,7 +1151,7 @@ def test_reload_w_bound_client(self):
11511151

11521152
def test_reload_w_alternate_client(self):
11531153
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
1154-
RESOURCE = self._makeResource()
1154+
RESOURCE = self._make_resource()
11551155
conn1 = _Connection()
11561156
client1 = _make_client(project=self.PROJECT, connection=conn1)
11571157
conn2 = _Connection(RESOURCE)
@@ -1181,8 +1181,8 @@ def _get_target_class():
11811181

11821182
return ExtractJob
11831183

1184-
def _makeResource(self, started=False, ended=False):
1185-
resource = super(TestExtractJob, self)._makeResource(
1184+
def _make_resource(self, started=False, ended=False):
1185+
resource = super(TestExtractJob, self)._make_resource(
11861186
started, ended)
11871187
config = resource['configuration']['extract']
11881188
config['sourceTable'] = {
@@ -1316,7 +1316,7 @@ def test_from_api_repr_bare(self):
13161316

13171317
def test_from_api_repr_w_properties(self):
13181318
client = _make_client(project=self.PROJECT)
1319-
RESOURCE = self._makeResource()
1319+
RESOURCE = self._make_resource()
13201320
extract_config = RESOURCE['configuration']['extract']
13211321
extract_config['compression'] = 'GZIP'
13221322
klass = self._get_target_class()
@@ -1326,7 +1326,7 @@ def test_from_api_repr_w_properties(self):
13261326

13271327
def test_begin_w_bound_client(self):
13281328
PATH = '/projects/%s/jobs' % (self.PROJECT,)
1329-
RESOURCE = self._makeResource()
1329+
RESOURCE = self._make_resource()
13301330
# Ensure None for missing server-set props
13311331
del RESOURCE['statistics']['creationTime']
13321332
del RESOURCE['etag']
@@ -1366,7 +1366,7 @@ def test_begin_w_bound_client(self):
13661366

13671367
def test_begin_w_alternate_client(self):
13681368
PATH = '/projects/%s/jobs' % (self.PROJECT,)
1369-
RESOURCE = self._makeResource(ended=True)
1369+
RESOURCE = self._make_resource(ended=True)
13701370
EXTRACT_CONFIGURATION = {
13711371
'sourceTable': {
13721372
'projectId': self.PROJECT,
@@ -1450,7 +1450,7 @@ def test_exists_hit_w_alternate_client(self):
14501450

14511451
def test_reload_w_bound_client(self):
14521452
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
1453-
RESOURCE = self._makeResource()
1453+
RESOURCE = self._make_resource()
14541454
conn = _Connection(RESOURCE)
14551455
client = _make_client(project=self.PROJECT, connection=conn)
14561456
source_dataset = DatasetReference(self.PROJECT, self.DS_ID)
@@ -1468,7 +1468,7 @@ def test_reload_w_bound_client(self):
14681468

14691469
def test_reload_w_alternate_client(self):
14701470
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
1471-
RESOURCE = self._makeResource()
1471+
RESOURCE = self._make_resource()
14721472
conn1 = _Connection()
14731473
client1 = _make_client(project=self.PROJECT, connection=conn1)
14741474
conn2 = _Connection(RESOURCE)
@@ -1562,8 +1562,8 @@ def _get_target_class():
15621562

15631563
return QueryJob
15641564

1565-
def _makeResource(self, started=False, ended=False):
1566-
resource = super(TestQueryJob, self)._makeResource(
1565+
def _make_resource(self, started=False, ended=False):
1566+
resource = super(TestQueryJob, self)._make_resource(
15671567
started, ended)
15681568
config = resource['configuration']['query']
15691569
config['query'] = self.QUERY
@@ -1788,7 +1788,7 @@ def test_from_api_repr_bare(self):
17881788

17891789
def test_from_api_repr_w_properties(self):
17901790
client = _make_client(project=self.PROJECT)
1791-
RESOURCE = self._makeResource()
1791+
RESOURCE = self._make_resource()
17921792
query_config = RESOURCE['configuration']['query']
17931793
query_config['createDisposition'] = 'CREATE_IF_NEEDED'
17941794
query_config['writeDisposition'] = 'WRITE_TRUNCATE'
@@ -1816,7 +1816,7 @@ def test_cancelled(self):
18161816

18171817
def test_done(self):
18181818
client = _make_client(project=self.PROJECT)
1819-
resource = self._makeResource(ended=True)
1819+
resource = self._make_resource(ended=True)
18201820
job = self._get_target_class().from_api_repr(resource, client)
18211821
self.assertTrue(job.done())
18221822

@@ -2137,15 +2137,15 @@ def test_result(self):
21372137
}
21382138
connection = _Connection(query_resource, query_resource)
21392139
client = _make_client(self.PROJECT, connection=connection)
2140-
resource = self._makeResource(ended=True)
2140+
resource = self._make_resource(ended=True)
21412141
job = self._get_target_class().from_api_repr(resource, client)
21422142

21432143
result = job.result()
21442144

21452145
self.assertEqual(list(result), [])
21462146

21472147
def test_result_invokes_begins(self):
2148-
begun_resource = self._makeResource()
2148+
begun_resource = self._make_resource()
21492149
incomplete_resource = {
21502150
'jobComplete': False,
21512151
'jobReference': {
@@ -2172,7 +2172,7 @@ def test_result_invokes_begins(self):
21722172
self.assertEqual(reload_request['method'], 'GET')
21732173

21742174
def test_result_w_timeout(self):
2175-
begun_resource = self._makeResource()
2175+
begun_resource = self._make_resource()
21762176
query_resource = {
21772177
'jobComplete': True,
21782178
'jobReference': {
@@ -2229,7 +2229,7 @@ def test_begin_w_bound_client(self):
22292229

22302230
PATH = '/projects/%s/jobs' % (self.PROJECT,)
22312231
DS_ID = 'DATASET'
2232-
RESOURCE = self._makeResource()
2232+
RESOURCE = self._make_resource()
22332233
# Ensure None for missing server-set props
22342234
del RESOURCE['statistics']['creationTime']
22352235
del RESOURCE['etag']
@@ -2277,7 +2277,7 @@ def test_begin_w_alternate_client(self):
22772277
PATH = '/projects/%s/jobs' % (self.PROJECT,)
22782278
TABLE = 'TABLE'
22792279
DS_ID = 'DATASET'
2280-
RESOURCE = self._makeResource(ended=True)
2280+
RESOURCE = self._make_resource(ended=True)
22812281
QUERY_CONFIGURATION = {
22822282
'query': self.QUERY,
22832283
'allowLargeResults': True,
@@ -2351,7 +2351,7 @@ def test_begin_w_udf(self):
23512351
RESOURCE_URI = 'gs://some-bucket/js/lib.js'
23522352
INLINE_UDF_CODE = 'var someCode = "here";'
23532353
PATH = '/projects/%s/jobs' % (self.PROJECT,)
2354-
RESOURCE = self._makeResource()
2354+
RESOURCE = self._make_resource()
23552355
# Ensure None for missing server-set props
23562356
del RESOURCE['statistics']['creationTime']
23572357
del RESOURCE['etag']
@@ -2405,7 +2405,7 @@ def test_begin_w_named_query_parameter(self):
24052405

24062406
query_parameters = [ScalarQueryParameter('foo', 'INT64', 123)]
24072407
PATH = '/projects/%s/jobs' % (self.PROJECT,)
2408-
RESOURCE = self._makeResource()
2408+
RESOURCE = self._make_resource()
24092409
# Ensure None for missing server-set props
24102410
del RESOURCE['statistics']['creationTime']
24112411
del RESOURCE['etag']
@@ -2461,7 +2461,7 @@ def test_begin_w_positional_query_parameter(self):
24612461

24622462
query_parameters = [ScalarQueryParameter.positional('INT64', 123)]
24632463
PATH = '/projects/%s/jobs' % (self.PROJECT,)
2464-
RESOURCE = self._makeResource()
2464+
RESOURCE = self._make_resource()
24652465
# Ensure None for missing server-set props
24662466
del RESOURCE['statistics']['creationTime']
24672467
del RESOURCE['etag']
@@ -2517,7 +2517,7 @@ def test_begin_w_table_defs(self):
25172517
from google.cloud.bigquery.external_config import BigtableColumnFamily
25182518

25192519
PATH = '/projects/%s/jobs' % (self.PROJECT,)
2520-
RESOURCE = self._makeResource()
2520+
RESOURCE = self._make_resource()
25212521
# Ensure None for missing server-set props
25222522
del RESOURCE['statistics']['creationTime']
25232523
del RESOURCE['etag']
@@ -2601,7 +2601,7 @@ def test_dry_run_query(self):
26012601
from google.cloud.bigquery.job import QueryJobConfig
26022602

26032603
PATH = '/projects/%s/jobs' % (self.PROJECT,)
2604-
RESOURCE = self._makeResource()
2604+
RESOURCE = self._make_resource()
26052605
# Ensure None for missing server-set props
26062606
del RESOURCE['statistics']['creationTime']
26072607
del RESOURCE['etag']
@@ -2675,7 +2675,7 @@ def test_reload_w_bound_client(self):
26752675
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
26762676
DS_ID = 'DATASET'
26772677
DEST_TABLE = 'dest_table'
2678-
RESOURCE = self._makeResource()
2678+
RESOURCE = self._make_resource()
26792679
conn = _Connection(RESOURCE)
26802680
client = _make_client(project=self.PROJECT, connection=conn)
26812681
dataset_ref = DatasetReference(self.PROJECT, DS_ID)
@@ -2698,7 +2698,7 @@ def test_reload_w_alternate_client(self):
26982698
PATH = '/projects/%s/jobs/%s' % (self.PROJECT, self.JOB_ID)
26992699
DS_ID = 'DATASET'
27002700
DEST_TABLE = 'dest_table'
2701-
RESOURCE = self._makeResource()
2701+
RESOURCE = self._make_resource()
27022702
q_config = RESOURCE['configuration']['query']
27032703
q_config['destinationTable'] = {
27042704
'projectId': self.PROJECT,

0 commit comments

Comments
 (0)