[Modeling-cvs] ProjectModeling/Modeling/tests test_EditingContext_Global_Inheritance.py,1.17,1.18

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

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

Modified Files:
	test_EditingContext_Global_Inheritance.py 
Log Message:
Fixed tests 10, 11, 12 and 13: tests for the root entity (Employee) and one of its sub-entities (SalesClerks)

Index: test_EditingContext_Global_Inheritance.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_EditingContext_Global_Inheritance.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** test_EditingContext_Global_Inheritance.py	28 Jul 2003 06:15:16 -0000	1.17
--- test_EditingContext_Global_Inheritance.py	28 Jul 2003 06:53:33 -0000	1.18
***************
*** 404,409 ****
      new instances of Employee/Holidays.
      """
!     emp=Employee.Employee()
!     emp.setLastName('Test'); emp.setFirstName('T.')
      from mx.DateTime import DateFrom
      holidays=Holidays()
--- 404,409 ----
      new instances of Employee/Holidays.
      """
!     emp=self._test_10_class_employee()
!     emp.setLastName('Test10'); emp.setFirstName('T.')
      from mx.DateTime import DateFrom
      holidays=Holidays()
***************
*** 435,442 ****
  
      ec2=EditingContext()
!     emp2=ec2.fetch('Employee')[0]
      self.failIf(len(emp2.getHolidays())==0)
  
!   def test_10a_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/a]"
      # insert (h.+emp) + emp.addToHolidays + saveChanges
--- 435,442 ----
  
      ec2=EditingContext()
!     emp2=ec2.fetch('Employee','lastName=="Test10"', isDeep=1)[0]
      self.failIf(len(emp2.getHolidays())==0)
  
!   def _test_10a_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/a]"
      # insert (h.+emp) + emp.addToHolidays + saveChanges
***************
*** 452,456 ****
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
!   def test_10b_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/b]"
      # insert h. + saveChanges + emp.addToHolidays + saveChanges
--- 452,463 ----
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
!   def test_10a_toMany_with_no_inverse(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/a]"
!     self._test_10_class_employee=Employee.Employee
!     self._test_10a_toMany_with_no_inverse()
!     self._test_10_class_employee=SalesClerk
!     self._test_10a_toMany_with_no_inverse()
! 
!   def _test_10b_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/b]"
      # insert h. + saveChanges + emp.addToHolidays + saveChanges
***************
*** 472,476 ****
      self._test_10_check_insert_correctness_part2(emp_gid, db)
  
!   def test_10c_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/c]"
      # insert h. + emp.addToHolidays + saveChanges
--- 479,490 ----
      self._test_10_check_insert_correctness_part2(emp_gid, db)
  
!   def test_10b_toMany_with_no_inverse(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/b]"
!     self._test_10_class_employee=Employee.Employee
!     self._test_10b_toMany_with_no_inverse()
!     self._test_10_class_employee=SalesClerk
!     self._test_10b_toMany_with_no_inverse()
! 
!   def _test_10c_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/c]"
      # insert h. + emp.addToHolidays + saveChanges
***************
*** 488,492 ****
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
!   def test_10d_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/d]"
      #insert h. + saveChanges + emp.addToHolidays + h.setStartDate + saveChanges
--- 502,513 ----
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
!   def test_10c_toMany_with_no_inverse(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/c]"
!     self._test_10_class_employee=Employee.Employee
!     self._test_10c_toMany_with_no_inverse()
!     self._test_10_class_employee=SalesClerk
!     self._test_10c_toMany_with_no_inverse()
! 
!   def _test_10d_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/d]"
      #insert h. + saveChanges + emp.addToHolidays + h.setStartDate + saveChanges
***************
*** 508,512 ****
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
!   def test_10e_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/e]"
      # insert h. + save + insert emp. + emp.addToHolidays + saveChanges
--- 529,540 ----
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
!   def test_10d_toMany_with_no_inverse(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/d]"
!     self._test_10_class_employee=Employee.Employee
!     self._test_10d_toMany_with_no_inverse()
!     self._test_10_class_employee=SalesClerk
!     self._test_10d_toMany_with_no_inverse()
! 
!   def _test_10e_toMany_with_no_inverse(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/e]"
      # insert h. + save + insert emp. + emp.addToHolidays + saveChanges
***************
*** 524,530 ****
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
    def _test_11a_init_emp_and_holidays(self, ec):
!     emp=Employee.Employee()
!     emp.setLastName('Test'); emp.setFirstName('T.')
      from mx.DateTime import DateFrom
      holidays=Holidays()
--- 552,565 ----
      self._test_10_check_insert_correctness_part2(emp_gid, db)
      
+   def test_10e_toMany_with_no_inverse(self):
+     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/e]"
+     self._test_10_class_employee=Employee.Employee
+     self._test_10e_toMany_with_no_inverse()
+     self._test_10_class_employee=SalesClerk
+     self._test_10e_toMany_with_no_inverse()
+ 
    def _test_11a_init_emp_and_holidays(self, ec):
!     emp=self._test_11_class_employee()
!     emp.setLastName('Test11'); emp.setFirstName('T.')
      from mx.DateTime import DateFrom
      holidays=Holidays()
***************
*** 537,541 ****
      return emp, holidays
  
