Skip to content

Commit 66ea44d

Browse files
dhermesdhermes
committed
Replacing assertTrue(... is None) with assertIsNone.
Did this using: https://gist.github.com/dhermes/c9b2a649aec265eacee3bd6ef76c57e1
1 parent 944e58d commit 66ea44d

18 files changed

Lines changed: 154 additions & 154 deletions

‎system_tests/bigquery.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def test_list_datasets(self):
152152

153153
# Retrieve the datasets.
154154
all_datasets, token = Config.CLIENT.list_datasets()
155-
self.assertTrue(token is None)
155+
self.assertIsNone(token)
156156
created = [dataset for dataset in all_datasets
157157
if dataset.name in datasets_to_create and
158158
dataset.project == Config.CLIENT.project]
@@ -205,7 +205,7 @@ def test_list_tables(self):
205205

206206
# Retrieve the tables.
207207
all_tables, token = dataset.list_tables()
208-
self.assertTrue(token is None)
208+
self.assertIsNone(token)
209209
created = [table for table in all_tables
210210
if (table.name in tables_to_create and
211211
table.dataset_name == DATASET_NAME)]

‎system_tests/storage.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ def test_root_level_w_delimiter(self):
306306
blobs = list(iterator.get_items_from_response(response))
307307
self.assertEqual([blob.name for blob in blobs], ['file01.txt'])
308308
self.assertEqual(iterator.page_number, 1)
309-
self.assertTrue(iterator.next_page_token is None)
309+
self.assertIsNone(iterator.next_page_token)
310310
self.assertEqual(iterator.prefixes, set(['parent/']))
311311

312312
@RetryErrors(unittest.TestCase.failureException)
@@ -316,7 +316,7 @@ def test_first_level(self):
316316
blobs = list(iterator.get_items_from_response(response))
317317
self.assertEqual([blob.name for blob in blobs], ['parent/file11.txt'])
318318
self.assertEqual(iterator.page_number, 1)
319-
self.assertTrue(iterator.next_page_token is None)
319+
self.assertIsNone(iterator.next_page_token)
320320
self.assertEqual(iterator.prefixes, set(['parent/child/']))
321321

322322
@RetryErrors(unittest.TestCase.failureException)
@@ -333,7 +333,7 @@ def test_second_level(self):
333333
self.assertEqual([blob.name for blob in blobs],
334334
expected_names)
335335
self.assertEqual(iterator.page_number, 1)
336-
self.assertTrue(iterator.next_page_token is None)
336+
self.assertIsNone(iterator.next_page_token)
337337
self.assertEqual(iterator.prefixes,
338338
set(['parent/child/grand/', 'parent/child/other/']))
339339

@@ -350,7 +350,7 @@ def test_third_level(self):
350350
self.assertEqual([blob.name for blob in blobs],
351351
['parent/child/grand/file31.txt'])
352352
self.assertEqual(iterator.page_number, 1)
353-
self.assertTrue(iterator.next_page_token is None)
353+
self.assertIsNone(iterator.next_page_token)
354354
self.assertEqual(iterator.prefixes, set())
355355

356356

‎unit_tests/bigquery/test_job.py‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -157,39 +157,39 @@ def _verifyBooleanConfigProperties(self, job, config):
157157
self.assertEqual(job.allow_jagged_rows,
158158
config['allowJaggedRows'])
159159
else:
160-
self.assertTrue(job.allow_jagged_rows is None)
160+
self.assertIsNone(job.allow_jagged_rows)
161161
if 'allowQuotedNewlines' in config:
162162
self.assertEqual(job.allow_quoted_newlines,
163163
config['allowQuotedNewlines'])
164164
else:
165-
self.assertTrue(job.allow_quoted_newlines is None)
165+
self.assertIsNone(job.allow_quoted_newlines)
166166
if 'ignoreUnknownValues' in config:
167167
self.assertEqual(job.ignore_unknown_values,
168168
config['ignoreUnknownValues'])
169169
else:
170-
self.assertTrue(job.ignore_unknown_values is None)
170+
self.assertIsNone(job.ignore_unknown_values)
171171

172172
def _verifyEnumConfigProperties(self, job, config):
173173
if 'createDisposition' in config:
174174
self.assertEqual(job.create_disposition,
175175
config['createDisposition'])
176176
else:
177-
self.assertTrue(job.create_disposition is None)
177+
self.assertIsNone(job.create_disposition)
178178
if 'encoding' in config:
179179
self.assertEqual(job.encoding,
180180
config['encoding'])
181181
else:
182-
self.assertTrue(job.encoding is None)
182+
self.assertIsNone(job.encoding)
183183
if 'sourceFormat' in config:
184184
self.assertEqual(job.source_format,
185185
config['sourceFormat'])
186186
else:
187-
self.assertTrue(job.source_format is None)
187+
self.assertIsNone(job.source_format)
188188
if 'writeDisposition' in config:
189189
self.assertEqual(job.write_disposition,
190190
config['writeDisposition'])
191191
else:
192-
self.assertTrue(job.write_disposition is None)
192+
self.assertIsNone(job.write_disposition)
193193

