Skip to content

Commit b4735f7

Browse files
simonwsimonw
committed
Remove test.utils.collapse_whitespace, closes #583 
1 parent 509857e commit b4735f7

File tree

3 files changed

+52
-45
lines changed

3 files changed

+52
-45
lines changed

‎tests/test_cli.py‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import pytest
1111
import textwrap
1212

13-
from .utils import collapse_whitespace
14-
1513

1614
def write_json(file_path, data):
1715
with open(file_path, "w") as fp:
@@ -273,28 +271,26 @@ def test_create_index_desc(db_path):
273271
@pytest.mark.parametrize(
274272
"col_name,col_type,expected_schema",
275273
(
276-
("text", "TEXT", "CREATE TABLE [dogs] ( [name] TEXT , [text] TEXT)"),
274+
("text", "TEXT", "CREATE TABLE [dogs] (\n [name] TEXT\n, [text] TEXT)"),
277275
(
278276
"integer",
279277
"INTEGER",
280-
"CREATE TABLE [dogs] ( [name] TEXT , [integer] INTEGER)",
278+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [integer] INTEGER)",
281279
),
282-
("float", "FLOAT", "CREATE TABLE [dogs] ( [name] TEXT , [float] FLOAT)"),
283-
("blob", "blob", "CREATE TABLE [dogs] ( [name] TEXT , [blob] BLOB)"),
284-
("default", None, "CREATE TABLE [dogs] ( [name] TEXT , [default] TEXT)"),
280+
("float", "FLOAT", "CREATE TABLE [dogs] (\n [name] TEXT\n, [float] FLOAT)"),
281+
("blob", "blob", "CREATE TABLE [dogs] (\n [name] TEXT\n, [blob] BLOB)"),
282+
("default", None, "CREATE TABLE [dogs] (\n [name] TEXT\n, [default] TEXT)"),
285283
),
286284
)
287285
def test_add_column(db_path, col_name, col_type, expected_schema):
288286
db = Database(db_path)
289287
db.create_table("dogs", {"name": str})
290-
assert "CREATE TABLE [dogs] ( [name] TEXT )" == collapse_whitespace(
291-
db["dogs"].schema
292-
)
288+
assert db["dogs"].schema == "CREATE TABLE [dogs] (\n [name] TEXT\n)"
293289
args = ["add-column", db_path, "dogs", col_name]
294290
if col_type is not None:
295291
args.append(col_type)
296-
assert 0 == CliRunner().invoke(cli.cli, args).exit_code
297-
assert expected_schema == collapse_whitespace(db["dogs"].schema)
292+
assert CliRunner().invoke(cli.cli, args).exit_code == 0
293+
assert db["dogs"].schema == expected_schema
298294

299295