!   def test_11a_toMany_with_no_inverse__remove(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [remove/a]"
      # remove simple
--- 572,576 ----
      return emp, holidays
  
!   def _test_11a_toMany_with_no_inverse__remove(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [remove/a]"
      # remove simple
***************
*** 555,562 ****
      self.failIf(db.snapshotForSourceGlobalID(emp_gid, 'holidays'))
      ec2=EditingContext()
!     emp2=ec2.fetch('Employee')[0]
      self.failIf(len(emp2.getHolidays())!=0)
  
!   def test_11b_toMany_with_no_inverse__remove(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/b]"
      # remove + add
--- 590,604 ----
      self.failIf(db.snapshotForSourceGlobalID(emp_gid, 'holidays'))
      ec2=EditingContext()
!     emp2=ec2.fetch('Employee', 'lastName=="Test11"', isDeep=1)[0]
      self.failIf(len(emp2.getHolidays())!=0)
  
!   def test_11a_toMany_with_no_inverse__remove(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [remove/a]"
!     self._test_11_class_employee=Employee.Employee
!     self._test_11a_toMany_with_no_inverse__remove()
!     self._test_11_class_employee=SalesClerk
!     self._test_11a_toMany_with_no_inverse__remove()
! 
!   def _test_11b_toMany_with_no_inverse__remove(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/b]"
      # remove + add
***************
*** 584,588 ****
      self.failIf(db.snapshotForSourceGlobalID(emp_gid, 'holidays'))
      ec2=EditingContext()
!     emp2=ec2.fetch('Employee')[0]
      self.assertEqual(len(emp2.getHolidays()), 1)
      h2b=emp2.getHolidays()[0]
--- 626,630 ----
      self.failIf(db.snapshotForSourceGlobalID(emp_gid, 'holidays'))
      ec2=EditingContext()
!     emp2=ec2.fetch('Employee', 'lastName=="Test11"', isDeep=1)[0]
      self.assertEqual(len(emp2.getHolidays()), 1)
      h2b=emp2.getHolidays()[0]
***************
*** 591,595 ****
      #print db.snapshotForGlobalID(h_gid)
      
!   def test_11c_toMany_with_no_inverse__remove(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/c]"
      # remove + add
--- 633,644 ----
      #print db.snapshotForGlobalID(h_gid)
      
!   def test_11b_toMany_with_no_inverse__remove(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/b]"
!     self._test_11_class_employee=Employee.Employee
!     self._test_11b_toMany_with_no_inverse__remove()
!     self._test_11_class_employee=SalesClerk
!     self._test_11b_toMany_with_no_inverse__remove()
! 
!   def _test_11c_toMany_with_no_inverse__remove(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/c]"
      # remove + add
***************
*** 610,614 ****
      self.failIf(db.snapshotForGlobalID(h_gid)['fkEmployeeId']!=None)
  
!   def test_12_toMany_with_no_inverse__correct_fetch(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly fetched"
      ec=EditingContext()
--- 659,670 ----
      self.failIf(db.snapshotForGlobalID(h_gid)['fkEmployeeId']!=None)
  
!   def test_11c_toMany_with_no_inverse__remove(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly updated [insert/c]"
!     self._test_11_class_employee=Employee.Employee
!     self._test_11c_toMany_with_no_inverse__remove()
!     self._test_11_class_employee=SalesClerk
!     self._test_11c_toMany_with_no_inverse__remove()
! 
!   def _test_12_toMany_with_no_inverse__correct_fetch(self):
      "[EC/Inheritance] toMany w/o inverse: obj. correctly fetched"
      ec=EditingContext()
***************
*** 621,625 ****
      self.failIf(db.snapshotForGlobalID(h_gid)['fkEmployeeId']==None)
      
!   def test_13_toMany_with_no_inverse__snapshot_row(self):
      "[EC/Inheritance] toMany w/o inverse: obj.snapshot_raw()"
      ec=EditingContext()
--- 677,688 ----
      self.failIf(db.snapshotForGlobalID(h_gid)['fkEmployeeId']==None)
      
!   def test_12_toMany_with_no_inverse__correct_fetch(self):
!     "[EC/Inheritance] toMany w/o inverse: obj. correctly fetched"
!     self._test_11_class_employee=Employee.Employee
!     self._test_12_toMany_with_no_inverse__correct_fetch()
!     self._test_11_class_employee=SalesClerk
!     self._test_12_toMany_with_no_inverse__correct_fetch()
! 
!   def _test_13_toMany_with_no_inverse__snapshot_row(self):
      "[EC/Inheritance] toMany w/o inverse: obj.snapshot_raw()"
      ec=EditingContext()
***************
*** 635,638 ****
--- 698,708 ----
                       emp.globalID().keyValues()['id'])
      
+   def test_13_toMany_with_no_inverse__snapshot_row(self):
+     "[EC/Inheritance] toMany w/o inverse: obj.snapshot_raw()"
+     self._test_10_class_employee=Employee.Employee
+     self._test_13_toMany_with_no_inverse__snapshot_row()
+     self._test_10_class_employee=SalesClerk
+     self._test_13_toMany_with_no_inverse__snapshot_row()
+   
    def tearDown(self):
      """