adding collocated tests

1 files changed, 2 insertions, 48 deletions

diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py
index 51df7f9629a..da6189ce0e0 100644
--- a/py/test/Ice/adapterDeactivation/Server.py
+++ b/py/test/Ice/adapterDeactivation/Server.py
@@ -22,59 +22,13 @@ sys.path.insert(0, os.path.join(toplevel, "lib"))
 
 import Ice
 Ice.loadSlice('Test.ice')
-import Test
-
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-class TestI(Test.TestIntf):
-    def transient(self, current=None):
-        communicator = current.adapter.getCommunicator()
-        adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999")
-        adapter.activate()
-        adapter.deactivate()
-        adapter.waitForDeactivate()
-
-    def deactivate(self, current=None):
-        current.adapter.deactivate()
-        time.sleep(1)
-
-class CookieI(Test.Cookie):
-    def message(self):
-        return 'blahblah'
-
-class ServantLocatorI(Ice.ServantLocator):
-    def __init__(self):
-        self._deactivated = False
-
-    def __del__(self):
-        test(self._deactivated)
-
-    def locate(self, current):
-        test(not self._deactivated)
-
-        test(current.id.category == '')
-        test(current.id.name == 'test')
-
-        return (TestI(), CookieI())
-
-    def finished(self, current, servant, cookie):
-        test(not self._deactivated)
-
-        test(isinstance(cookie, Test.Cookie))
-        test(cookie.message() == 'blahblah')
-
-    def deactivate(self, category):
-        test(not self._deactivated)
-
-        self._deactivated = True
+import Test, TestI
 
 class TestServer(Ice.Application):
     def run(self, args):
         self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000")
         adapter = self.communicator().createObjectAdapter("TestAdapter")
-        locator = ServantLocatorI()
+        locator = TestI.ServantLocatorI()
 
         adapter.addServantLocator(locator, "")
         adapter.activate()