Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore(test): renaming files
  • Loading branch information
jeertmans committed Aug 20, 2023
commit a83ec30a4cccd4d15f09ac0a759764399e8d8cbe
16 changes: 11 additions & 5 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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")
3 changes: 2 additions & 1 deletion tests/data/example.py → tests/data/slides.py
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
29 changes: 0 additions & 29 deletions tests/data/slides/BasicExample.json

This file was deleted.

29 changes: 29 additions & 0 deletions tests/data/slides/BasicSlide.json
Original file line number Diff line number Diff line change
@@ -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"
}
8 changes: 4 additions & 4 deletions tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -46,7 +46,7 @@ def test_convert(slides_folder: Path) -> None:
cli,
[
"convert",
"BasicExample",
"BasicSlide",
"basic_example.html",
"--folder",
str(slides_folder),
Expand Down Expand Up @@ -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:
Expand Down
14 changes: 6 additions & 8 deletions tests/test_slide.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,32 @@ 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

local_slides_folder = Path("slides")

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()

assert (
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)
Expand Down