300296
@pytest.mark.parametrize("ignore", (True, False))
@@ -313,9 +309,7 @@ def test_add_column_ignore(db_path, ignore):
313309
def test_add_column_not_null_default(db_path):
314310
db = Database(db_path)
315311
db.create_table("dogs", {"name": str})
316-
assert "CREATE TABLE [dogs] ( [name] TEXT )" == collapse_whitespace(
317-
db["dogs"].schema
318-
)
312+
assert db["dogs"].schema == "CREATE TABLE [dogs] (\n [name] TEXT\n)"
319313
args = [
320314
"add-column",
321315
db_path,
@@ -324,10 +318,11 @@ def test_add_column_not_null_default(db_path):
324318
"--not-null-default",
325319
"dogs'dawg",
326320
]
327-
assert 0 == CliRunner().invoke(cli.cli, args).exit_code
328-
assert (
329-
"CREATE TABLE [dogs] ( [name] TEXT , [nickname] TEXT NOT NULL DEFAULT 'dogs''dawg')"
330-
== collapse_whitespace(db["dogs"].schema)
321+
assert CliRunner().invoke(cli.cli, args).exit_code == 0
322+
assert db["dogs"].schema == (
323+
"CREATE TABLE [dogs] (\n"
324+
" [name] TEXT\n"
325+
", [nickname] TEXT NOT NULL DEFAULT 'dogs''dawg')"
331326
)
332327

333328

‎tests/test_create.py‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import pytest
1919
import uuid
2020

21-
from .utils import collapse_whitespace
2221

2322
try:
2423
import pandas as pd # type: ignore
@@ -329,46 +328,64 @@ def test_create_error_if_invalid_self_referential_foreign_keys(fresh_db):
329328
@pytest.mark.parametrize(
330329
"col_name,col_type,not_null_default,expected_schema",
331330
(
332-
("nickname", str, None, "CREATE TABLE [dogs] ( [name] TEXT , [nickname] TEXT)"),
333-
("dob", datetime.date, None, "CREATE TABLE [dogs] ( [name] TEXT , [dob] TEXT)"),
334-
("age", int, None, "CREATE TABLE [dogs] ( [name] TEXT , [age] INTEGER)"),
335-
("weight", float, None, "CREATE TABLE [dogs] ( [name] TEXT , [weight] FLOAT)"),
336-
("text", "TEXT", None, "CREATE TABLE [dogs] ( [name] TEXT , [text] TEXT)"),
331+
(
332+
"nickname",
333+
str,
334+
None,
335+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [nickname] TEXT)",
336+
),
337+
(
338+
"dob",
339+
datetime.date,
340+
None,
341+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [dob] TEXT)",
342+
),
343+
("age", int, None, "CREATE TABLE [dogs] (\n [name] TEXT\n, [age] INTEGER)"),
344+
(
345+
"weight",
346+
float,
347+
None,
348+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [weight] FLOAT)",
349+
),
350+
("text", "TEXT", None, "CREATE TABLE [dogs] (\n [name] TEXT\n, [text] TEXT)"),
337351
(
338352
"integer",
339353
"INTEGER",
340354
None,
341-
"CREATE TABLE [dogs] ( [name] TEXT , [integer] INTEGER)",
355+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [integer] INTEGER)",
342356
),
343-
("float", "FLOAT", None, "CREATE TABLE [dogs] ( [name] TEXT , [float] FLOAT)"),
344-
("blob", "blob", None, "CREATE TABLE [dogs] ( [name] TEXT , [blob] BLOB)"),
357+
(
358+
"float",
359+
"FLOAT",
360+
None,
361+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [float] FLOAT)",
362+
),
363+
("blob", "blob", None, "CREATE TABLE [dogs] (\n [name] TEXT\n, [blob] BLOB)"),
345364
(
346365
"default_str",
347366
None,
348367
None,
349-
"CREATE TABLE [dogs] ( [name] TEXT , [default_str] TEXT)",
368+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [default_str] TEXT)",
350369
),
351370
(
352371
"nickname",
353372
str,
354373
"",
355-
"CREATE TABLE [dogs] ( [name] TEXT , [nickname] TEXT NOT NULL DEFAULT '')",
374+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [nickname] TEXT NOT NULL DEFAULT '')",
356375
),
357376
(
358377
"nickname",
359378
str,
360379
"dawg's dawg",
361-
"CREATE TABLE [dogs] ( [name] TEXT , [nickname] TEXT NOT NULL DEFAULT 'dawg''s dawg')",
380+
"CREATE TABLE [dogs] (\n [name] TEXT\n, [nickname] TEXT NOT NULL DEFAULT 'dawg''s dawg')",
362381
),
363382
),
364383
)
365384
def test_add_column(fresh_db, col_name, col_type, not_null_default, expected_schema):
366385
fresh_db.create_table("dogs", {"name": str})
367-
assert "CREATE TABLE [dogs] ( [name] TEXT )" == collapse_whitespace(
368-
fresh_db["dogs"].schema
369-
)
386+
assert fresh_db["dogs"].schema == "CREATE TABLE [dogs] (\n [name] TEXT\n)"
370387
fresh_db["dogs"].add_column(col_name, col_type, not_null_default=not_null_default)
371-
assert expected_schema == collapse_whitespace(fresh_db["dogs"].schema)
388+
assert fresh_db["dogs"].schema == expected_schema
372389

373390

374391
def test_add_foreign_key(fresh_db):
@@ -492,9 +509,11 @@ def test_add_foreign_key_guess_table(fresh_db):
492509
fresh_db.create_table("breeds", {"name": str, "id": int}, pk="id")
493510
fresh_db["dogs"].add_column("breed_id", int)
494511
fresh_db["dogs"].add_foreign_key("breed_id")
495-
assert (
496-
collapse_whitespace(fresh_db["dogs"].schema)
497-
== 'CREATE TABLE "dogs" ( [name] TEXT, [breed_id] INTEGER REFERENCES [breeds]([id]) )'
512+
assert fresh_db["dogs"].schema == (
513+
'CREATE TABLE "dogs" (\n'
514+
" [name] TEXT,\n"
515+
" [breed_id] INTEGER REFERENCES [breeds]([id])\n"
516+
")"
498517
)
499518

500519

‎tests/utils.py‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)