Increase test coverage and minor fixes

Author: domdfcoding

dict2css/serializer.py

@@ -194,9 +194,10 @@ def default(self, obj: Any) -> Serializable:
 		:raises: ValueError: If the object cannot be serialized
 		"""
 
-		if self._default is not None:
+		if self._default is not None:  # pragma no cover  # TODO
 			return self._default(obj)
-		raise ValueError(f"Object of type {obj.__class__.__name__} is not JSON serializable")
+
+		raise ValueError(f"Object of type {obj.__class__.__name__} cannot be represented in CSS")
 
 	def _encode_float(self, obj: float) -> str:
 		if obj != obj or obj == float("inf") or obj == float("-inf"):
@@ -252,8 +253,7 @@ def _iterencode_list(
 		from dict2css import IMPORTANT
 
 		if not obj:
-			yield "[]"
-			return
+			raise ValueError("Property cannot be empty")
 
 		if self._markers is not None:
 			marker_id: Optional[int] = id(obj)

tests/test_dict2css.py

@@ -1,4 +1,5 @@
 # stdlib
+from ipaddress import IPv4Address
 from typing import Dict, Mapping, MutableMapping
 
 # 3rd party
@@ -9,33 +10,105 @@
 
 # this package
 from dict2css import IMPORTANT, Style, dump, dumps, load, loads
-from dict2css.helpers import em, rem
+from dict2css.helpers import em, px, rem
 
 
-@pytest.mark.parametrize("trailing_semicolon", [True, False])
-@pytest.mark.parametrize("indent_closing_brace", [True, False])
-@pytest.mark.parametrize("indent", [TAB, "  ", "    "])
+def boolean_option(name: str, id: str):  # noqa: A002,MAN002  # pylint: disable=redefined-builtin
+	return pytest.mark.parametrize(
+			name,
+			[
+					pytest.param(True, id=id),
+					pytest.param(False, id=f"not {id}"),
+					],
+			)
+
+
+def test_dumps_not_mapping():
+	with pytest.raises(TypeError, match="Cannot convert .* to CSS"):
+		dumps([1, 2, 3])
+
+	with pytest.raises(TypeError, match="Cannot convert .* to CSS"):
+		dumps((1, 2, 3))
+
+	with pytest.raises(TypeError, match="Cannot convert .* to CSS"):
+		dumps("ABC")
+
+	with pytest.raises(TypeError, match="Cannot convert .* to CSS"):
+		dumps(123)
+
+	with pytest.raises(TypeError, match="Cannot convert .* to CSS"):
+		dumps(123.456)
+
+	with pytest.raises(TypeError, match="Cannot convert .* to CSS"):
+		dumps(True)
+
+	with pytest.raises(TypeError, match="Cannot convert .* to CSS"):
+		dumps(None)
+
+
+def test_dumps_unknown_type():
+	with pytest.raises(ValueError, match="Object of type .* cannot be represented in CSS"):
+		dumps({"the_key": None})
+
+	with pytest.raises(ValueError, match="Object of type .* cannot be represented in CSS"):
+		dumps({"the_key": IPv4Address("127.0.0.1")})
+
+
+def test_dumps_bad_floats():
+	with pytest.raises(ValueError, match="Out of range float values are not allowed:"):
+		dumps({"the_key": float("inf")})
+
+	with pytest.raises(ValueError, match="Out of range float values are not allowed:"):
+		dumps({"the_key": float("-inf")})
+
+	with pytest.raises(ValueError, match="Out of range float values are not allowed:"):
+		dumps({"the_key": float("nan")})
+
+
+@boolean_option("check_circular", "check_circular")
+@boolean_option("sort_keys", "sort_keys")
+@boolean_option("trailing_semicolon", "trailing_semicolon")
+@boolean_option("indent_closing_brace", "indent_closing_brace")
+@pytest.mark.parametrize(
+		"indent",
+		[
+				pytest.param(TAB, id="tab"),
+				pytest.param("  ", id='2'),
+				pytest.param("    ", id='4'),
+				pytest.param('', id='0'),
+				],
+		)
 def test_dumps(
 		advanced_file_regression: AdvancedFileRegressionFixture,
 		trailing_semicolon: bool,
 		indent_closing_brace: bool,
 		indent: str,
+		check_circular: bool,
+		sort_keys: bool,
 		tmp_pathplus: PathPlus,
 		):
 	stylesheet: Dict[str, Style] = {
-			".wy-nav-content": {"max-width": (rem(1200), IMPORTANT)},
+			".wy-nav-content": {"max-width": (rem(1200), IMPORTANT), "z-index": 999},
 			"li p:last-child": {
 					"margin-bottom": (em(12), IMPORTANT),
 					"margin-top": em(6),
+					"font-size": px(14),
+					"line-height": 1.5,
+					"font-weight": (800, IMPORTANT),
 					},
 			"html": {"scroll-behavior": "smooth"},
 			}
 
+	# TODO
+	sort_keys = False
+
 	css = dumps(
 			stylesheet,
 			indent=indent,
 			trailing_semicolon=trailing_semicolon,
 			indent_closing_brace=indent_closing_brace,
+			check_circular=check_circular,
+			sort_keys=sort_keys,
 			)
 	advanced_file_regression.check(css, extension=".css")
 

tests/test_dict2css_/test_dumps_0_indent_closing_brace_not_trailing_semicolon_not_sort_keys_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999}
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important}
+html {scroll-behavior: smooth}

tests/test_dict2css_/test_dumps_0_indent_closing_brace_not_trailing_semicolon_not_sort_keys_not_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999}
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important}
+html {scroll-behavior: smooth}

tests/test_dict2css_/test_dumps_0_indent_closing_brace_not_trailing_semicolon_sort_keys_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999}
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important}
+html {scroll-behavior: smooth}

tests/test_dict2css_/test_dumps_0_indent_closing_brace_not_trailing_semicolon_sort_keys_not_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999}
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important}
+html {scroll-behavior: smooth}

tests/test_dict2css_/test_dumps_0_indent_closing_brace_trailing_semicolon_not_sort_keys_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999; }
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important; }
+html {scroll-behavior: smooth; }

tests/test_dict2css_/test_dumps_0_indent_closing_brace_trailing_semicolon_not_sort_keys_not_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999; }
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important; }
+html {scroll-behavior: smooth; }

tests/test_dict2css_/test_dumps_0_indent_closing_brace_trailing_semicolon_sort_keys_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999; }
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important; }
+html {scroll-behavior: smooth; }

tests/test_dict2css_/test_dumps_0_indent_closing_brace_trailing_semicolon_sort_keys_not_check_circular_.css

@@ -0,0 +1,3 @@
+.wy-nav-content {max-width: 1200rem !important; z-index: 999; }
+li p:last-child {margin-bottom: 12em !important; margin-top: 6em; font-size: 14px; line-height: 1.5; font-weight: 800 !important; }
+html {scroll-behavior: smooth; }