From a83ec30a4cccd4d15f09ac0a759764399e8d8cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Eertmans?= Date: Sun, 20 Aug 2023 19:17:26 +0200 Subject: [PATCH] chore(test): renaming files --- tests/conftest.py | 16 +++++++--- tests/data/{example.py => slides.py} | 3 +- tests/data/slides/BasicExample.json | 29 ------------------ tests/data/slides/BasicSlide.json | 29 ++++++++++++++++++ ...83183d1ccdbc485687cee79c6ffbd4f02698da.mp4 | Bin ...dbc485687cee79c6ffbd4f02698da_reversed.mp4 | Bin ...c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4 | Bin ...2ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4 | Bin ...3b2bd6e79d093356d379d518cc929812194bd9.mp4 | Bin ...d093356d379d518cc929812194bd9_reversed.mp4 | Bin ...a51d66c92d0f79ac48647526817c377f843810.mp4 | Bin ...d0f79ac48647526817c377f843810_reversed.mp4 | Bin tests/test_main.py | 8 ++--- tests/test_slide.py | 14 ++++----- 14 files changed, 52 insertions(+), 47 deletions(-) rename tests/data/{example.py => slides.py} (90%) delete mode 100644 tests/data/slides/BasicExample.json create mode 100644 tests/data/slides/BasicSlide.json rename tests/data/slides/files/{BasicExample => BasicSlide}/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da.mp4 (100%) rename tests/data/slides/files/{BasicExample => BasicSlide}/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da_reversed.mp4 (100%) rename tests/data/slides/files/{BasicExample => BasicSlide}/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4 (100%) rename tests/data/slides/files/{BasicExample => BasicSlide}/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4 (100%) rename tests/data/slides/files/{BasicExample => BasicSlide}/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9.mp4 (100%) rename tests/data/slides/files/{BasicExample => BasicSlide}/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9_reversed.mp4 (100%) rename tests/data/slides/files/{BasicExample => BasicSlide}/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810.mp4 (100%) rename tests/data/slides/files/{BasicExample => BasicSlide}/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810_reversed.mp4 (100%) diff --git a/tests/conftest.py b/tests/conftest.py index 9bdee978..e6bdb408 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,17 +13,23 @@ @pytest.fixture def data_folder() -> Iterator[Path]: - yield (Path(__file__).parent / "data").resolve() + path = (Path(__file__).parent / "data").resolve() + assert path.exists() + yield path @pytest.fixture def slides_folder(data_folder: Path) -> Iterator[Path]: - yield (data_folder / "slides").resolve() + path = (data_folder / "slides").resolve() + assert path.exists() + yield path @pytest.fixture -def examples_file(data_folder: Path) -> Iterator[Path]: - yield (data_folder / "example.py").resolve() +def slides_file(data_folder: Path) -> Iterator[Path]: + path = (data_folder / "slides.py").resolve() + assert path.exists() + yield path def random_path( @@ -53,4 +59,4 @@ def paths() -> Generator[List[Path], None, None]: def presentation_config( slides_folder: Path, ) -> Generator[PresentationConfig, None, None]: - yield PresentationConfig.from_file(slides_folder / "BasicExample.json") + yield PresentationConfig.from_file(slides_folder / "BasicSlide.json") diff --git a/tests/data/example.py b/tests/data/slides.py similarity index 90% rename from tests/data/example.py rename to tests/data/slides.py index d5abd7c4..5503ae48 100644 --- a/tests/data/example.py +++ b/tests/data/slides.py @@ -1,10 +1,11 @@ +# flake8: noqa: F403, F405 # type: ignore from manim import * from manim_slides import Slide -class BasicExample(Slide): +class BasicSlide(Slide): def construct(self): circle = Circle(radius=3, color=BLUE) dot = Dot() diff --git a/tests/data/slides/BasicExample.json b/tests/data/slides/BasicExample.json deleted file mode 100644 index 1ebc9406..00000000 --- a/tests/data/slides/BasicExample.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "slides": [ - { - "type": "slide", - "file": "slides/files/BasicExample/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4", - "rev_file": "slides/files/BasicExample/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4" - }, - { - "type": "loop", - "file": "slides/files/BasicExample/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da.mp4", - "rev_file": "slides/files/BasicExample/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da_reversed.mp4" - }, - { - "type": "slide", - "file": "slides/files/BasicExample/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810.mp4", - "rev_file": "slides/files/BasicExample/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810_reversed.mp4" - }, - { - "type": "last", - "file": "slides/files/BasicExample/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9.mp4", - "rev_file": "slides/files/BasicExample/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9_reversed.mp4" - } - ], - "resolution": [ - 854, - 480 - ], - "background_color": "black" -} diff --git a/tests/data/slides/BasicSlide.json b/tests/data/slides/BasicSlide.json new file mode 100644 index 00000000..f6043d0f --- /dev/null +++ b/tests/data/slides/BasicSlide.json @@ -0,0 +1,29 @@ +{ + "slides": [ + { + "type": "slide", + "file": "slides/files/BasicSlide/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4", + "rev_file": "slides/files/BasicSlide/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4" + }, + { + "type": "loop", + "file": "slides/files/BasicSlide/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da.mp4", + "rev_file": "slides/files/BasicSlide/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da_reversed.mp4" + }, + { + "type": "slide", + "file": "slides/files/BasicSlide/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810.mp4", + "rev_file": "slides/files/BasicSlide/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810_reversed.mp4" + }, + { + "type": "last", + "file": "slides/files/BasicSlide/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9.mp4", + "rev_file": "slides/files/BasicSlide/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9_reversed.mp4" + } + ], + "resolution": [ + 854, + 480 + ], + "background_color": "black" +} diff --git a/tests/data/slides/files/BasicExample/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da.mp4 b/tests/data/slides/files/BasicSlide/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da.mp4 rename to tests/data/slides/files/BasicSlide/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da.mp4 diff --git a/tests/data/slides/files/BasicExample/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da_reversed.mp4 b/tests/data/slides/files/BasicSlide/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da_reversed.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da_reversed.mp4 rename to tests/data/slides/files/BasicSlide/05b94f634a049cd83daa9b47e483183d1ccdbc485687cee79c6ffbd4f02698da_reversed.mp4 diff --git a/tests/data/slides/files/BasicExample/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4 b/tests/data/slides/files/BasicSlide/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4 rename to tests/data/slides/files/BasicSlide/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5.mp4 diff --git a/tests/data/slides/files/BasicExample/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4 b/tests/data/slides/files/BasicSlide/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4 rename to tests/data/slides/files/BasicSlide/0a0055f0cf52ecedd7a759cdd3c7a202ca32ea527d8eb9ee4ab0eaf96113c7e5_reversed.mp4 diff --git a/tests/data/slides/files/BasicExample/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9.mp4 b/tests/data/slides/files/BasicSlide/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9.mp4 rename to tests/data/slides/files/BasicSlide/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9.mp4 diff --git a/tests/data/slides/files/BasicExample/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9_reversed.mp4 b/tests/data/slides/files/BasicSlide/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9_reversed.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9_reversed.mp4 rename to tests/data/slides/files/BasicSlide/c10cc5deb3630a8259712288913b2bd6e79d093356d379d518cc929812194bd9_reversed.mp4 diff --git a/tests/data/slides/files/BasicExample/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810.mp4 b/tests/data/slides/files/BasicSlide/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810.mp4 rename to tests/data/slides/files/BasicSlide/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810.mp4 diff --git a/tests/data/slides/files/BasicExample/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810_reversed.mp4 b/tests/data/slides/files/BasicSlide/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810_reversed.mp4 similarity index 100% rename from tests/data/slides/files/BasicExample/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810_reversed.mp4 rename to tests/data/slides/files/BasicSlide/d09707faa0d68c55e98c628c5da51d66c92d0f79ac48647526817c377f843810_reversed.mp4 diff --git a/tests/test_main.py b/tests/test_main.py index d6c38775..196c1b0c 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -21,7 +21,7 @@ def test_defaults_to_present(slides_folder: Path) -> None: with runner.isolated_filesystem(): results = runner.invoke( - cli, ["BasicExample", "--folder", str(slides_folder), "-s"] + cli, ["BasicSlide", "--folder", str(slides_folder), "-s"] ) assert results.exit_code == 0 @@ -32,7 +32,7 @@ def test_present(slides_folder: Path) -> None: with runner.isolated_filesystem(): results = runner.invoke( - cli, ["present", "BasicExample", "--folder", str(slides_folder), "-s"] + cli, ["present", "BasicSlide", "--folder", str(slides_folder), "-s"] ) assert results.exit_code == 0 @@ -46,7 +46,7 @@ def test_convert(slides_folder: Path) -> None: cli, [ "convert", - "BasicExample", + "BasicSlide", "basic_example.html", "--folder", str(slides_folder), @@ -85,7 +85,7 @@ def test_list_scenes(slides_folder: Path) -> None: ) assert results.exit_code == 0 - assert "BasicExample" in results.output + assert "BasicSlide" in results.output def test_wizard() -> None: diff --git a/tests/test_slide.py b/tests/test_slide.py index 0bd84cfa..5c09dc1f 100644 --- a/tests/test_slide.py +++ b/tests/test_slide.py @@ -18,13 +18,11 @@ def test_construct(_) -> None: return Wrapper -def test_render_basic_examples(examples_file: Path, slides_folder: Path) -> None: +def test_render_basic_examples(slides_file: Path, slides_folder: Path) -> None: runner = CliRunner() with runner.isolated_filesystem(): - results = runner.invoke( - cli, [str(examples_file), "BasicExample", "-ql"] - ) + results = runner.invoke(cli, [str(slides_file), "BasicSlide", "-ql"]) assert results.exit_code == 0 @@ -32,11 +30,11 @@ def test_render_basic_examples(examples_file: Path, slides_folder: Path) -> None assert local_slides_folder.exists() - local_config_file = local_slides_folder / "BasicExample.json" + local_config_file = local_slides_folder / "BasicSlide.json" assert local_config_file.exists() - config_file = slides_folder / "BasicExample.json" + config_file = slides_folder / "BasicSlide.json" expected = local_config_file.read_text().strip() got = config_file.read_text().strip() @@ -44,8 +42,8 @@ def test_render_basic_examples(examples_file: Path, slides_folder: Path) -> None expected == got ), f"Mismatch between {local_config_file} and {config_file}" - expected_files = list((slides_folder / "files" / "BasicExample").iterdir()) - got_files = list((local_slides_folder / "files" / "BasicExample").iterdir()) + expected_files = list((slides_folder / "files" / "BasicSlide").iterdir()) + got_files = list((local_slides_folder / "files" / "BasicSlide").iterdir()) # TODO: when Python >= 3.10, replace with zip(..., ..., strict=True) assert len(got_files) == len(expected_files)