to fix system tests, return None if no meaning or submeanings

Author: daniel-sanche

google/cloud/datastore/helpers.py

@@ -58,7 +58,11 @@ def _get_meaning(value_pb, is_list=False):
         sub_meanings = [sub_value_pb.meaning or None for sub_value_pb in values]
         if not any(meaning is not None for meaning in sub_meanings):
             sub_meanings = None
-        return root_meaning, sub_meanings
+        if root_meaning is None and sub_meanings is None:
+            # no meanings to save
+            return None
+        else:
+            return root_meaning, sub_meanings
     else:
         return value_pb.meaning or None
 
@@ -173,6 +177,10 @@ def _set_pb_meaning_from_entity(entity, name, value, value_pb, is_list=False):
     if orig_value is not value:
         return
 
+    # break early if no meaning data to set
+    if meaning is None:
+        return
+
     # For lists, we set meaning on each sub-element.
     if is_list:
         root_meaning, sub_meaning_list = meaning
@@ -184,7 +192,7 @@ def _set_pb_meaning_from_entity(entity, name, value, value_pb, is_list=False):
             ):
                 if sub_meaning is not None:
                     sub_value_pb.meaning = sub_meaning
-    elif meaning is not None:
+    else:
         value_pb.meaning = meaning
 
 

tests/unit/test_helpers.py

@@ -1164,7 +1164,7 @@ def test__get_meaning_w_empty_array_value():
     value_pb._pb.array_value.values.pop()
 
     result = _get_meaning(value_pb, is_list=True)
-    assert result == (None, None)
+    assert result is None
 
 
 def test__get_meaning_w_array_value():
@@ -1271,11 +1271,12 @@ def test__get_meaning_w_array_value_meaning_fully_unset():
     sub_value_pb2.string_value = "bye"
 
     result = _get_meaning(value_pb, is_list=True)
-    assert result == (None, None)
+    assert result is None
 
 
-@pytest.mark.parametrize("orig_meaning_data", [0, 1])
-def test__set_pb_meaning_w_array_value_fully_unset(orig_meaning_data):
+@pytest.mark.parametrize("orig_root_meaning", [0,1])
+@pytest.mark.parametrize("orig_sub_meaning", [0,1])
+def test__set_pb_meaning_w_array_value_fully_unset(orig_root_meaning, orig_sub_meaning):
     """
     call _set_pb_meaning_from_entity with meaning=None data.
     Should not touch proto's meaning field
@@ -1286,15 +1287,35 @@ def test__set_pb_meaning_w_array_value_fully_unset(orig_meaning_data):
 
     orig_pb = entity_pb2.Entity()
     value_pb = orig_pb._pb.properties.get_or_create("value")
-    value_pb.meaning = orig_meaning_data
+    value_pb.meaning = orig_root_meaning
     sub_value_pb1 = value_pb.array_value.values.add()
-    sub_value_pb1.meaning = orig_meaning_data
+    sub_value_pb1.meaning = orig_sub_meaning
 
     entity = Entity(key="key")
     entity._meanings = {"value": ((None, None), None)}
     _set_pb_meaning_from_entity(entity, "value", None, value_pb, is_list=True)
-    assert value_pb.meaning == orig_meaning_data
-    assert value_pb.array_value.values[0].meaning == orig_meaning_data
+    assert value_pb.meaning == orig_root_meaning
+    assert value_pb.array_value.values[0].meaning == orig_sub_meaning
+
+
+@pytest.mark.parametrize("orig_meaning", [0, 1])
+def test__set_pb_meaning_w_value_unset(orig_meaning):
+    """
+    call _set_pb_meaning_from_entity with meaning=None data.
+    Should not touch proto's meaning field
+    """
+    from google.cloud.datastore_v1.types import entity as entity_pb2
+    from google.cloud.datastore.helpers import _set_pb_meaning_from_entity
+    from google.cloud.datastore.entity import Entity
+
+    orig_pb = entity_pb2.Entity()
+    value_pb = orig_pb._pb.properties.get_or_create("value")
+    value_pb.meaning = orig_meaning
+
+    entity = Entity(key="key")
+    entity._meanings = {"value": (None, None)}
+    _set_pb_meaning_from_entity(entity, "value", None, value_pb, is_list=False)
+    assert value_pb.meaning == orig_meaning
 
 
 def test__array_w_meaning_end_to_end():