Merge main.

tests/test_command_line.py

@@ -12,23 +12,32 @@ from typing import List
 from xml.etree import ElementTree
 from xml.etree.ElementTree import Element
 
-from map_machine.ui import COMMANDS
+from map_machine.ui.cli import COMMAND_LINES
+
+LOG: bytes = (
+    b"INFO Constructing ways...\n"
+    b"INFO Constructing nodes...\n"
+    b"INFO Drawing ways...\n"
+    b"INFO Drawing main icons...\n"
+    b"INFO Drawing extra icons...\n"
+    b"INFO Drawing texts...\n"
+)
 
 
 def error_run(arguments: List[str], message: bytes) -> None:
     """Run command that should fail and check error message."""
-    p = Popen(["map-machine"] + arguments, stderr=PIPE)
-    _, error = p.communicate()
-    assert p.returncode != 0
-    assert error == message
+    with Popen(["map-machine"] + arguments, stderr=PIPE) as pipe:
+        _, error = pipe.communicate()
+        assert pipe.returncode != 0
+        assert error == message
 
 
 def run(arguments: List[str], message: bytes) -> None:
     """Run command that should fail and check error message."""
-    p = Popen(["map-machine"] + arguments, stderr=PIPE)
-    _, error = p.communicate()
-    assert p.returncode == 0
-    assert error == message
+    with Popen(["map-machine"] + arguments, stderr=PIPE) as pipe:
+        _, error = pipe.communicate()
+        assert pipe.returncode == 0
+        assert error == message
 
 
 def test_wrong_render_arguments() -> None:
@@ -43,15 +52,15 @@ def test_wrong_render_arguments() -> None:
 def test_render() -> None:
     """Test `render` command."""
     run(
-        COMMANDS["render"] + ["--cache", "tests/data"],
-        b"INFO Writing output SVG to out/map.svg...\n",
+        COMMAND_LINES["render"] + ["--cache", "tests/data"],
+        LOG + b"INFO Writing output SVG to out/map.svg...\n",
     )
-    with Path("out/map.svg").open() as output_file:
+    with Path("out/map.svg").open(encoding="utf-8") as output_file:
         root: Element = ElementTree.parse(output_file).getroot()
 
     # 4 expected elements: `defs`, `rect` (background), `g` (outline),
-    # `g` (icon).
-    assert len(root) == 4
+    # `g` (icon), 4 `text` elements (credits).
+    assert len(root) == 8
     assert len(root[3][0]) == 0
     assert root.get("width") == "186.0"
     assert root.get("height") == "198.0"
@@ -60,15 +69,15 @@ def test_render() -> None:
 def test_render_with_tooltips() -> None:
     """Test `render` command."""
     run(
-        COMMANDS["render_with_tooltips"] + ["--cache", "tests/data"],
-        b"INFO Writing output SVG to out/map.svg...\n",
+        COMMAND_LINES["render_with_tooltips"] + ["--cache", "tests/data"],
+        LOG + b"INFO Writing output SVG to out/map.svg...\n",
     )
-    with Path("out/map.svg").open() as output_file:
+    with Path("out/map.svg").open(encoding="utf-8") as output_file:
         root: Element = ElementTree.parse(output_file).getroot()
 
     # 4 expected elements: `defs`, `rect` (background), `g` (outline),
-    # `g` (icon).
-    assert len(root) == 4
+    # `g` (icon), 4 `text` elements (credits).
+    assert len(root) == 8
     assert len(root[3][0]) == 1
     assert root[3][0][0].text == "natural: tree"
     assert root.get("width") == "186.0"
@@ -78,9 +87,10 @@ def test_render_with_tooltips() -> None:
 def test_icons() -> None:
     """Test `icons` command."""
     run(
-        COMMANDS["icons"],
+        COMMAND_LINES["icons"],
+        b"INFO Icons are written to out/icons_by_name and out/icons_by_id.\n"
         b"INFO Icon grid is written to out/icon_grid.svg.\n"
-        b"INFO Icons are written to out/icons_by_name and out/icons_by_id.\n",
+        b"INFO Icon grid is written to doc/grid.svg.\n",
     )
 
     assert (Path("out") / "icon_grid.svg").is_file()
@@ -93,30 +103,32 @@ def test_icons() -> None:
 def test_mapcss() -> None:
     """Test `mapcss` command."""
     run(
-        COMMANDS["mapcss"],
+        COMMAND_LINES["mapcss"],
         b"INFO MapCSS 0.2 scheme is written to out/map_machine_mapcss.\n",
     )
+    out_path: Path = Path("out") / "map_machine_mapcss"
 
-    assert (Path("out") / "map_machine_mapcss").is_dir()
-    assert (Path("out") / "map_machine_mapcss" / "icons").is_dir()
-    assert (
-        Path("out") / "map_machine_mapcss" / "icons" / "apple.svg"
-    ).is_file()
-    assert (Path("out") / "map_machine_mapcss" / "map_machine.mapcss").is_file()
+    assert out_path.is_dir()
+    assert out_path.is_dir()
+    assert (out_path / "icons" / "apple.svg").is_file()
+    assert (out_path / "map_machine.mapcss").is_file()
+    assert (out_path / "icons" / "LICENSE").is_file()
 
 
 def test_element() -> None:
     """Test `element` command."""
-    run(COMMANDS["element"], b"INFO Element is written to out/element.svg.\n")
-
+    run(
+        COMMAND_LINES["element"],
+        b"INFO Element is written to out/element.svg.\n",
+    )
     assert (Path("out") / "element.svg").is_file()
 
 
 def test_tile() -> None:
     """Test `tile` command."""
     run(
-        COMMANDS["tile"] + ["--cache", "tests/data"],
-        b"INFO Tile is drawn to out/tiles/tile_18_160199_88904.svg.\n"
+        COMMAND_LINES["tile"] + ["--cache", "tests/data"],
+        LOG + b"INFO Tile is drawn to out/tiles/tile_18_160199_88904.svg.\n"
         b"INFO SVG file is rasterized to out/tiles/tile_18_160199_88904.png.\n",
     )