improved tests

Author: daniel-sanche

proto/message.py

@@ -951,6 +951,7 @@ def _message_to_map(
             warnings.warn(
                 "The argument `float_precision` has been removed from Protobuf 7.x.",
                 DeprecationWarning,
+                stacklevel=3,
             )
 
     return map_fn(cls.pb(instance), **kwargs)

tests/test_json.py

@@ -253,34 +253,33 @@ class Squid(proto.Message):
     assert re.search(r"massKg.*name", j)
 
 
-pytest.skipif(
-    int(proto.message._PROTOBUF_MAJOR_VERSION) >= 7,
-    "float_precision removed in protobuf 7.x"
-)
 def test_json_float_precision():
+    if int(proto.message._PROTOBUF_MAJOR_VERSION) >= 7:
+        pytest.skip("float_precision was removed in protobuf 7.x")
+
     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.14159265)
+    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}'
 
-pytest.skipif(
-    int(proto.message._PROTOBUF_MAJOR_VERSION) < 7,
-    "unsupported protobuf version for test"
-)
+
 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.14159265)
+    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.14159265}'
+    assert j == '{"name": "Steve", "massKg": 3.141592}'
 
     assert len(warnings) == 1
     assert "`float_precision` has been removed" in warnings[0].message.args[0]

tests/test_message.py

@@ -326,17 +326,36 @@ class Color(proto.Enum):
         )
 
 
-# TODO: https://github.com/googleapis/proto-plus-python/issues/390
 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")
+
     class Squid(proto.Message):
         mass_kg = proto.Field(proto.FLOAT, number=1)
 
-    s = Squid(mass_kg=3.14159265)
+    s = Squid(mass_kg=3.141592)
 
     s_dict = Squid.to_dict(s, float_precision=3)
     assert s_dict["mass_kg"] == 3.14
 
 
+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)
+        assert s_dict["mass_kg"] == pytest.approx(3.141592)
+
+    assert len(warnings) == 1
+    assert "`float_precision` has been removed" in warnings[0].message.args[0]
+
+
 def test_unknown_field_deserialize():
     # This is a somewhat common setup: a client uses an older proto definition,
     # while the server sends the newer definition. The client still needs to be