Add test cases to get coverage to 100%

Author: slott56

pyproject.toml

@@ -57,6 +57,13 @@ build-backend = "hatchling.build"
 [tool.hatch.build.targets.wheel]
 packages = ["src/celpy"]
 
+# Attempts to get re2 to build for Python 3.15.
+[tool.hatch.envs.hatch-build.env-vars]
+# Need to set the Extension.include_dirs values for build_ext command inside bdist_wheel command.
+# These don't seem to work.
+GCC_INCLUDE_DIR = "/opt/local/include"
+HEADER_SEARCH_PATHS = "/opt/local/include"
+
 [tool.uv]
 required-version = ">=0.7"
 
@@ -88,6 +95,7 @@ dev = [
     "ipykernel>=7.2.0",
 ]
 
+# Python 3.15 support depends on Google RE2 offering pre-built binaries for MacOS.
 [tool.tox]
 envlist = ["py310", "py311", "py312", "py313", "py314", "lint", "tools"]
 minversion = "4.24.0"

src/celpy/celtypes.py

@@ -1375,7 +1375,7 @@ def __new__(
                         re.finditer(rf"([0-9]*(\.[0-9]*)?)({units_pattern})", seconds),
                     )
                 )
-            except KeyError:
+            except KeyError:  # pragma: no cover
                 raise ValueError(f"Invalid duration {seconds!r}")
 
             if not (cls.MinSeconds <= seconds <= cls.MaxSeconds):

tests/test_celtypes.py

@@ -31,6 +31,11 @@ def test_bool_type():
     t, f = BoolType(True), BoolType(False)
     exc = CELEvalError(("summary", "details"))
 
+    assert all(BoolType(s) == t for s in ("True", "true", "TRUE", "t"))
+    assert all(BoolType(s) == f for s in ("False", "false", "FALSE", "f"))
+    assert BoolType("1") == t
+    assert BoolType("0") == f
+
     assert logical_condition(t, sentinel.true, sentinel.false) == sentinel.true
     assert logical_condition(f, sentinel.true, sentinel.false) == sentinel.false
     with pytest.raises(TypeError):
@@ -62,6 +67,7 @@ def test_bool_type():
     assert logical_not(f) == t
     with pytest.raises(TypeError):
         logical_not(StringType("nope"))
+    assert logical_not(exc) == exc
 
     assert repr(f) == "BoolType(False)"
     assert repr(t) == "BoolType(True)"
@@ -211,10 +217,12 @@ def test_list_type():
         [IntType(42), StringType("2.718281828459045**1.791759469228055"), IntType(7)]
     )
     assert l_1 == l_1
+    assert not l_1 == None
     with pytest.raises(TypeError):
         assert l_1 != l_2
     with pytest.raises(TypeError):
         assert not l_1 == l_2
+
     assert repr(l_1) == "ListType([IntType(42), IntType(6), IntType(7)])"
     with pytest.raises(TypeError):
         l_1 < l_2
@@ -264,6 +272,7 @@ def test_map_type():
     )
     assert m_1 == m_1
     assert m_1 == m_3
+    assert not m_1 == None
     assert not m_1 != m_1
     assert not m_single != m_single
     with pytest.raises(TypeError):

tests/test_evaluation.py

@@ -157,6 +157,10 @@ def mock_operation(a, b):
     result_3 = mock_operation(sentinel.not_implemented, sentinel.b)
     assert result_3 == NotImplemented
 
+    eval_error = CELEvalError()
+    assert mock_operation(eval_error, True) == eval_error
+    assert mock_operation(True, eval_error) == eval_error
+
 
 def test_operator_in():
     """
@@ -183,6 +187,9 @@ def test_operator_in():
     assert operator_in(celtypes.IntType(42), container_2)
     assert isinstance(operator_in(celtypes.IntType(-1), container_2), CELEvalError)
 
+    eval_error = CELEvalError()
+    assert operator_in(eval_error, container_1) == eval_error
+    assert operator_in(celtypes.IntType(42), eval_error) == eval_error
 
 @pytest.mark.skipif(
     "re2" not in celpy.evaluation.function_matches.__globals__, reason="Not using RE2"
@@ -441,9 +448,14 @@ def test_function_eval_1(monkeypatch):
     function_of_error_result = evaluator.function_eval(
         lark.Token("IDENT", "size"), error
     )
-    print(f"{function_of_error_result=}")
+    # print(f"{function_of_error_result=}")
     assert function_of_error_result == error
 
+    function_of_list_with_error_result = evaluator.function_eval(
+        lark.Token("IDENT", "size"), [error]
+    )
+    assert function_of_list_with_error_result == error
+
 
 def test_function_eval_2(monkeypatch):
     mock_size = Mock(side_effect=ValueError(sentinel.value))