X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/712f8b37fb12a40ec6ea86903f44c2d0750f56a3..4ebf14d17ed544be893be5706c02116fd8b83b4c:/tests/test_ipynb.py?ds=sidebyside
diff --git a/tests/test_ipynb.py b/tests/test_ipynb.py
index 6f6b309..7aa2e91 100644
--- a/tests/test_ipynb.py
+++ b/tests/test_ipynb.py
@@ -1,23 +1,24 @@
import contextlib
-from dataclasses import replace
import pathlib
import re
from contextlib import ExitStack as does_not_raise
+from dataclasses import replace
from typing import ContextManager
+import pytest
+from _pytest.monkeypatch import MonkeyPatch
from click.testing import CliRunner
-from black.handle_ipynb_magics import jupyter_dependencies_are_installed
+
from black import (
- main,
+ Mode,
NothingChanged,
format_cell,
format_file_contents,
format_file_in_place,
+ main,
)
-import pytest
-from black import Mode
-from _pytest.monkeypatch import MonkeyPatch
-from tests.util import DATA_DIR
+from black.handle_ipynb_magics import jupyter_dependencies_are_installed
+from tests.util import DATA_DIR, get_case_path, read_jupyter_notebook
with contextlib.suppress(ModuleNotFoundError):
import IPython
@@ -252,9 +253,7 @@ def test_empty_cell() -> None:
def test_entire_notebook_empty_metadata() -> None:
- with open(DATA_DIR / "notebook_empty_metadata.ipynb", "rb") as fd:
- content_bytes = fd.read()
- content = content_bytes.decode()
+ content = read_jupyter_notebook("jupyter", "notebook_empty_metadata")
result = format_file_contents(content, fast=True, mode=JUPYTER_MODE)
expected = (
"{\n"
@@ -289,9 +288,7 @@ def test_entire_notebook_empty_metadata() -> None:
def test_entire_notebook_trailing_newline() -> None:
- with open(DATA_DIR / "notebook_trailing_newline.ipynb", "rb") as fd:
- content_bytes = fd.read()
- content = content_bytes.decode()
+ content = read_jupyter_notebook("jupyter", "notebook_trailing_newline")
result = format_file_contents(content, fast=True, mode=JUPYTER_MODE)
expected = (
"{\n"
@@ -338,9 +335,7 @@ def test_entire_notebook_trailing_newline() -> None:
def test_entire_notebook_no_trailing_newline() -> None:
- with open(DATA_DIR / "notebook_no_trailing_newline.ipynb", "rb") as fd:
- content_bytes = fd.read()
- content = content_bytes.decode()
+ content = read_jupyter_notebook("jupyter", "notebook_no_trailing_newline")
result = format_file_contents(content, fast=True, mode=JUPYTER_MODE)
expected = (
"{\n"
@@ -387,17 +382,14 @@ def test_entire_notebook_no_trailing_newline() -> None:
def test_entire_notebook_without_changes() -> None:
- with open(DATA_DIR / "notebook_without_changes.ipynb", "rb") as fd:
- content_bytes = fd.read()
- content = content_bytes.decode()
+ content = read_jupyter_notebook("jupyter", "notebook_without_changes")
with pytest.raises(NothingChanged):
format_file_contents(content, fast=True, mode=JUPYTER_MODE)
def test_non_python_notebook() -> None:
- with open(DATA_DIR / "non_python_notebook.ipynb", "rb") as fd:
- content_bytes = fd.read()
- content = content_bytes.decode()
+ content = read_jupyter_notebook("jupyter", "non_python_notebook")
+
with pytest.raises(NothingChanged):
format_file_contents(content, fast=True, mode=JUPYTER_MODE)
@@ -408,7 +400,7 @@ def test_empty_string() -> None:
def test_unparseable_notebook() -> None:
- path = DATA_DIR / "notebook_which_cant_be_parsed.ipynb"
+ path = get_case_path("jupyter", "notebook_which_cant_be_parsed.ipynb")
msg = rf"File '{re.escape(str(path))}' cannot be parsed as valid Jupyter notebook\."
with pytest.raises(ValueError, match=msg):
format_file_in_place(path, fast=True, mode=JUPYTER_MODE)
@@ -418,7 +410,7 @@ def test_ipynb_diff_with_change() -> None:
result = runner.invoke(
main,
[
- str(DATA_DIR / "notebook_trailing_newline.ipynb"),
+ str(get_case_path("jupyter", "notebook_trailing_newline.ipynb")),
"--diff",
f"--config={EMPTY_CONFIG}",
],
@@ -431,7 +423,7 @@ def test_ipynb_diff_with_no_change() -> None:
result = runner.invoke(
main,
[
- str(DATA_DIR / "notebook_without_changes.ipynb"),
+ str(get_case_path("jupyter", "notebook_without_changes.ipynb")),
"--diff",
f"--config={EMPTY_CONFIG}",
],
@@ -445,7 +437,7 @@ def test_cache_isnt_written_if_no_jupyter_deps_single(
) -> None:
# Check that the cache isn't written to if Jupyter dependencies aren't installed.
jupyter_dependencies_are_installed.cache_clear()
- nb = DATA_DIR / "notebook_trailing_newline.ipynb"
+ nb = get_case_path("jupyter", "notebook_trailing_newline.ipynb")
tmp_nb = tmp_path / "notebook.ipynb"
with open(nb) as src, open(tmp_nb, "w") as dst:
dst.write(src.read())
@@ -471,7 +463,7 @@ def test_cache_isnt_written_if_no_jupyter_deps_dir(
) -> None:
# Check that the cache isn't written to if Jupyter dependencies aren't installed.
jupyter_dependencies_are_installed.cache_clear()
- nb = DATA_DIR / "notebook_trailing_newline.ipynb"
+ nb = get_case_path("jupyter", "notebook_trailing_newline.ipynb")
tmp_nb = tmp_path / "notebook.ipynb"
with open(nb) as src, open(tmp_nb, "w") as dst:
dst.write(src.read())
@@ -489,7 +481,7 @@ def test_cache_isnt_written_if_no_jupyter_deps_dir(
def test_ipynb_flag(tmp_path: pathlib.Path) -> None:
- nb = DATA_DIR / "notebook_trailing_newline.ipynb"
+ nb = get_case_path("jupyter", "notebook_trailing_newline.ipynb")
tmp_nb = tmp_path / "notebook.a_file_extension_which_is_definitely_not_ipynb"
with open(nb) as src, open(tmp_nb, "w") as dst:
dst.write(src.read())
@@ -507,7 +499,7 @@ def test_ipynb_flag(tmp_path: pathlib.Path) -> None:
def test_ipynb_and_pyi_flags() -> None:
- nb = DATA_DIR / "notebook_trailing_newline.ipynb"
+ nb = get_case_path("jupyter", "notebook_trailing_newline.ipynb")
result = runner.invoke(
main,
[