Update of /cvsroot/webware/Webware/MiddleKit/Tests/MKMultipleStores.mkmodel
In directory usw-pr-cvs1:/tmp/cvs-serv11738/Tests/MKMultipleStores.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/MKMultipleStores.mkmodel/TestEmpty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestEmpty.py 21 Feb 2001 03:42:18 -0000 1.1
--- TestEmpty.py 3 May 2002 14:26:30 -0000 1.2
***************
*** 1,5 ****
! def test():
from Thing import Thing
! from MiddleKit.Run.ObjectStore import Store as store
!
! # nothing to do here
--- 1,3 ----
! def test(store):
from Thing import Thing
! # nothing more to do here
Index: TestSamples.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Tests/MKMultipleStores.mkmodel/TestSamples.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSamples.py 25 Mar 2002 13:02:53 -0000 1.2
--- TestSamples.py 3 May 2002 14:26:30 -0000 1.3
***************
*** 1,5 ****
! def test():
from Thing import Thing
- from MiddleKit.Run.ObjectStore import Store as store
things = store.fetchObjectsOfClass('Thing')
--- 1,4 ----
! def test(store):
from Thing import Thing
things = store.fetchObjectsOfClass('Thing')
***************
*** 18,20 ****
assert thing.store()==newStore
!
--- 17,43 ----
assert thing.store()==newStore
!
! # and now for an entirely different store
! import os, sys
! sys.path.insert(1, os.path.abspath(os.pardir))
! try:
! from TestDesign import test as generate
! model = generate('../MKBasic.mkmodel', workDir='WorkDir2') # toTestDir='../../',
!
! diffStore = store.__class__(**dbArgs)
! diffStore.setModel(model)
! assert diffStore.model() is model
! personClass = model.klass('Person').pyClass()
! person = personClass()
! person.setFirstName('Chuck')
! assert person.firstName()=='Chuck'
! diffStore.addObject(person)
! assert person.store() is diffStore, 'store=%r' % person.store()
! diffStore.saveChanges()
! assert person.store() is diffStore, 'store=%r' % person.store()
! assert diffStore is not newStore
!
! from TestCommon import rmdir
! rmdir('WorkDir2')
! finally:
! del sys.path[1]
|