Added new pagesizes tests.

Author: domdfcoding

.isort.cfg

@@ -1,7 +1,7 @@
 [settings]
 line_length = 115
-indent = Tab
-multi_line_output = 3
+indent = "		"
+multi_line_output = 8
 import_heading_stdlib = stdlib
 import_heading_thirdparty = 3rd party
 import_heading_firstparty = this package
@@ -16,6 +16,7 @@ known_third_party =
     colorama
     coverage
     coverage_pyver_pragma
+    faker
     github
     pydash
     pytest

tests/requirements.txt

@@ -1,8 +1,8 @@
-coverage>=5.1
-coverage_pyver_pragma>=0.0.1
+coverage >=5.1
+coverage_pyver_pragma >=0.0.2
 faker
-pytest>=6.0.0rc1
-pytest-cov>=2.8.1
-pytest-randomly>=3.3.1
-pytest-rerunfailures>=9.0
-pytz>=2019.1
+pytest >=6.0.0rc1
+pytest-cov >=2.8.1
+pytest-randomly >=3.3.1
+pytest-rerunfailures >=9.0
+pytz >=2019.1

tests/test_pagesizes.py

@@ -6,50 +6,169 @@
 
 """
 
+# stdlib
+from math import isclose
+
 # 3rd party
 import pytest
 
 # this package
-from domdf_python_tools.pagesizes import A4, BaseSize, inch, mm, parse_measurement, sizes
+from domdf_python_tools.pagesizes import (
+		A0,
+		A1,
+		A2,
+		A3,
+		A4,
+		A5,
+		A6,
+		BaseSize,
+		PageSize,
+		Size_cm,
+		Size_inch,
+		Size_mm,
+		Size_pica,
+		Size_um,
+		cm,
+		convert_from,
+		inch,
+		mm,
+		parse_measurement,
+		pc,
+		pt,
+		sizes,
+		um
+		)
+
+
+@pytest.mark.parametrize(
+		"obj, expects",
+		[
+				(
+						Size_inch(12, 34),
+						"Size_inch(width=<Unit '12.000 inch': 864.000pt>, height=<Unit '34.000 inch': 2448.000pt>)"
+						),
+				(
+						Size_cm(12, 34),
+						"Size_cm(width=<Unit '12.000 cm': 340.157pt>, height=<Unit '34.000 cm': 963.780pt>)"
+						),
+				(
+						Size_mm(12, 34),
+						"Size_mm(width=<Unit '12.000 mm': 34.016pt>, height=<Unit '34.000 mm': 96.378pt>)"
+						),
+				(
+						Size_um(12, 34),
+						"Size_um(width=<Unit '12.000 µm': 0.034pt>, height=<Unit '34.000 µm': 0.096pt>)"
+						),
+				(
+						Size_pica(12, 34),
+						"Size_pica(width=<Unit '12.000 pc': 144.000pt>, height=<Unit '34.000 pc': 408.000pt>)"
+						),
+				]
+		)
+def test_repr(obj, expects):
+	assert repr(obj) == expects
+
+
+@pytest.mark.parametrize(
+		"obj, expects",
+		[
+				(Size_mm(12, 34), "Size_mm(width=12, height=34)"),
+				(Size_cm(12, 34), "Size_cm(width=12, height=34)"),
+				(Size_mm(12, 34), "Size_mm(width=12, height=34)"),
+				(Size_um(12, 34), "Size_um(width=12, height=34)"),
+				(Size_pica(12, 34), "Size_pica(width=12, height=34)"),
+				]
+		)
+def test_str(obj, expects):
+	assert str(obj) == expects
+
 
+@pytest.mark.parametrize("size", [A6, A5, A4, A3, A2, A1, A0])
+def test_orientation(size):
+	assert size.is_portrait()
+	assert size.portrait().is_portrait()
+	assert size.landscape().portrait().is_portrait()
+	assert size.landscape().portrait() == size
+	assert size.landscape().is_landscape()
 
-def test_orientation():
-	assert A4.is_portrait()
-	assert A4.portrait().is_portrait()
-	assert A4.landscape().portrait().is_portrait()
-	assert A4.landscape().portrait() == A4
-	assert A4.landscape().is_landscape()
+
+def test_base_size():
 	assert BaseSize(10, 5) == (10, 5)
 	assert BaseSize(10, 5).landscape() == (10, 5)
 	assert BaseSize(10, 5).portrait() == (5, 10)
 
 
-def test_parse_measurement():
-	assert parse_measurement("12mm") == 12 * mm
-	assert parse_measurement("12 mm") == 12 * mm
-	assert parse_measurement("12.34 mm") == 12.34 * mm
-	assert parse_measurement("5inch") == 5 * inch
-	assert parse_measurement("5in") == 5 * inch
+def test_is_square():
+	assert BaseSize(10, 10).is_square()
+	assert BaseSize(5, 5).is_square()
+	assert Size_mm(5, 5).is_square()
+	assert Size_um(5, 5).is_square()
+	assert Size_inch(5, 5).is_square()
+
+
+@pytest.mark.parametrize("unit", [pt, inch, cm, mm, um, pc])
+def test_convert_size(unit):
+	size = PageSize(12, 34, unit)
+	unit_str = unit.name
+	if unit_str == "µm":
+		unit_str = "um"
+	assert isclose(getattr(size, unit_str)[0], 12, abs_tol=1e-8)
+	assert isclose(getattr(size, unit_str)[1], 34, abs_tol=1e-8)
+
+
+#
+# def test_parse_measurement():
+# 	assert parse_measurement("12mm") == (12 * mm).as_pt()
+# 	assert parse_measurement("12 mm") == (12 * mm).as_pt()
+# 	assert parse_measurement("12.34 mm") == (12.34 * mm).as_pt()
+# 	assert parse_measurement("5inch") == (5 * inch).as_pt()
+# 	assert parse_measurement("5in") == (5 * inch).as_pt()
+#
+#
+# @pytest.mark.parametrize(
+# 		"size, expected",
+# 		[
+# 				(sizes.A0, (841, 1189)),
+# 				(sizes.A1, (594, 841)),
+# 				(sizes.A2, (420, 594)),
+# 				(sizes.A3, (297, 420)),
+# 				(sizes.A4, (210, 297)),
+# 				(sizes.A5, (148, 210)),
+# 				(sizes.A6, (105, 148)),
+# 				(sizes.A7, (74, 105)),
+# 				(sizes.A8, (52, 74)),
+# 				(sizes.A9, (37, 52)),
+# 				(sizes.A10, (26, 37)),
+# 				]
+# 		)
+# def test_sizes(size, expected):
+# 	assert size.mm == expected
+#
+#
+# # TODO: tests for Unit
+#
+def test_convert_from():
+	assert convert_from(1, pt) == 1
+	assert convert_from(1, inch) == 72
+	assert convert_from(1, cm) == 28.3464566929
+	assert convert_from(1, mm) == 2.83464566929
+	assert convert_from(1, um) == 0.00283464566929
+	assert convert_from(1, pc) == 12
+
+	assert convert_from(5, pt) == 1 * 5
+	assert convert_from(5, inch) == 72 * 5
+	assert convert_from(5, cm) == 28.3464566929 * 5
+	assert convert_from(5, mm) == 2.83464566929 * 5
+	assert convert_from(5, um) == 0.00283464566929 * 5
+	assert convert_from(5, pc) == 12 * 5
 
 
 @pytest.mark.parametrize(
-		"size, expected",
-		[
-				(sizes.A0, (841, 1189)),
-				(sizes.A1, (594, 841)),
-				(sizes.A2, (420, 594)),
-				(sizes.A3, (297, 420)),
-				(sizes.A4, (210, 297)),
-				(sizes.A5, (148, 210)),
-				(sizes.A6, (105, 148)),
-				(sizes.A7, (74, 105)),
-				(sizes.A8, (52, 74)),
-				(sizes.A9, (37, 52)),
-				(sizes.A10, (26, 37)),
+		"size, expected, class_", [
+				((12, 34), PageSize(12, 34), PageSize),
+				((12, 34), Size_mm(12, 34), Size_mm),
 				]
 		)
-def test_sizes(size, expected):
-	assert size.mm == expected
-
-
-# TODO: tests for Unit
+def test_from_size(size, expected, class_):
+	print(class_.from_size(size))
+	assert class_.from_size(size) == expected

tox.ini

@@ -192,7 +192,8 @@ namespace_packages = True
 
 
 [coverage:run]
-plugins = coverage_pyver_pragma
+plugins =
+	coverage_pyver_pragma
 
 
 [check-wheel-contents]