@@ -165,28 +165,38 @@ class Model2(models.DomainModel):
165165 field = Model1 .field
166166
167167 def test_get_method (self ):
168+ mock_id = 2
169+ mock_name = 'foobar'
170+
168171 class SomeModel (models .DomainModel ):
169172 """Test domain model."""
170173 id = fields .Int ()
171174 name = fields .String ()
172- not_required = fields .String ()
175+ string = fields .String ()
176+
177+ model = SomeModel (id = mock_id , name = mock_name )
173178
174- model = SomeModel ( )
175- model .id = 2
176- model .name = 'some-name'
179+ self . assertEqual ( model . get ( 'id' ), mock_id )
180+ self . assertEqual ( model .get ( 'id' , 0 ), mock_id )
181+ self . assertEqual ( model .get ( 'id' , 123 ), mock_id )
177182
178- id = model .get ('id' , 0 )
179- self .assertEqual (id , 2 )
183+ self .assertEqual (model .get ('name' ), mock_name )
184+ self .assertEqual (model .get ('name' , '' ), mock_name )
185+ self .assertEqual (model .get ('name' , 'another-name' ), mock_name )
180186
181- name = model .get ('name' , '' )
182- self .assertEqual (name , 'some-name' )
187+ self .assertEqual (model .get ('string' ), None )
188+ self .assertEqual (model .get ('string' , '' ), '' )
189+ self .assertEqual (model .get ('string' , 'not-empty' ), 'not-empty' )
183190
184- not_required = model .get ('not_required ' , '' )
185- self .assertEqual (not_required , '' )
191+ string = model .get ('string ' , '' )
192+ self .assertEqual (string , '' )
186193
187194 with self .assertRaises (AttributeError ):
188195 model .get ('unknown' )
189196
197+ with self .assertRaises (AttributeError ):
198+ model .get ('string' , 0 )
199+
190200
191201class ModelReprTests (unittest .TestCase ):
192202 """Tests for model Pythonic representation."""
0 commit comments