194194
def _verifyResourceProperties(self, job, resource):
195195
self._verifyReadonlyResourceProperties(job, resource)
@@ -210,22 +210,22 @@ def _verifyResourceProperties(self, job, resource):
210210
self.assertEqual(job.field_delimiter,
211211
config['fieldDelimiter'])
212212
else:
213-
self.assertTrue(job.field_delimiter is None)
213+
self.assertIsNone(job.field_delimiter)
214214
if 'maxBadRecords' in config:
215215
self.assertEqual(job.max_bad_records,
216216
config['maxBadRecords'])
217217
else:
218-
self.assertTrue(job.max_bad_records is None)
218+
self.assertIsNone(job.max_bad_records)
219219
if 'quote' in config:
220220
self.assertEqual(job.quote_character,
221221
config['quote'])
222222
else:
223-
self.assertTrue(job.quote_character is None)
223+
self.assertIsNone(job.quote_character)
224224
if 'skipLeadingRows' in config:
225225
self.assertEqual(job.skip_leading_rows,
226226
config['skipLeadingRows'])
227227
else:
228-
self.assertTrue(job.skip_leading_rows is None)
228+
self.assertIsNone(job.skip_leading_rows)
229229

230230
def test_ctor(self):
231231
client = _Client(self.PROJECT)
@@ -249,17 +249,17 @@ def test_ctor(self):
249249
self.assertEqual(job.output_rows, None)
250250

251251
# set/read from resource['configuration']['load']
252-
self.assertTrue(job.allow_jagged_rows is None)
253-
self.assertTrue(job.allow_quoted_newlines is None)
254-
self.assertTrue(job.create_disposition is None)
255-
self.assertTrue(job.encoding is None)
256-
self.assertTrue(job.field_delimiter is None)
257-
self.assertTrue(job.ignore_unknown_values is None)
258-
self.assertTrue(job.max_bad_records is None)
259-
self.assertTrue(job.quote_character is None)
260-
self.assertTrue(job.skip_leading_rows is None)
261-
self.assertTrue(job.source_format is None)
262-
self.assertTrue(job.write_disposition is None)
252+
self.assertIsNone(job.allow_jagged_rows)
253+
self.assertIsNone(job.allow_quoted_newlines)
254+
self.assertIsNone(job.create_disposition)
255+
self.assertIsNone(job.encoding)
256+
self.assertIsNone(job.field_delimiter)
257+
self.assertIsNone(job.ignore_unknown_values)
258+
self.assertIsNone(job.max_bad_records)
259+
self.assertIsNone(job.quote_character)
260+
self.assertIsNone(job.skip_leading_rows)
261+
self.assertIsNone(job.source_format)
262+
self.assertIsNone(job.write_disposition)
263263

264264
def test_ctor_w_schema(self):
265265
from google.cloud.bigquery.schema import SchemaField
@@ -682,13 +682,13 @@ def _verifyResourceProperties(self, job, resource):
682682
self.assertEqual(job.create_disposition,
683683
config['createDisposition'])
684684
else:
685-
self.assertTrue(job.create_disposition is None)
685+
self.assertIsNone(job.create_disposition)
686686

687687
if 'writeDisposition' in config:
688688
self.assertEqual(job.write_disposition,
689689
config['writeDisposition'])
690690
else:
691-
self.assertTrue(job.write_disposition is None)
691+
self.assertIsNone(job.write_disposition)
692692

693693
def test_ctor(self):
694694
client = _Client(self.PROJECT)
@@ -706,8 +706,8 @@ def test_ctor(self):
706706
self._verifyInitialReadonlyProperties(job)
707707

708708
# set/read from resource['configuration']['copy']
709-
self.assertTrue(job.create_disposition is None)
710-
self.assertTrue(job.write_disposition is None)
709+
self.assertIsNone(job.create_disposition)
710+
self.assertIsNone(job.write_disposition)
711711

712712
def test_from_api_repr_missing_identity(self):
713713
self._setUpConstants()
@@ -969,25 +969,25 @@ def _verifyResourceProperties(self, job, resource):
969969
self.assertEqual(job.compression,
970970
config['compression'])
971971
else:
972-
self.assertTrue(job.compression is None)
972+
self.assertIsNone(job.compression)
973973

974974
if 'destinationFormat' in config:
975975
self.assertEqual(job.destination_format,
976976
config['destinationFormat'])
977977
else:
978-
self.assertTrue(job.destination_format is None)
978+
self.assertIsNone(job.destination_format)
979979

