[Modeling-cvs] ProjectModeling/Modeling/tests test_EditingContext_Global_Inheritance.py,1.25,1.26

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

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15451/Modeling/tests

Modified Files:
	test_EditingContext_Global_Inheritance.py 
Log Message:
Fixed: Attribute.convertStringToAttributeType() failed when python db-adapters, such as mysqldb, already return values under the a date type


Index: test_EditingContext_Global_Inheritance.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_EditingContext_Global_Inheritance.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** test_EditingContext_Global_Inheritance.py	20 Jul 2004 06:21:57 -0000	1.25
--- test_EditingContext_Global_Inheritance.py	25 Feb 2006 15:46:25 -0000	1.26
***************
*** 621,626 ****
      self.assertEqual(len(emp2.getHolidays()), 1)
      h2b=emp2.getHolidays()[0]
!     self.assertEqual(sd2, h2b.getStartDate())
!     self.assertEqual(ed2, h2b.getEndDate())
      #print db.snapshotForGlobalID(h_gid)
      
--- 621,635 ----
      self.assertEqual(len(emp2.getHolidays()), 1)
      h2b=emp2.getHolidays()[0]
! 
!     # the fetched value may be of a different type (python's datetime),
!     # if returned as such by the python db-adapter (mysqldb e.g.)
!     if getattr(h2b.getStartDate(),'isoformat',None):
!       self.assertEqual(sd2.Format('%Y-%m-%dT%H:%M:%S'),
!                        h2b.getStartDate().isoformat())
!       self.assertEqual(ed2.Format('%Y-%m-%dT%H:%M:%S'),
!                        h2b.getEndDate().isoformat())
!     else:
!       self.assertEqual(sd2, h2b.getStartDate())
!       self.assertEqual(ed2, h2b.getEndDate())
      #print db.snapshotForGlobalID(h_gid)