[Modeling-cvs] ProjectModeling/Modeling/tests test_EditingContext_Global.py,1.23,1.24 test_KeyValueCoding.py,1.2,1.3

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv17906/Modeling/tests

Modified Files:
	test_EditingContext_Global.py test_KeyValueCoding.py 
Log Message:
API change (see mailing-list archives): Added EditingContext.insert(),
delete(), fetch(), fetchCOunt(), autoInsertion(), setAutoInsertion(). Added
CustomObject.globalID(). Added KeyValueCoding.valuesForKeys().

Deprecated methods KeyValueCoding.setValueForKey(), setValueForKeyPath(),
setStoredValueForKey() (will be removed in v0.9.1)


Index: test_EditingContext_Global.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_EditingContext_Global.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test_EditingContext_Global.py	19 Jun 2003 14:19:02 -0000	1.23
--- test_EditingContext_Global.py	3 Jul 2003 23:03:38 -0000	1.24
***************
*** 164,167 ****
--- 164,176 ----
      self.failIf(adaptorChannel.isOpen())
  
+   def test_01d_fetch(self):
+     "[EditingContext] fetch == objectsWithFetchSpecification"
+     ec=EditingContext()
+     qualifier=qualifierWithQualifierFormat('lastName like "?a*"')
+     fetchSpec=FetchSpecification(entityName='Writer', qualifier=qualifier)
+     objects_1=ec.objectsWithFetchSpecification(fetchSpec)
+     objects_2=ec.fetch('Writer')
+     self.failIf([o for o in objects_1 if o not in objects_2])
+     
    def test_02_toOneFaultTrigger(self):
      "[EditingContext] toOneFaultTrigger"
***************
*** 373,376 ****
--- 382,388 ----
      self.failIf(hugo_gID.isTemporary())
      self.failIf(ec.objectForGlobalID(hugo_temp_gID))
+ 
+     ## since we're here, check CustomObject.globalID
+     self.assertEqual(hugo_gID, hugo.globalID())
      
      ## check that DB snapshots are updated as expected
***************
*** 766,769 ****
--- 778,790 ----
      self.failIf(adaptorChannel.isOpen())
      
+   def test_13c_fetchCount(self):
+     "[EditingContext] fetchCount == objectsCountWithFetchSpecification"
+     q=qualifierWithQualifierFormat('lastName like "?a*"')
+     fs=FetchSpecification(entityName='Writer', qualifier=q)
+     ec=EditingContext()
+     self.assertEqual(ec.objectsCountWithFetchSpecification(fs),
+                      ec.fetchCount('Writer', 'lastName like "?a*"'))
+     print ec.fetchCount('Writer', 'lastName like "?a*"')
+ 
    def test_14_qualifierWithNullValue(self):
      "[EditingContext] objectsWithFetchSpec. & NULL value"

Index: test_KeyValueCoding.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_KeyValueCoding.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_KeyValueCoding.py	10 Jan 2003 10:45:45 -0000	1.2
--- test_KeyValueCoding.py	3 Jul 2003 23:03:38 -0000	1.3
***************
*** 151,155 ****
      "[KeyValueCoding] Tests valueForKeyPath()"
      c=C()
-     #import pdb ; pdb.set_trace()
      a=A()
      self.assertEqual(a.valueForKeyPath('attribute_one'), "I'm the one")
--- 151,154 ----
***************
*** 169,173 ****
      "[KeyValueCoding] Tests takeValueForKeyPath()"
      c=C()
-     #import pdb ; pdb.set_trace()
      c.takeValueForKeyPath('number 1', 'b2.toA.attribute_one')
      self.assertEqual(c.valueForKeyPath('b2.toA.attribute_one'), "number 1")
--- 168,171 ----
***************
*** 177,180 ****
--- 175,190 ----
      self.assertEqual(c.valueForKeyPath('b1.toA.attribute_one'), "number 3")
    
+   def test_07_valuesForKeys(self):
+     "[KeyValueCoding] Tests (stored)valuesForKeys"
+     t=KVC_TestClass()
+     self.assertEqual(t.valuesForKeys(('attr0','attr4','attr1','attr3')),
+                                      [0, 4, 1, 3])
+     t.takeValuesFromDictionary({'attr0':60,'attr4':44,'attr1':71,'attr3':93})
+     self.assertEqual(t.valuesForKeys(('attr0','attr1','attr3','attr4')),
+                                      [60, 71, 93, 44])
+     t.takeStoredValuesFromDictionary({'attr0':20,'attr4':14,'attr1':41,'attr3':73})
+     self.assertEqual(t.valuesForKeys(('attr0','attr1','attr3','attr4')),
+                                      [20, 41, 73, 14])
+ 
    def test_private(self):
      "[KeyValueCoding] Tests that 1 is equal to 1"