980980
if 'fieldDelimiter' in config:
981981
self.assertEqual(job.field_delimiter,
982982
config['fieldDelimiter'])
983983
else:
984-
self.assertTrue(job.field_delimiter is None)
984+
self.assertIsNone(job.field_delimiter)
985985

986986
if 'printHeader' in config:
987987
self.assertEqual(job.print_header,
988988
config['printHeader'])
989989
else:
990-
self.assertTrue(job.print_header is None)
990+
self.assertIsNone(job.print_header)
991991

992992
def test_ctor(self):
993993
client = _Client(self.PROJECT)
@@ -1005,10 +1005,10 @@ def test_ctor(self):
10051005
self._verifyInitialReadonlyProperties(job)
10061006

10071007
# set/read from resource['configuration']['copy']
1008-
self.assertTrue(job.compression is None)
1009-
self.assertTrue(job.destination_format is None)
1010-
self.assertTrue(job.field_delimiter is None)
1011-
self.assertTrue(job.print_header is None)
1008+
self.assertIsNone(job.compression)
1009+
self.assertIsNone(job.destination_format)
1010+
self.assertIsNone(job.field_delimiter)
1011+
self.assertIsNone(job.print_header)
10121012

10131013
def test_from_api_repr_missing_identity(self):
10141014
self._setUpConstants()
@@ -1247,34 +1247,34 @@ def _verifyBooleanResourceProperties(self, job, config):
12471247
self.assertEqual(job.allow_large_results,
12481248
config['allowLargeResults'])
12491249
else:
1250-
self.assertTrue(job.allow_large_results is None)
1250+
self.assertIsNone(job.allow_large_results)
12511251
if 'flattenResults' in config:
12521252
self.assertEqual(job.flatten_results,
12531253
config['flattenResults'])
12541254
else:
1255-
self.assertTrue(job.flatten_results is None)
1255+
self.assertIsNone(job.flatten_results)
12561256
if 'useQueryCache' in config:
12571257
self.assertEqual(job.use_query_cache,
12581258
config['useQueryCache'])
12591259
else:
1260-
self.assertTrue(job.use_query_cache is None)
1260+
self.assertIsNone(job.use_query_cache)
12611261
if 'useLegacySql' in config:
12621262
self.assertEqual(job.use_legacy_sql,
12631263
config['useLegacySql'])
12641264
else:
1265-
self.assertTrue(job.use_legacy_sql is None)
1265+
self.assertIsNone(job.use_legacy_sql)
12661266

12671267
def _verifyIntegerResourceProperties(self, job, config):
12681268
if 'maximumBillingTier' in config:
12691269
self.assertEqual(job.maximum_billing_tier,
12701270
config['maximumBillingTier'])
12711271
else:
1272-
self.assertTrue(job.maximum_billing_tier is None)
1272+
self.assertIsNone(job.maximum_billing_tier)
12731273
if 'maximumBytesBilled' in config:
12741274
self.assertEqual(job.maximum_bytes_billed,
12751275
config['maximumBytesBilled'])
12761276
else:
1277-
self.assertTrue(job.maximum_bytes_billed is None)
1277+
self.assertIsNone(job.maximum_bytes_billed)
12781278

12791279
def _verifyResourceProperties(self, job, resource):
12801280
self._verifyReadonlyResourceProperties(job, resource)
@@ -1287,7 +1287,7 @@ def _verifyResourceProperties(self, job, resource):
12871287
self.assertEqual(job.create_disposition,
12881288
config['createDisposition'])
12891289
else:
1290-
self.assertTrue(job.create_disposition is None)
1290+
self.assertIsNone(job.create_disposition)
12911291
if 'defaultDataset' in config:
12921292
dataset = job.default_dataset
12931293
ds_ref = {
@@ -1296,7 +1296,7 @@ def _verifyResourceProperties(self, job, resource):
12961296
}
12971297
self.assertEqual(ds_ref, config['defaultDataset'])
12981298
else:
1299-
self.assertTrue(job.default_dataset is None)
1299+
self.assertIsNone(job.default_dataset)
13001300
if 'destinationTable' in config:
13011301
table = job.destination
13021302
tb_ref = {
@@ -1306,17 +1306,17 @@ def _verifyResourceProperties(self, job, resource):
13061306
}
13071307
self.assertEqual(tb_ref, config['destinationTable'])
13081308
else:
1309-
self.assertTrue(job.destination is None)
1309+
self.assertIsNone(job.destination)
13101310
if 'priority' in config:
13111311
self.assertEqual(job.priority,
13121312
config['priority'])
13131313
else:
1314-
self.assertTrue(job.priority is None)
1314+
self.assertIsNone(job.priority)
13151315
if 'writeDisposition' in config:
13161316
self.assertEqual(job.write_disposition,
13171317
config['writeDisposition'])
13181318
else:
1319-
self.assertTrue(job.write_disposition is None)
1319+
self.assertIsNone(job.write_disposition)
13201320

