adding collocated tests

1 files changed, 4 insertions, 45 deletions

diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py
index 0dd9d526e56..efa87f17355 100644
--- a/py/test/Ice/facets/Server.py
+++ b/py/test/Ice/facets/Server.py
@@ -22,58 +22,17 @@ sys.path.insert(0, os.path.join(toplevel, "lib"))
 
 import Ice
 Ice.loadSlice('Test.ice')
-import Test
-
-class AI(Test.A):
-    def callA(self, current=None):
-        return "A"
-
-class BI(Test.B, AI):
-    def callB(self, current=None):
-        return "B"
-
-class CI(Test.C, AI):
-    def callC(self, current=None):
-        return "C"
-
-class DI(Test.D, BI, CI):
-    def callD(self, current=None):
-        return "D"
-
-class EI(Test.E):
-    def callE(self, current=None):
-        return "E"
-
-class FI(Test.F, EI):
-    def callF(self, current=None):
-        return "F"
-
-class GI(Test.G):
-    def __init__(self, communicator):
-        self._communicator = communicator
-
-    def shutdown(self, current=None):
-        self._communicator.shutdown()
-
-    def callG(self, current=None):
-        return "G"
-
-class HI(Test.H, GI):
-    def __init__(self, communicator):
-        GI.__init__(self, communicator)
-
-    def callH(self, current=None):
-        return "H"
+import Test, TestI
 
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    d = DI()
+    d = TestI.DI()
     adapter.add(d, Ice.stringToIdentity("d"))
     adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
-    f = FI()
+    f = TestI.FI()
     adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
-    h = HI(communicator)
+    h = TestI.HI(communicator)
     adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
 
     adapter.activate()