Webware for Python

Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKDateTime.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKDateTime.mkmodel

Modified Files:
	TestEmpty.py TestSamples.py 
Log Message:
- Remove ObjectStore.Store var which referred to the first store that happened to be created.
- Remove the store arg to MiddleObject.__init__(store) which was little used and confusing.
- Test suite clean ups.
- Make MKMultipleStores test having 2 different stores. This works now.
- Can now have two WebKit contexts that use MiddleKit without problems.
- Add MKMultipleStores to default set of test suites.


Index: TestEmpty.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKDateTime.mkmodel/TestEmpty.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestEmpty.py	12 Jul 2001 03:16:55 -0000	1.3
--- TestEmpty.py	3 May 2002 14:26:29 -0000	1.4
***************
*** 1,16 ****
  from Foo import Foo
- from MiddleKit.Run.ObjectStore import Store as store
  
  
! def test():
  	try:
  		from mx import DateTime
! 		testObjects()
  	except ImportError:
! 		testStrings()
! 		testNone()
  
  
! def testStrings():
  	print 'Testing with strings.'
  
--- 1,15 ----
  from Foo import Foo
  
  
! def test(store):
  	try:
  		from mx import DateTime
! 		testObjects(store)
  	except ImportError:
! 		testStrings(store)
! 		testNone(store)
  
  
! def testStrings(store):
  	print 'Testing with strings.'
  
***************
*** 20,24 ****
  	f.setDt('2001-06-07 12:42')
  
! 	storeFoo(f)
  
  	f.setD('2002-11-11')
--- 19,23 ----
  	f.setDt('2001-06-07 12:42')
  
! 	storeFoo(store, f)
  
  	f.setD('2002-11-11')
***************
*** 29,33 ****
  
  
! def testObjects():
  	import mx
  	from mx.DateTime import DateTimeFrom, TimeFrom
--- 28,32 ----
  
  
! def testObjects(store):
  	import mx
  	from mx.DateTime import DateTimeFrom, TimeFrom
***************
*** 43,47 ****
  	f.setDt(dt)
  
! 	storeFoo(f)
  
  	d  = DateTimeFrom('2002-11-11')
--- 42,46 ----
  	f.setDt(dt)
  
! 	storeFoo(store, f)
  
  	d  = DateTimeFrom('2002-11-11')
***************
*** 56,60 ****
  
  
! def storeFoo(f):
  	store.addObject(f)
  	store.saveChanges()
--- 55,59 ----
  
  
! def storeFoo(store, f):
  	store.addObject(f)
  	store.saveChanges()
***************
*** 67,71 ****
  
  
! def testNone():
  	print 'Testing None.'
  
--- 66,70 ----
  
  
! def testNone(store):
  	print 'Testing None.'
  

Index: TestSamples.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKDateTime.mkmodel/TestSamples.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSamples.py	1 Apr 2001 23:39:19 -0000	1.2
--- TestSamples.py	3 May 2002 14:26:29 -0000	1.3
***************
*** 1,5 ****
! def test():
  	from Foo import Foo
- 	from MiddleKit.Run.ObjectStore import Store as store
  
  	f = store.fetchObjectsOfClass(Foo)[0]
--- 1,4 ----
! def test(store):
  	from Foo import Foo
  
  	f = store.fetchObjectsOfClass(Foo)[0]