[Modeling-cvs] ProjectModeling/Modeling/tests test_EditingContext_Global.py,1.41,1.42

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

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

Modified Files:
	test_EditingContext_Global.py 
Log Message:
Added test_23b_fetch_star_and_interrogation_mark_chars() + made some tests easier to read when they fail

Index: test_EditingContext_Global.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_EditingContext_Global.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** test_EditingContext_Global.py	10 Aug 2003 12:02:05 -0000	1.41
--- test_EditingContext_Global.py	10 Aug 2003 14:38:15 -0000	1.42
***************
*** 1169,1173 ****
      
    def test_23_fetch_star_and_interrogation_mark_chars(self):
!     "[EditingContext] fetch real '?' and '*'"
      ec=EditingContext()
      b1=Book(); b1.setTitle('abc?d')
--- 1169,1173 ----
      
    def test_23_fetch_star_and_interrogation_mark_chars(self):
!     "[EditingContext] fetch real '?' and '*' w/ LIKE"
      ec=EditingContext()
      b1=Book(); b1.setTitle('abc?d')
***************
*** 1178,1193 ****
  
      res=ec.fetch('Book', 'title like "abc?d"')
!     self.failIf(len(res)!=3)
                  
      res=ec.fetch('Book', 'title like "abc*d"')
!     self.failIf(len(res)!=3)
  
      res=ec.fetch('Book', 'title like "abc\?d"')
!     self.failIf(len(res)!=1)
!     self.failIf(res[0].getTitle()!='abc?d')
  
      res=ec.fetch('Book', 'title like "abc\*d"')
!     self.failIf(len(res)!=1)
!     self.failIf(res[0].getTitle()!='abc*d')
  
    def test_24_fetch_does_not_return_duplicates(self):
--- 1178,1222 ----
  
      res=ec.fetch('Book', 'title like "abc?d"')
!     self.assertEqual(len(res), 3)
                  
      res=ec.fetch('Book', 'title like "abc*d"')
!     self.assertEqual(len(res), 3)
  
      res=ec.fetch('Book', 'title like "abc\?d"')
!     self.assertEqual(len(res), 1)
!     self.assertEqual(res[0].getTitle(), 'abc?d')
  
      res=ec.fetch('Book', 'title like "abc\*d"')
!     self.assertEqual(len(res), 1)
!     self.assertEqual(res[0].getTitle(), 'abc*d')
! 
!   def test_23b_fetch_star_and_interrogation_mark_chars(self):
!     "[EditingContext] fetch real '?' and '*' w/ ILIKE"
!     ec=EditingContext()
!     b1=Book(); b1.setTitle('abc?d')
!     b2=Book(); b2.setTitle('aBC?d')
!     b3=Book(); b3.setTitle('abcXd')
!     b4=Book(); b4.setTitle('abc*d')
!     b5=Book(); b5.setTitle('abc*D')
!     ec.insert(b1); ec.insert(b2); ec.insert(b3); ec.insert(b4); ec.insert(b5)
!     ec.saveChanges()
! 
!     res=ec.fetch('Book', 'title ilike "abc?d"')
!     self.assertEqual(len(res), 5)
!                 
!     res=ec.fetch('Book', 'title ilike "abc*d"')
!     self.assertEqual(len(res), 5)
! 
!     res=ec.fetch('Book', 'title ilike "abc\?d"')
!     self.assertEqual(len(res), 2)
!     titles=[r.getTitle() for r in res]
!     self.failIf('abc?d' not in titles)
!     self.failIf('aBC?d' not in titles)
! 
!     res=ec.fetch('Book', 'title ilike "abc\*d"')
!     self.assertEqual(len(res), 2)
!     titles=[r.getTitle() for r in res]
!     self.failIf('abc*d' not in titles)
!     self.failIf('abc*D' not in titles)
  
    def test_24_fetch_does_not_return_duplicates(self):