1 files changed, 2 insertions, 85 deletions
diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py
index bae725dc1bf..ee6fb861fcc 100644
--- a/py/test/Ice/exceptions/Server.py
+++ b/py/test/Ice/exceptions/Server.py
@@ -22,97 +22,14 @@ sys.path.insert(0, os.path.join(toplevel, "lib"))
 
 import Ice
 Ice.loadSlice('Test.ice')
-import Test
-
-class ThrowerI(Test.Thrower):
-    def __init__(self, adapter):
-        self._adapter = adapter
-
-    def shutdown(self, current=None):
-        self._adapter.getCommunicator().shutdown()
-
-    def supportsUndeclaredExceptions(self, current=None):
-        return True
-
-    def supportsAssertException(self, current=None):
-        return False
-
-    def throwAasA(self, a, current=None):
-        ex = Test.A()
-        ex.aMem = a
-        raise ex
-
-    def throwAorDasAorD(self, a, current=None):
-        if a > 0:
-            ex = Test.A()
-            ex.aMem = a
-            raise ex
-        else:
-            ex = Test.D()
-            ex.dMem = a
-            raise ex
-
-    def throwBasA(self, a, b, current=None):
-        self.throwBasB(a, b, current)
-
-    def throwCasA(self, a, b, c, current=None):
-        self.throwCasC(a, b, c, current)
-
-    def throwBasB(self, a, b, current=None):
-        ex = Test.B()
-        ex.aMem = a
-        ex.bMem = b
-        raise ex
-
-    def throwCasB(self, a, b, c, current=None):
-        self.throwCasC(a, b, c, current)
-
-    def throwCasC(self, a, b, c, current=None):
-        ex = Test.C()
-        ex.aMem = a
-        ex.bMem = b
-        ex.cMem = c
-        raise ex
-
-    def throwModA(self, a, a2, current=None):
-        ex = Test.Mod.A()
-        ex.aMem = a
-        ex.a2Mem = a2
-        raise ex
-
-    def throwUndeclaredA(self, a, current=None):
-        ex = Test.A()
-        ex.aMem = a
-        raise ex
-
-    def throwUndeclaredB(self, a, b, current=None):
-        ex = Test.B()
-        ex.aMem = a
-        ex.bMem = b
-        raise ex
-
-    def throwUndeclaredC(self, a, b, c, current=None):
-        ex = Test.C()
-        ex.aMem = a
-        ex.bMem = b
-        ex.cMem = c
-        raise ex
-
-    def throwLocalException(self, current=None):
-        raise Ice.TimeoutException()
-
-    def throwNonIceException(self, current=None):
-        raise RuntimeError("12345")
-
-    def throwAssertException(self, current=None):
-        raise RuntimeError("operation `throwAssertException' not supported")
+import Test, TestI
 
 def run(args, communicator):
     properties = communicator.getProperties()
     properties.setProperty("Ice.Warn.Dispatch", "0")
     properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000")
     adapter = communicator.createObjectAdapter("TestAdapter")
-    object = ThrowerI(adapter)
+    object = TestI.ThrowerI(adapter)
     adapter.add(object, Ice.stringToIdentity("thrower"))
     adapter.activate()
     communicator.waitForShutdown()