[Pythoncard-cvs] PythonCard/tests ScriptableTest.py,1.1,1.2

[Rowland S. <mon...@us...>]

Update of /cvsroot/pythoncard/PythonCard/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22762/tests

Modified Files:
	ScriptableTest.py 
Log Message:
Simplified Scriptable.  Created IScriptable interface,
extended by Scriptable and NullScriptable.  NullScriptable
gets installed as the parent of a Scriptable if the parent=None.


Index: ScriptableTest.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tests/ScriptableTest.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScriptableTest.py	2 May 2004 16:32:57 -0000	1.1
--- ScriptableTest.py	2 May 2004 22:09:29 -0000	1.2
***************
*** 5,14 ****
  class TestHandler( component.Scriptable ) :
  
!     def __init__( self, name, scriptableParent ) :
!         component.Scriptable.__init__( self, scriptableParent )
          self._name = name
          
!     def on_print( self, event ) :
!         print self._name, event
  
      def getName( self ) :
--- 5,15 ----
  class TestHandler( component.Scriptable ) :
  
!     def __init__( self, name, parent ) :
!         component.Scriptable.__init__( self, parent )
          self._name = name
          
!     def on_doIt( self, event ) :
!         global handledIn
!         handledIn = self._name
  
      def getName( self ) :
***************
*** 16,23 ****
          
          
! class HandlerWithNoOnPrint( component.Scriptable ) :
  
!     def __init__( self, name, scriptableParent ) :
!         component.Scriptable.__init__( self, scriptableParent )
          self._name = name
          
--- 17,24 ----
          
          
! class HandlerWithMissingMethod( component.Scriptable ) :
  
!     def __init__( self, name, parent ) :
!         component.Scriptable.__init__( self, parent )
          self._name = name
          
***************
*** 26,41 ****
          
  
! class TestScriptable( unittest.TestCase ) :
      
      def setUp( self ) :
          pass
  
      def testScriptable( self ) :
          parent = TestHandler( 'parent', None )
          child = TestHandler( 'child', parent )
!         parent.execute( 'on_print', ( 'howdy' ) )
!         child.execute( 'on_print', ( 'howdy' ) )
!         missing = HandlerWithNoOnPrint( 'missing', parent )
!         missing.execute( 'on_print', ( 'howdy' ) )
  
  if __name__ == '__main__':
--- 27,54 ----
          
  
! class TestScriptable( unittest.TestCase, event.EventListener ) :
      
+     def __init__( self, name ) :
+         unittest.TestCase.__init__( self, name )
+         event.EventLog.getInstance().addEventListener( self )
+         
+     def eventOccurred( self, event ) :
+         print 'event=', event
+         
      def setUp( self ) :
          pass
  
      def testScriptable( self ) :
+         global handledIn
          parent = TestHandler( 'parent', None )
+         parent.execute( 'on_doIt', ( 'howdy parent' ) )
+         self.assertEqual( handledIn, 'parent' )
          child = TestHandler( 'child', parent )
!         child.execute( 'on_doIt', ( 'howdy child' ) )
!         self.assertEqual( handledIn, 'child' )
!         missing = HandlerWithMissingMethod( 'missing', parent )
!         missing.execute( 'on_doIt', ( 'howdy missing(parent)' ) )
!         self.assertEqual( handledIn, 'parent' )
!         missing.execute( 'on_wtf', ( 'no dice' ) )
  
  if __name__ == '__main__':