Align test sources more nicely with implementation

Co-authored-by: Claude <noreply@anthropic.com>

Author: ctrueden

bin/api.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 uv run stubgen --include-private -p appose -o api/
-uv run stubgen --include-private -o api tests/*.py
+uv run stubgen --include-private -o api tests/*.py tests/*/*.py
 
 # Transform .pyi inputs to .api outputs.
 # The .api files are merely lightly postprocessed stub files to

tests/builder/__init__.py

@@ -35,11 +35,11 @@
 from appose.builder import DynamicBuilder
 from appose.builder.mamba import MambaBuilder
 
-from .test_builder_base import cowsay_and_assert
+from tests.test_base import cowsay_and_assert
 
 
 # Get the path to test resources
-TEST_RESOURCES = Path(__file__).parent / "resources" / "envs"
+TEST_RESOURCES = Path(__file__).parent.parent / "resources" / "envs"
 
 
 def test_explicit_mamba_builder():

tests/test_mamba_builder.py tests/builder/test_mamba.pytests/test_mamba_builder.py renamed to tests/builder/test_mamba.py

@@ -37,11 +37,11 @@
 from appose.builder import DynamicBuilder
 from appose.builder.pixi import PixiBuilder
 
-from .test_builder_base import cowsay_and_assert
+from tests.test_base import cowsay_and_assert
 
 
 # Get the path to test resources
-TEST_RESOURCES = Path(__file__).parent / "resources" / "envs"
+TEST_RESOURCES = Path(__file__).parent.parent / "resources" / "envs"
 
 
 def test_conda():

tests/test_pixi_builder.py tests/builder/test_pixi.pytests/test_pixi_builder.py renamed to tests/builder/test_pixi.py

@@ -36,7 +36,7 @@
 
 from appose.builder import SimpleBuilder
 
-from .test_builder_base import assert_complete, maybe_debug
+from tests.test_base import assert_complete, maybe_debug
 
 
 def test_custom():

tests/test_simple_builder.py tests/builder/test_simple.pytests/test_simple_builder.py renamed to tests/builder/test_simple.py

@@ -34,11 +34,11 @@
 
 from appose.builder.uv import UvBuilder
 
-from .test_builder_base import cowsay_and_assert
+from tests.test_base import cowsay_and_assert
 
 
 # Get the path to test resources
-TEST_RESOURCES = Path(__file__).parent / "resources" / "envs"
+TEST_RESOURCES = Path(__file__).parent.parent / "resources" / "envs"
 
 
 def test_uv():

tests/test_uv_builder.py tests/builder/test_uv.pytests/test_uv_builder.py renamed to tests/builder/test_uv.py

@@ -37,11 +37,11 @@
 from appose.builder.mamba import MambaBuilder
 from appose.builder.pixi import PixiBuilder
 
-from .test_builder_base import cowsay_and_assert
+from tests.test_base import cowsay_and_assert
 
 
 # Get the path to test resources
-TEST_RESOURCES = Path(__file__).parent / "resources" / "envs"
+TEST_RESOURCES = Path(__file__).parent.parent / "resources" / "envs"
 
 
 def test_wrap_pixi():

tests/test_wrap.py tests/builder/test_wrap.pytests/test_wrap.py renamed to tests/builder/test_wrap.py

@@ -105,14 +105,20 @@ def __init__(self, event):
         assert update.status == TaskStatus.RUNNING
         assert update.message == f"[{i}] -> {v}"
         assert update.current == i
-        assert update.maximum == 0
+        assert (
+            update.maximum is None or update.maximum == 0
+        )  # Python uses None, Java uses 0
         assert update.error is None
 
     completion = events[92]
     assert completion.response_type == ResponseType.COMPLETION
     assert completion.message is None  # no message from non-UPDATE response
-    assert completion.current == 0  # no current from non-UPDATE response
-    assert completion.maximum == 0  # no maximum from non-UPDATE response
+    assert (
+        completion.current is None or completion.current == 0
+    )  # Python uses None, Java uses 0
+    assert (
+        completion.maximum is None or completion.maximum == 0
+    )  # Python uses None, Java uses 0
     assert completion.error is None