13211321
def test_ctor(self):
13221322
client = _Client(self.PROJECT)
@@ -1331,17 +1331,17 @@ def test_ctor(self):
13311331
self._verifyInitialReadonlyProperties(job)
13321332

13331333
# set/read from resource['configuration']['copy']
1334-
self.assertTrue(job.allow_large_results is None)
1335-
self.assertTrue(job.create_disposition is None)
1336-
self.assertTrue(job.default_dataset is None)
1337-
self.assertTrue(job.destination is None)
1338-
self.assertTrue(job.flatten_results is None)
1339-
self.assertTrue(job.priority is None)
1340-
self.assertTrue(job.use_query_cache is None)
1341-
self.assertTrue(job.use_legacy_sql is None)
1342-
self.assertTrue(job.write_disposition is None)
1343-
self.assertTrue(job.maximum_billing_tier is None)
1344-
self.assertTrue(job.maximum_bytes_billed is None)
1334+
self.assertIsNone(job.allow_large_results)
1335+
self.assertIsNone(job.create_disposition)
1336+
self.assertIsNone(job.default_dataset)
1337+
self.assertIsNone(job.destination)
1338+
self.assertIsNone(job.flatten_results)
1339+
self.assertIsNone(job.priority)
1340+
self.assertIsNone(job.use_query_cache)
1341+
self.assertIsNone(job.use_legacy_sql)
1342+
self.assertIsNone(job.write_disposition)
1343+
self.assertIsNone(job.maximum_billing_tier)
1344+
self.assertIsNone(job.maximum_bytes_billed)
13451345

13461346
def test_from_api_repr_missing_identity(self):
13471347
self._setUpConstants()

‎unit_tests/bigquery/test_query.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def _verifySchema(self, query, resource):
8686
expected.get('description'))
8787
self.assertEqual(found.fields, expected.get('fields'))
8888
else:
89-
self.assertTrue(query.schema is None)
89+
self.assertIsNone(query.schema)
9090

9191
def _verifyRows(self, query, resource):
9292
expected = resource.get('rows')
@@ -111,7 +111,7 @@ def _verifyResourceProperties(self, query, resource):
111111
if 'jobReference' in resource:
112112
self.assertEqual(query.name, resource['jobReference']['jobId'])
113113
else:
114-
self.assertTrue(query.name is None)
114+
self.assertIsNone(query.name)
115115

116116
self._verifySchema(query, resource)
117117
self._verifyRows(query, resource)
@@ -122,21 +122,21 @@ def test_ctor(self):
122122
self.assertEqual(query.query, self.QUERY)
123123
self.assertTrue(query._client is client)
124124

125-
self.assertTrue(query.cache_hit is None)
126-
self.assertTrue(query.complete is None)
127-
self.assertTrue(query.errors is None)
128-
self.assertTrue(query.name is None)
129-
self.assertTrue(query.page_token is None)
125+
self.assertIsNone(query.cache_hit)
126+
self.assertIsNone(query.complete)
127+
self.assertIsNone(query.errors)
128+
self.assertIsNone(query.name)
129+
self.assertIsNone(query.page_token)
130130
self.assertEqual(query.rows, [])
131-
self.assertTrue(query.schema is None)
132-
self.assertTrue(query.total_rows is None)
133-
self.assertTrue(query.total_bytes_processed is None)
131+
self.assertIsNone(query.schema)
132+
self.assertIsNone(query.total_rows)
133+
self.assertIsNone(query.total_bytes_processed)
134134

135-
self.assertTrue(query.default_dataset is None)
136-
self.assertTrue(query.max_results is None)
137-
self.assertTrue(query.preserve_nulls is None)
138-
self.assertTrue(query.use_query_cache is None)
139-
self.assertTrue(query.use_legacy_sql is None)
135+
self.assertIsNone(query.default_dataset)
136+
self.assertIsNone(query.max_results)
137+
self.assertIsNone(query.preserve_nulls)
138+
self.assertIsNone(query.use_query_cache)
139+
self.assertIsNone(query.use_legacy_sql)
140140

141141
def test_from_query_job(self):
142142
from google.cloud.bigquery.dataset import Dataset
@@ -186,7 +186,7 @@ def test_from_query_job_wo_default_dataset(self):
186186
def test_job_wo_jobid(self):
187187
client = _Client(self.PROJECT)
188188
query = self._makeOne(self.QUERY, client)
189-
self.assertTrue(query.job is None)
189+
self.assertIsNone(query.job)
190190

191191
def test_job_w_jobid(self):
192192
from google.cloud.bigquery.job import QueryJob

0 commit comments

Comments
 (0)