[Modeling-cvs] NotificationFramework/tests test_NotificationCenter.py,1.6,1.7

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

Update of /cvsroot/modeling/NotificationFramework/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv21187/tests

Modified Files:
	test_NotificationCenter.py 
Log Message:
Added support for new-style classes observers

Index: test_NotificationCenter.py
===================================================================
RCS file: /cvsroot/modeling/NotificationFramework/tests/test_NotificationCenter.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_NotificationCenter.py	26 May 2003 12:24:53 -0000	1.6
--- test_NotificationCenter.py	27 Sep 2003 23:58:39 -0000	1.7
***************
*** 25,29 ****
  """Test the Model"""
  
! import unittest, os, sys
  import utils
  from NotificationFramework import NotificationCenter as NC
--- 25,29 ----
  """Test the Model"""
  
! import unittest, os, sys, weakref
  import utils
  from NotificationFramework import NotificationCenter as NC
***************
*** 39,43 ****
    pass
  
! class TestObject:
    def __init__(self):
      self.state=self.state_2=0
--- 39,48 ----
    pass
  
! if '--new-style' in sys.argv:
!   base_object=object
! else:
!   class base_object: pass
! 
! class TestObject(base_object):
    def __init__(self):
      self.state=self.state_2=0
***************
*** 52,56 ****
      self.userInfo_2=kw[0].userInfo()
  
! class TestObjectUnregister:
    def __init__(self):
      self.state=0
--- 57,61 ----
      self.userInfo_2=kw[0].userInfo()
  
! class TestObjectUnregister(base_object):
    def __init__(self):
      self.state=0
***************
*** 110,114 ****
      observers_after=NC._observers()
      self.failUnlessEqual(observers_before, observers_after)
!     
    def test_04_generic_postNotification(self):
      "[NotificationCenter] Tests generic observers"
--- 115,134 ----
      observers_after=NC._observers()
      self.failUnlessEqual(observers_before, observers_after)
! 
!     # same with a weakref (postNotification removes dead weakref when it finds
!     # some)
!     observers_before=NC._observers()
!     NC.addObserver(one, 'callMe', 'notif_test_3')
!     NC.addObserver(one, 'callMe', 'notif_test_3')
!     observers_after=NC._observers()
!     self.failIfEqual(observers_before, observers_after)
! 
!     from NotificationFramework.Notification import Notification
!     wone=NC._observers()[Notification('notif_test_3')][0]
!     self.assertEqual(type(wone), weakref.ReferenceType)
!     NC.removeObserver(wone)
!     observers_after=NC._observers()
!     self.failUnlessEqual(observers_before, observers_after)
! 
    def test_04_generic_postNotification(self):
      "[NotificationCenter] Tests generic observers"