simplified tests

Author: daniel-sanche

tests/test_json.py

@@ -253,9 +253,12 @@ class Squid(proto.Message):
     assert re.search(r"massKg.*name", j)
 
 
-def test_json_float_precision():
-    if int(proto.message._PROTOBUF_MAJOR_VERSION) >= 7:
-        pytest.skip("float_precision was removed in protobuf 7.x")
+@pytest.mark.parametrize("expect_proto_7_plus", [True, False])
+def test_json_float_precision(expect_proto_7_plus):
+    if ((expect_proto_7_plus and int(proto.message._PROTOBUF_MAJOR_VERSION) < 7)) or (
+        (not expect_proto_7_plus and int(proto.message._PROTOBUF_MAJOR_VERSION) >= 7)
+    ):
+        pytest.skip("installed proto version does not match test")
 
     class Squid(proto.Message):
         name = proto.Field(proto.STRING, number=1)
@@ -265,24 +268,12 @@ class Squid(proto.Message):
         s = Squid(name="Steve", mass_kg=3.141592)
         j = Squid.to_json(s, float_precision=3, indent=None)
 
-        assert j == '{"name": "Steve", "massKg": 3.14}'
     assert len(warnings) == 1
-    assert "`float_precision` will be removed" in warnings[0].message.args[0]
-
-
-def test_json_float_precision_7_plus():
-    if int(proto.message._PROTOBUF_MAJOR_VERSION) < 7:
-        pytest.skip("unsupported protobuf version for test")
-
-    class Squid(proto.Message):
-        name = proto.Field(proto.STRING, number=1)
-        mass_kg = proto.Field(proto.FLOAT, number=2)
-
-    s = Squid(name="Steve", mass_kg=3.141592)
-    with pytest.warns(DeprecationWarning) as warnings:
-        j = Squid.to_json(s, float_precision=3, indent=None)
 
-    assert j == '{"name": "Steve", "massKg": 3.141592}'
-
-    assert len(warnings) == 1
-    assert "`float_precision` was removed" in warnings[0].message.args[0]
+    # for protobuf <7, expect truncated float
+    if expect_proto_7_plus:
+        assert j == '{"name": "Steve", "massKg": 3.141592}'
+        assert "`float_precision` was removed" in warnings[0].message.args[0]
+    else:
+        assert j == '{"name": "Steve", "massKg": 3.14}'
+        assert "`float_precision` will be removed" in warnings[0].message.args[0]

tests/test_message.py

@@ -326,9 +326,12 @@ class Color(proto.Enum):
         )
 
 
-def test_serialize_to_dict_float_precision():
-    if int(proto.message._PROTOBUF_MAJOR_VERSION) >= 7:
-        pytest.skip("float_precision was removed in protobuf 7.x")
+@pytest.mark.parametrize("expect_proto_7_plus", [True, False])
+def test_serialize_to_dict_float_precision(expect_proto_7_plus):
+    if ((expect_proto_7_plus and int(proto.message._PROTOBUF_MAJOR_VERSION) < 7)) or (
+        (not expect_proto_7_plus and int(proto.message._PROTOBUF_MAJOR_VERSION) >= 7)
+    ):
+        pytest.skip("installed proto version does not match test")
 
     class Squid(proto.Message):
         mass_kg = proto.Field(proto.FLOAT, number=1)
@@ -337,26 +340,15 @@ class Squid(proto.Message):
 
     with pytest.warns(DeprecationWarning) as warnings:
         s_dict = Squid.to_dict(s, float_precision=3)
-        assert s_dict["mass_kg"] == 3.14
     assert len(warnings) == 1
     assert "`float_precision` will be removed" in warnings[0].message.args[0]
-
-
-def test_serialize_to_dict_float_precision_7_plus():
-    if int(proto.message._PROTOBUF_MAJOR_VERSION) < 7:
-        pytest.skip("unsupported protobuf version for test")
-
-    class Squid(proto.Message):
-        mass_kg = proto.Field(proto.FLOAT, number=1)
-
-    s = Squid(mass_kg=3.141592)
-
-    with pytest.warns(DeprecationWarning) as warnings:
-        s_dict = Squid.to_dict(s, float_precision=3)
+    # for protobuf <7, expect truncated float
+    if expect_proto_7_plus:
         assert s_dict["mass_kg"] == pytest.approx(3.141592)
-
-    assert len(warnings) == 1
-    assert "`float_precision` was removed" in warnings[0].message.args[0]
+        assert "`float_precision` was removed" in warnings[0].message.args[0]
+    else:
+        assert s_dict["mass_kg"] == pytest.approx(3.14)
+        assert "`float_precision` will be removed" in warnings[0].message.args[0]
 
 
 def test_unknown_field_deserialize():