@@ -677,28 +677,49 @@ class TestQueryRawEntityPBMethods(BaseQueryTestCase, unittest.TestCase):
677677 def test_fetch_entity_pb_client_none (self ):
678678 from google .cloud .datastore .query import Iterator
679679
680+ # 1. Client is explicitly None
680681 client = self ._make_client ()
681682 query = self ._make_one (client )
683+
682684 iterator = query .fetch_entity_pb (client = None )
683685
684686 self .assertIsInstance (iterator , Iterator )
685687 self .assertIs (iterator ._query , query )
686688 self .assertIs (iterator .client , client )
687689 self .assertIsNone (iterator .max_results )
688690 self .assertEqual (iterator ._offset , 0 )
691+ self .assertTrue (iterator .item_to_value )
692+ self .assertEqual (iterator .item_to_value ('a' , 'b' ), 'b' )
693+
694+ # 1. Client is implicitly None
695+ client = self ._make_client ()
696+ query = self ._make_one (client )
697+
698+ iterator = query .fetch_entity_pb ()
699+
700+ self .assertIsInstance (iterator , Iterator )
701+ self .assertIs (iterator ._query , query )
702+ self .assertIs (iterator .client , client )
703+ self .assertIsNone (iterator .max_results )
704+ self .assertEqual (iterator ._offset , 0 )
705+ self .assertTrue (iterator .item_to_value )
706+ self .assertEqual (iterator .item_to_value ('a' , 'b' ), 'b' )
689707
690708 def test_fetch_entity_pb_client_set (self ):
691709 from google .cloud .datastore .query import Iterator
692710
693711 client = self ._make_client ()
712+ other_client = self ._make_client ()
694713 query = self ._make_one (client )
695- iterator = query .fetch (limit = 7 , offset = 8 , client = client )
714+ iterator = query .fetch_entity_pb (limit = 7 , offset = 8 , client = other_client )
696715
697716 self .assertIsInstance (iterator , Iterator )
698717 self .assertIs (iterator ._query , query )
699- self .assertIs (iterator .client , client )
718+ self .assertIs (iterator .client , other_client )
700719 self .assertEqual (iterator .max_results , 7 )
701720 self .assertEqual (iterator ._offset , 8 )
721+ self .assertTrue (iterator .item_to_value )
722+ self .assertEqual (iterator .item_to_value ('a' , 'b' ), 'b' )
702723
703724
704725class _Query (object ):
0 commit comments