diff options
Diffstat (limited to 'python/test')
50 files changed, 106 insertions, 106 deletions
diff --git a/python/test/Glacier2/application/Client.py b/python/test/Glacier2/application/Client.py index f326207ffc1..70547571041 100644 --- a/python/test/Glacier2/application/Client.py +++ b/python/test/Glacier2/application/Client.py @@ -18,7 +18,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class CallbackReceiverI(Test._CallbackReceiverDisp): +class CallbackReceiverI(Test.CallbackReceiver): def __init__(self): self._received = False diff --git a/python/test/Glacier2/application/Server.py b/python/test/Glacier2/application/Server.py index b0a5ef02e0d..90719545d5b 100644 --- a/python/test/Glacier2/application/Server.py +++ b/python/test/Glacier2/application/Server.py @@ -12,7 +12,7 @@ import os, sys, traceback, Ice Ice.loadSlice('Callback.ice') import Test -class CallbackI(Test._CallbackDisp): +class CallbackI(Test.Callback): def initiateCallback(self, proxy, current): proxy.callback(current.ctx) diff --git a/python/test/Ice/acm/TestI.py b/python/test/Ice/acm/TestI.py index 53158e42a28..ab81a0ae8c8 100644 --- a/python/test/Ice/acm/TestI.py +++ b/python/test/Ice/acm/TestI.py @@ -24,7 +24,7 @@ class ConnectionCallbackI(): while self.count < count: self.m.wait() -class RemoteCommunicatorI(Test._RemoteCommunicatorDisp): +class RemoteCommunicatorI(Test.RemoteCommunicator): def createObjectAdapter(self, timeout, close, heartbeat, current=None): com = current.adapter.getCommunicator() properties = com.getProperties() @@ -44,7 +44,7 @@ class RemoteCommunicatorI(Test._RemoteCommunicatorDisp): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() -class RemoteObjectAdapterI(Test._RemoteObjectAdapterDisp): +class RemoteObjectAdapterI(Test.RemoteObjectAdapter): def __init__(self, adapter): self._adapter = adapter self._testIntf = Test.TestIntfPrx.uncheckedCast(adapter.add(TestIntfI(), @@ -66,7 +66,7 @@ class RemoteObjectAdapterI(Test._RemoteObjectAdapterDisp): except Ice.ObjectAdapterDeactivatedException: pass -class TestIntfI(Test._TestIntfDisp): +class TestIntfI(Test.TestIntf): def __init__(self): self.m = threading.Condition() diff --git a/python/test/Ice/adapterDeactivation/TestI.py b/python/test/Ice/adapterDeactivation/TestI.py index aeb4f60e98b..03e44ce4911 100644 --- a/python/test/Ice/adapterDeactivation/TestI.py +++ b/python/test/Ice/adapterDeactivation/TestI.py @@ -14,7 +14,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def transient(self, current=None): communicator = current.adapter.getCommunicator() adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999") diff --git a/python/test/Ice/admin/TestI.py b/python/test/Ice/admin/TestI.py index 9172a2da65d..80d849b749b 100644 --- a/python/test/Ice/admin/TestI.py +++ b/python/test/Ice/admin/TestI.py @@ -13,11 +13,11 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestFacetI(Test._TestFacetDisp): +class TestFacetI(Test.TestFacet): def op(self, current = None): return -class RemoteCommunicatorI(Test._RemoteCommunicatorDisp, Ice.PropertiesAdminUpdateCallback): +class RemoteCommunicatorI(Test.RemoteCommunicator, Ice.PropertiesAdminUpdateCallback): def __init__(self, communicator): self.communicator = communicator self.called = False @@ -61,7 +61,7 @@ class RemoteCommunicatorI(Test._RemoteCommunicatorDisp, Ice.PropertiesAdminUpdat self.called = True self.m.notify() -class RemoteCommunicatorFactoryI(Test._RemoteCommunicatorFactoryDisp): +class RemoteCommunicatorFactoryI(Test.RemoteCommunicatorFactory): def createCommunicator(self, props, current = None): # diff --git a/python/test/Ice/ami/AllTests.py b/python/test/Ice/ami/AllTests.py index b7dd106aadb..36d20450bf7 100644 --- a/python/test/Ice/ami/AllTests.py +++ b/python/test/Ice/ami/AllTests.py @@ -446,13 +446,13 @@ def allTests(communicator, collocated): cookie = 5 cbWC = ResponseCallbackWC(cookie) - p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.isA, cb.ex) + p.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.isA, cb.ex) cb.check() - p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie)) + p.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie)) cbWC.check() - p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.isA, cb.ex, context=ctx) + p.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.isA, cb.ex, context=ctx) cb.check() - p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie), + p.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda r: cbWC.isA(r, cookie), lambda ex: cbWC.ex(ex, cookie), context=ctx) cbWC.check() @@ -563,9 +563,9 @@ def allTests(communicator, collocated): cookie = 5 cbWC = ExceptionCallbackWC(cookie) - i.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.response, cb.ex) + i.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.response, cb.ex) cb.check() - i.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda b: cbWC.response(b, cookie), lambda ex: cbWC.ex(ex, cookie)) + i.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda b: cbWC.response(b, cookie), lambda ex: cbWC.ex(ex, cookie)) cbWC.check() i.begin_ice_ping(cb.response, cb.ex) @@ -604,8 +604,8 @@ def allTests(communicator, collocated): cbWC = ExceptionCallbackWC(cookie) # Ensures no exception is called when response is received. - p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), cb.nullResponse, cb.noEx) - p.begin_ice_isA(Test._TestIntfDisp.ice_staticId(), lambda b: cbWC.nullResponse(b, cookie), + p.begin_ice_isA(Test.TestIntf.ice_staticId(), cb.nullResponse, cb.noEx) + p.begin_ice_isA(Test.TestIntf.ice_staticId(), lambda b: cbWC.nullResponse(b, cookie), lambda ex: cbWC.noEx(ex, cookie)) p.begin_op(cb.nullResponse, cb.noEx) p.begin_op(lambda: cbWC.nullResponse(cookie), lambda ex: cbWC.noEx(ex, cookie)) @@ -1308,9 +1308,9 @@ def allTestsFuture(communicator, collocated): ctx = {} cb = FutureDoneCallback() - p.ice_isAAsync(Test._TestIntfDisp.ice_staticId()).add_done_callback(cb.isA) + p.ice_isAAsync(Test.TestIntf.ice_staticId()).add_done_callback(cb.isA) cb.check() - p.ice_isAAsync(Test._TestIntfDisp.ice_staticId(), ctx).add_done_callback(cb.isA) + p.ice_isAAsync(Test.TestIntf.ice_staticId(), ctx).add_done_callback(cb.isA) cb.check() p.ice_pingAsync().add_done_callback(cb.ping) @@ -1391,7 +1391,7 @@ def allTestsFuture(communicator, collocated): i = Test.TestIntfPrx.uncheckedCast(p.ice_adapterId("dummy")) cb = FutureExceptionCallback() - i.ice_isAAsync(Test._TestIntfDisp.ice_staticId()).add_done_callback(cb.ex) + i.ice_isAAsync(Test.TestIntf.ice_staticId()).add_done_callback(cb.ex) cb.check() i.ice_pingAsync().add_done_callback(cb.ex) @@ -1418,7 +1418,7 @@ def allTestsFuture(communicator, collocated): cb = FutureExceptionCallback() # Ensures no exception is set when response is received. - p.ice_isAAsync(Test._TestIntfDisp.ice_staticId()).add_done_callback(cb.noEx) + p.ice_isAAsync(Test.TestIntf.ice_staticId()).add_done_callback(cb.noEx) p.opAsync().add_done_callback(cb.noEx) # If response is a user exception, it should be received. diff --git a/python/test/Ice/ami/TestI.py b/python/test/Ice/ami/TestI.py index d969b10fd72..04ae463b4e4 100644 --- a/python/test/Ice/ami/TestI.py +++ b/python/test/Ice/ami/TestI.py @@ -9,7 +9,7 @@ import Ice, Test, threading, time -class TestIntfI(Test._TestIntfDisp): +class TestIntfI(Test.TestIntf): def __init__(self): self._cond = threading.Condition() self._batchCount = 0 @@ -77,7 +77,7 @@ class TestIntfI(Test._TestIntfDisp): def supportsFunctionalTests(self, current=None): return False -class TestIntfControllerI(Test._TestIntfControllerDisp): +class TestIntfControllerI(Test.TestIntfController): def __init__(self, adapter): self._adapter = adapter diff --git a/python/test/Ice/binding/TestI.py b/python/test/Ice/binding/TestI.py index 1cf751840bc..35bd86dc46c 100644 --- a/python/test/Ice/binding/TestI.py +++ b/python/test/Ice/binding/TestI.py @@ -9,7 +9,7 @@ import Ice, Test -class RemoteCommunicatorI(Test._RemoteCommunicatorDisp): +class RemoteCommunicatorI(Test.RemoteCommunicator): def __init__(self): self._nextPort = 10001 @@ -32,7 +32,7 @@ class RemoteCommunicatorI(Test._RemoteCommunicatorDisp): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() -class RemoteObjectAdapterI(Test._RemoteObjectAdapterDisp): +class RemoteObjectAdapterI(Test.RemoteObjectAdapter): def __init__(self, adapter): self._adapter = adapter self._testIntf = Test.TestIntfPrx.uncheckedCast(self._adapter.add(TestI(), Ice.stringToIdentity("test"))) @@ -47,6 +47,6 @@ class RemoteObjectAdapterI(Test._RemoteObjectAdapterDisp): except Ice.ObjectAdapterDeactivatedException: pass -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def getAdapterName(self, current=None): return current.adapter.getName() diff --git a/python/test/Ice/blobject/RouterI.py b/python/test/Ice/blobject/RouterI.py index 7148fb350fc..2af75a0f06f 100644 --- a/python/test/Ice/blobject/RouterI.py +++ b/python/test/Ice/blobject/RouterI.py @@ -131,7 +131,7 @@ class ServantLocatorI(Ice.ServantLocator): def deactivate(self, s): pass -class RouterI(Ice._RouterDisp): +class RouterI(Ice.Router): def __init__(self, communicator, sync): self._adapter = communicator.createObjectAdapterWithEndpoints("forward", "default -h 127.0.0.1") if sync: diff --git a/python/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py index 9cd56f0de08..ce5c7dae040 100755 --- a/python/test/Ice/blobject/Server.py +++ b/python/test/Ice/blobject/Server.py @@ -15,7 +15,7 @@ import Ice Ice.loadSlice('Test.ice') import Test -class TestI(Test._HelloDisp): +class TestI(Test.Hello): def sayHello(self, delay, current=None): if delay != 0: time.sleep(delay / 1000.0) diff --git a/python/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py index 54028534eb7..e88501da62a 100755 --- a/python/test/Ice/checksum/Server.py +++ b/python/test/Ice/checksum/Server.py @@ -19,7 +19,7 @@ if not slice_dir: Ice.loadSlice("'-I" + slice_dir + "' --checksum Test.ice STypes.ice") import Test -class ChecksumI(Test._ChecksumDisp): +class ChecksumI(Test.Checksum): def getSliceChecksums(self, current=None): return Ice.sliceChecksums diff --git a/python/test/Ice/custom/Server.py b/python/test/Ice/custom/Server.py index ad132e98526..00e21a9e5c6 100755 --- a/python/test/Ice/custom/Server.py +++ b/python/test/Ice/custom/Server.py @@ -18,7 +18,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class CustomI(Test._CustomDisp): +class CustomI(Test.Custom): def opByteString1(self, b1, current=None): if sys.version_info[0] == 2: test(isinstance(b1, str)) diff --git a/python/test/Ice/defaultServant/MyObjectI.py b/python/test/Ice/defaultServant/MyObjectI.py index 13eaf576f83..5ff29e8bc28 100644 --- a/python/test/Ice/defaultServant/MyObjectI.py +++ b/python/test/Ice/defaultServant/MyObjectI.py @@ -9,7 +9,7 @@ import Ice, Test -class MyObjectI(Test._MyObjectDisp): +class MyObjectI(Test.MyObject): def ice_ping(self, current=None): name = current.id.name diff --git a/python/test/Ice/dispatcher/TestI.py b/python/test/Ice/dispatcher/TestI.py index 2dfa9cc3f52..d3202b29406 100644 --- a/python/test/Ice/dispatcher/TestI.py +++ b/python/test/Ice/dispatcher/TestI.py @@ -13,7 +13,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestIntfI(Test._TestIntfDisp): +class TestIntfI(Test.TestIntf): def op(self, current=None): test(Dispatcher.Dispatcher.isDispatcherThread()) @@ -27,7 +27,7 @@ class TestIntfI(Test._TestIntfDisp): test(Dispatcher.Dispatcher.isDispatcherThread()) current.adapter.getCommunicator().shutdown() -class TestIntfControllerI(Test._TestIntfControllerDisp): +class TestIntfControllerI(Test.TestIntfController): def __init__(self, adapter): self._adapter = adapter diff --git a/python/test/Ice/enums/Server.py b/python/test/Ice/enums/Server.py index 93f27f861c0..4213cf2ce2c 100755 --- a/python/test/Ice/enums/Server.py +++ b/python/test/Ice/enums/Server.py @@ -18,7 +18,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestIntfI(Test._TestIntfDisp): +class TestIntfI(Test.TestIntf): def opByte(self, b1, current=None): return (b1, b1) diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py index 88d948324b2..f876c844cae 100644 --- a/python/test/Ice/exceptions/AllTests.py +++ b/python/test/Ice/exceptions/AllTests.py @@ -13,7 +13,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class EmptyI(Test._EmptyDisp): +class EmptyI(Test.Empty): pass class ServantLocatorI(Ice.ServantLocator): diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py index 7e3d005ecc1..5c96a48c987 100755 --- a/python/test/Ice/exceptions/ServerAMD.py +++ b/python/test/Ice/exceptions/ServerAMD.py @@ -23,7 +23,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class ThrowerI(Test._ThrowerDisp): +class ThrowerI(Test.Thrower): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/exceptions/TestI.py b/python/test/Ice/exceptions/TestI.py index ac4e3ab99f2..2f994f3422c 100644 --- a/python/test/Ice/exceptions/TestI.py +++ b/python/test/Ice/exceptions/TestI.py @@ -9,7 +9,7 @@ import Ice, Test, array, sys -class ThrowerI(Test._ThrowerDisp): +class ThrowerI(Test.Thrower): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/facets/AllTests.py b/python/test/Ice/facets/AllTests.py index b9fcba386dd..d5e488e781f 100644 --- a/python/test/Ice/facets/AllTests.py +++ b/python/test/Ice/facets/AllTests.py @@ -13,7 +13,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class EmptyI(Test._EmptyDisp): +class EmptyI(Test.Empty): pass def allTests(communicator): diff --git a/python/test/Ice/facets/TestI.py b/python/test/Ice/facets/TestI.py index c3bcfe20042..4f977b74c32 100644 --- a/python/test/Ice/facets/TestI.py +++ b/python/test/Ice/facets/TestI.py @@ -9,31 +9,31 @@ import Test -class AI(Test._ADisp): +class AI(Test.A): def callA(self, current=None): return "A" -class BI(Test._BDisp, AI): +class BI(Test.B, AI): def callB(self, current=None): return "B" -class CI(Test._CDisp, AI): +class CI(Test.C, AI): def callC(self, current=None): return "C" -class DI(Test._DDisp, BI, CI): +class DI(Test.D, BI, CI): def callD(self, current=None): return "D" -class EI(Test._EDisp): +class EI(Test.E): def callE(self, current=None): return "E" -class FI(Test._FDisp, EI): +class FI(Test.F, EI): def callF(self, current=None): return "F" -class GI(Test._GDisp): +class GI(Test.G): def __init__(self, communicator): self._communicator = communicator @@ -43,7 +43,7 @@ class GI(Test._GDisp): def callG(self, current=None): return "G" -class HI(Test._HDisp, GI): +class HI(Test.H, GI): def __init__(self, communicator): GI.__init__(self, communicator) diff --git a/python/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py index c6c96c99744..684f9933802 100755 --- a/python/test/Ice/faultTolerance/Server.py +++ b/python/test/Ice/faultTolerance/Server.py @@ -17,7 +17,7 @@ import Test def usage(n): sys.stderr.write("Usage: " + n + " port\n") -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/info/TestI.py b/python/test/Ice/info/TestI.py index 563e9e8180b..3a2399cc2b1 100644 --- a/python/test/Ice/info/TestI.py +++ b/python/test/Ice/info/TestI.py @@ -22,7 +22,7 @@ def getIPConnectionInfo(info): return info info = info.underlying -class MyDerivedClassI(Test._TestIntfDisp): +class MyDerivedClassI(Test.TestIntf): def __init__(self): self.ctx = None diff --git a/python/test/Ice/inheritance/TestI.py b/python/test/Ice/inheritance/TestI.py index f4d98732334..e2c93b5b486 100644 --- a/python/test/Ice/inheritance/TestI.py +++ b/python/test/Ice/inheritance/TestI.py @@ -9,39 +9,39 @@ import Ice, Test -class CAI(Test.MA._CADisp): +class CAI(Test.MA.CADisp): def caop(self, p, current=None): return p -class CBI(Test.MB._CBDisp, CAI): +class CBI(Test.MB.CBDisp, CAI): def cbop(self, p, current=None): return p -class CCI(Test.MA._CCDisp, CBI): +class CCI(Test.MA.CCDisp, CBI): def ccop(self, p, current=None): return p -class IAI(Test.MA._IADisp): +class IAI(Test.MA.IA): def iaop(self, p, current=None): return p -class IB1I(Test.MB._IB1Disp, IAI): +class IB1I(Test.MB.IB1, IAI): def ib1op(self, p, current=None): return p -class IB2I(Test.MB._IB2Disp, IAI): +class IB2I(Test.MB.IB2, IAI): def ib2op(self, p, current=None): return p -class ICI(Test.MA._ICDisp, IB1I, IB2I): +class ICI(Test.MA.IC, IB1I, IB2I): def icop(self, p, current=None): return p -class CDI(Test.MA._CDDisp, CCI, IB1I, IB2I): +class CDI(Test.MA.CDDisp, CCI, IB1I, IB2I): def cdop(self, p, current=None): return p -class InitialI(Test._InitialDisp): +class InitialI(Test.Initial): def __init__(self, adapter): self._ca = Test.MA.CAPrx.uncheckedCast(adapter.addWithUUID(CAI())) self._cb = Test.MB.CBPrx.uncheckedCast(adapter.addWithUUID(CBI())) diff --git a/python/test/Ice/location/AllTests.py b/python/test/Ice/location/AllTests.py index 4fddaac9ec6..94baf21339e 100644 --- a/python/test/Ice/location/AllTests.py +++ b/python/test/Ice/location/AllTests.py @@ -9,7 +9,7 @@ import Ice, Test, sys -class HelloI(Test._HelloDisp): +class HelloI(Test.Hello): def sayHello(self, current=None): pass diff --git a/python/test/Ice/location/Server.py b/python/test/Ice/location/Server.py index ecb351b820d..573bee0c8f3 100755 --- a/python/test/Ice/location/Server.py +++ b/python/test/Ice/location/Server.py @@ -19,7 +19,7 @@ if not slice_dir: Ice.loadSlice("'-I" + slice_dir + "' Test.ice") import Test -class ServerLocatorRegistry(Test._TestLocatorRegistryDisp): +class ServerLocatorRegistry(Test.TestLocatorRegistry): def __init__(self): self._adapters = {} self._objects = {} @@ -56,7 +56,7 @@ class ServerLocatorRegistry(Test._TestLocatorRegistryDisp): raise Ice.ObjectNotFoundException() return self._objects[id] -class ServerLocator(Test._TestLocatorDisp): +class ServerLocator(Test.TestLocator): def __init__(self, registry, registryPrx): self._registry = registry @@ -77,7 +77,7 @@ class ServerLocator(Test._TestLocatorDisp): def getRequestCount(self, current=None): return self._requestCount -class ServerManagerI(Test._ServerManagerDisp): +class ServerManagerI(Test.ServerManager): def __init__(self, registry, initData): self._registry = registry self._communicators = [] @@ -121,11 +121,11 @@ class ServerManagerI(Test._ServerManagerDisp): i.destroy() current.adapter.getCommunicator().shutdown() -class HelloI(Test._HelloDisp): +class HelloI(Test.Hello): def sayHello(self, current=None): pass -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def __init__(self, adapter, adapter2, registry): self._adapter1 = adapter self._adapter2 = adapter2 diff --git a/python/test/Ice/objects/Test.ice b/python/test/Ice/objects/Test.ice index 8ddd5e1d4cc..e7464b00292 100644 --- a/python/test/Ice/objects/Test.ice +++ b/python/test/Ice/objects/Test.ice @@ -162,7 +162,7 @@ exception Ex }; -class Initial +interface Initial { void shutdown(); B getB1(); diff --git a/python/test/Ice/objects/TestI.py b/python/test/Ice/objects/TestI.py index f711157a741..44d70a90d4c 100644 --- a/python/test/Ice/objects/TestI.py +++ b/python/test/Ice/objects/TestI.py @@ -67,7 +67,7 @@ class JI(Ice.InterfaceByValue): class HI(Test.H): pass -class InitialI(Test._InitialDisp): +class InitialI(Test.Initial): def __init__(self, adapter): self._adapter = adapter self._b1 = BI() @@ -174,6 +174,6 @@ class InitialI(Test._InitialDisp): def throwInnerSubEx(self, current=None): raise Test.Inner.Sub.Ex("Inner::Sub::Ex") -class UnexpectedObjectExceptionTestI(Test._UnexpectedObjectExceptionTestDisp): +class UnexpectedObjectExceptionTestI(Test.UnexpectedObjectExceptionTest): def op(self, current=None): return Test.AlsoEmpty() diff --git a/python/test/Ice/operations/OnewaysAMI.py b/python/test/Ice/operations/OnewaysAMI.py index 79b31c73eb3..4ed393c49a1 100644 --- a/python/test/Ice/operations/OnewaysAMI.py +++ b/python/test/Ice/operations/OnewaysAMI.py @@ -45,7 +45,7 @@ def onewaysAMI(communicator, proxy): cb.check() try: - p.begin_ice_isA(Test._MyClassDisp.ice_staticId()) + p.begin_ice_isA(Test.MyClass.ice_staticId()) test(False) except RuntimeError: pass diff --git a/python/test/Ice/operations/OnewaysFuture.py b/python/test/Ice/operations/OnewaysFuture.py index b5caefbe744..9da67a45c7c 100644 --- a/python/test/Ice/operations/OnewaysFuture.py +++ b/python/test/Ice/operations/OnewaysFuture.py @@ -21,7 +21,7 @@ def onewaysFuture(communicator, proxy): f.sent() try: - p.ice_isAAsync(Test._MyClassDisp.ice_staticId()) + p.ice_isAAsync(Test.MyClass.ice_staticId()) test(False) except RuntimeError: pass diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py index 0b727f42970..a7cce20ca50 100755 --- a/python/test/Ice/operations/ServerAMD.py +++ b/python/test/Ice/operations/ServerAMD.py @@ -37,7 +37,7 @@ class FutureThread(threading.Thread): time.sleep(0.01) self.future.set_result(self.result) -class MyDerivedClassI(Test._MyDerivedClassDisp): +class MyDerivedClassI(Test.MyDerivedClass): def __init__(self): self.threads = [] self.threadLock = threading.Lock() @@ -46,19 +46,19 @@ class MyDerivedClassI(Test._MyDerivedClassDisp): def ice_isA(self, id, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - return Test._MyDerivedClassDisp.ice_isA(self, id, current) + return Test.MyDerivedClass.ice_isA(self, id, current) def ice_ping(self, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - Test._MyDerivedClassDisp.ice_ping(self, current) + Test.MyDerivedClass.ice_ping(self, current) def ice_ids(self, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - return Test._MyDerivedClassDisp.ice_ids(self, current) + return Test.MyDerivedClass.ice_ids(self, current) def ice_id(self, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - return Test._MyDerivedClassDisp.ice_id(self, current) + return Test.MyDerivedClass.ice_id(self, current) def shutdown(self, current=None): with self.threadLock: diff --git a/python/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py index 0a3b39966ff..04ef6f468ed 100644 --- a/python/test/Ice/operations/TestI.py +++ b/python/test/Ice/operations/TestI.py @@ -13,26 +13,26 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class MyDerivedClassI(Test._MyDerivedClassDisp): +class MyDerivedClassI(Test.MyDerivedClass): def __init__(self): self.lock = threading.Lock() self.opByteSOnewayCount = 0 def ice_isA(self, id, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - return Test._MyDerivedClassDisp.ice_isA(self, id, current) + return Test.MyDerivedClass.ice_isA(self, id, current) def ice_ping(self, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - Test._MyDerivedClassDisp.ice_ping(self, current) + Test.MyDerivedClass.ice_ping(self, current) def ice_ids(self, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - return Test._MyDerivedClassDisp.ice_ids(self, current) + return Test.MyDerivedClass.ice_ids(self, current) def ice_id(self, current=None): test(current.mode == Ice.OperationMode.Nonmutating) - return Test._MyDerivedClassDisp.ice_id(self, current) + return Test.MyDerivedClass.ice_id(self, current) def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py index 1e473884823..f68fd306c47 100644 --- a/python/test/Ice/operations/Twoways.py +++ b/python/test/Ice/operations/Twoways.py @@ -103,7 +103,7 @@ def twoways(communicator, p): # # ice_isA # - test(p.ice_isA(Test._MyClassDisp.ice_staticId())) + test(p.ice_isA(Test.MyClass.ice_staticId())) # # ice_ids @@ -117,13 +117,13 @@ def twoways(communicator, p): # # ice_id # - test(p.ice_id() == Test._MyDerivedClassDisp.ice_staticId()) + test(p.ice_id() == Test.MyDerivedClass.ice_staticId()) # # Prx ice_staticId # - test(Test.MyClassPrx.ice_staticId() == Test._MyClassDisp.ice_staticId()) - test(Test.MyDerivedClassPrx.ice_staticId() == Test._MyDerivedClassDisp.ice_staticId()) + test(Test.MyClassPrx.ice_staticId() == Test.MyClass.ice_staticId()) + test(Test.MyDerivedClassPrx.ice_staticId() == Test.MyDerivedClass.ice_staticId()) test(Ice.ObjectPrx.ice_staticId() == Ice.Object.ice_staticId()) # diff --git a/python/test/Ice/operations/TwowaysAMI.py b/python/test/Ice/operations/TwowaysAMI.py index 5f7cc1445c0..6f754f9e3e6 100644 --- a/python/test/Ice/operations/TwowaysAMI.py +++ b/python/test/Ice/operations/TwowaysAMI.py @@ -757,7 +757,7 @@ def twowaysAMI(communicator, p): cb.check() cb = Callback() - p.begin_ice_isA(Test._MyClassDisp.ice_staticId(), cb.isA, cb.exCB) + p.begin_ice_isA(Test.MyClass.ice_staticId(), cb.isA, cb.exCB) cb.check() cb = Callback() diff --git a/python/test/Ice/operations/TwowaysFuture.py b/python/test/Ice/operations/TwowaysFuture.py index 0b24cc7ac08..abc4c5aa77e 100644 --- a/python/test/Ice/operations/TwowaysFuture.py +++ b/python/test/Ice/operations/TwowaysFuture.py @@ -902,7 +902,7 @@ def twowaysFuture(communicator, p): f = p.ice_pingAsync() test(f.result() is None) - f = p.ice_isAAsync(Test._MyClassDisp.ice_staticId()) + f = p.ice_isAAsync(Test.MyClass.ice_staticId()) test(f.result()) f = p.ice_idAsync() diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py index 46cd0fbebf2..daf66a2c91e 100755 --- a/python/test/Ice/optional/Server.py +++ b/python/test/Ice/optional/Server.py @@ -14,7 +14,7 @@ import Ice Ice.loadSlice('Test.ice') import Test -class InitialI(Test._InitialDisp): +class InitialI(Test.Initial): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py index c2cbe60ceec..67e8db9baab 100755 --- a/python/test/Ice/optional/ServerAMD.py +++ b/python/test/Ice/optional/ServerAMD.py @@ -14,7 +14,7 @@ import Ice Ice.loadSlice('TestAMD.ice') import Test -class InitialI(Test._InitialDisp): +class InitialI(Test.Initial): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py index 6a310161383..72d6e41bc55 100755 --- a/python/test/Ice/proxy/ServerAMD.py +++ b/python/test/Ice/proxy/ServerAMD.py @@ -19,7 +19,7 @@ if not slice_dir: Ice.loadSlice("'-I" + slice_dir + "' TestAMD.ice") import Test -class MyDerivedClassI(Test._MyDerivedClassDisp): +class MyDerivedClassI(Test.MyDerivedClass): def __init__(self): self.ctx = None @@ -34,7 +34,7 @@ class MyDerivedClassI(Test._MyDerivedClassDisp): def ice_isA(self, s, current): self.ctx = current.ctx - return Test._MyDerivedClassDisp.ice_isA(self, s, current) + return Test.MyDerivedClass.ice_isA(self, s, current) def run(args, communicator): communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") diff --git a/python/test/Ice/proxy/TestI.py b/python/test/Ice/proxy/TestI.py index 3c6be1cba94..5ee763ab1ee 100644 --- a/python/test/Ice/proxy/TestI.py +++ b/python/test/Ice/proxy/TestI.py @@ -10,7 +10,7 @@ import Ice, Test import time -class MyDerivedClassI(Test._MyDerivedClassDisp): +class MyDerivedClassI(Test.MyDerivedClass): def __init__(self): self.ctx = None @@ -25,4 +25,4 @@ class MyDerivedClassI(Test._MyDerivedClassDisp): def ice_isA(self, s, current): self.ctx = current.ctx - return Test._MyDerivedClassDisp.ice_isA(self, s, current) + return Test.MyDerivedClass.ice_isA(self, s, current) diff --git a/python/test/Ice/servantLocator/TestAMDI.py b/python/test/Ice/servantLocator/TestAMDI.py index 2b53c01863f..40814c1a643 100644 --- a/python/test/Ice/servantLocator/TestAMDI.py +++ b/python/test/Ice/servantLocator/TestAMDI.py @@ -14,7 +14,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def requestFailedException(self, current=None): return None diff --git a/python/test/Ice/servantLocator/TestActivationAMDI.py b/python/test/Ice/servantLocator/TestActivationAMDI.py index af47ff448b5..f5ac04384a6 100644 --- a/python/test/Ice/servantLocator/TestActivationAMDI.py +++ b/python/test/Ice/servantLocator/TestActivationAMDI.py @@ -11,7 +11,7 @@ import os, sys, traceback, time import Ice, Test, TestAMDI -class TestActivationAMDI(Test._TestActivationDisp): +class TestActivationAMDI(Test.TestActivation): def activateServantLocator(self, activate, current=None): if(activate): diff --git a/python/test/Ice/servantLocator/TestActivationI.py b/python/test/Ice/servantLocator/TestActivationI.py index fc01f072f34..4e795914b79 100644 --- a/python/test/Ice/servantLocator/TestActivationI.py +++ b/python/test/Ice/servantLocator/TestActivationI.py @@ -11,7 +11,7 @@ import os, sys, traceback, time import Ice, Test, TestI -class TestActivationI(Test._TestActivationDisp): +class TestActivationI(Test.TestActivation): def activateServantLocator(self, activate, current=None): if activate: diff --git a/python/test/Ice/servantLocator/TestI.py b/python/test/Ice/servantLocator/TestI.py index 4b9eb26c0cf..6063eb7e288 100644 --- a/python/test/Ice/servantLocator/TestI.py +++ b/python/test/Ice/servantLocator/TestI.py @@ -14,7 +14,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def requestFailedException(self, current=None): pass diff --git a/python/test/Ice/slicing/exceptions/AllTests.py b/python/test/Ice/slicing/exceptions/AllTests.py index 6a8dc126729..1a56ee2b282 100644 --- a/python/test/Ice/slicing/exceptions/AllTests.py +++ b/python/test/Ice/slicing/exceptions/AllTests.py @@ -189,7 +189,7 @@ class Callback(CallbackBase): test(False) self.called() -class RelayI(Test._RelayDisp): +class RelayI(Test.Relay): def knownPreservedAsBase(self, current=None): ex = Test.KnownPreservedDerived() ex.b = "base" diff --git a/python/test/Ice/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py index 223cdb31ebd..44a58914a5f 100755 --- a/python/test/Ice/slicing/exceptions/Server.py +++ b/python/test/Ice/slicing/exceptions/Server.py @@ -13,7 +13,7 @@ import Ice Ice.loadSlice('-I. --all ServerPrivate.ice') import Test -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py index d398e502e77..c4a3ab4336b 100755 --- a/python/test/Ice/slicing/exceptions/ServerAMD.py +++ b/python/test/Ice/slicing/exceptions/ServerAMD.py @@ -14,7 +14,7 @@ import Ice Ice.loadSlice('-I. --all ServerPrivateAMD.ice') import Test -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() diff --git a/python/test/Ice/slicing/objects/Server.py b/python/test/Ice/slicing/objects/Server.py index b1780ef5881..f112a643c52 100755 --- a/python/test/Ice/slicing/objects/Server.py +++ b/python/test/Ice/slicing/objects/Server.py @@ -18,7 +18,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def SBaseAsObject(self, current=None): sb = Test.SBase() sb.sb = "SBase.sb" diff --git a/python/test/Ice/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py index f64a6f13af9..2cdc89e5f7d 100755 --- a/python/test/Ice/slicing/objects/ServerAMD.py +++ b/python/test/Ice/slicing/objects/ServerAMD.py @@ -18,7 +18,7 @@ def test(b): if not b: raise RuntimeError('test assertion failed') -class TestI(Test._TestIntfDisp): +class TestI(Test.TestIntf): def SBaseAsObject(self, current=None): sb = Test.SBase() sb.sb = "SBase.sb" diff --git a/python/test/Ice/thread/TestI.py b/python/test/Ice/thread/TestI.py index 5270f46ec64..cb7245ddd50 100644 --- a/python/test/Ice/thread/TestI.py +++ b/python/test/Ice/thread/TestI.py @@ -49,11 +49,11 @@ class ThreadHook(Ice.ThreadNotification): with self.cond: return self.threadStopCount -class TestIntfI(Test._TestIntfDisp): +class TestIntfI(Test.TestIntf): def sleep(self, ms, current = None): time.sleep(ms / 1000.0) -class RemoteCommunicatorI(Test._RemoteCommunicatorDisp): +class RemoteCommunicatorI(Test.RemoteCommunicator): def __init__(self, communicator, hook): self.communicator = communicator self.hook = hook @@ -79,7 +79,7 @@ class RemoteCommunicatorI(Test._RemoteCommunicatorDisp): def destroy(self, current = None): self.communicator.destroy() -class RemoteCommunicatorFactoryI(Test._RemoteCommunicatorFactoryDisp): +class RemoteCommunicatorFactoryI(Test.RemoteCommunicatorFactory): def createCommunicator(self, props, current = None): # diff --git a/python/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py index 8834fe8d1ce..28dd620eac5 100755 --- a/python/test/Ice/timeout/Server.py +++ b/python/test/Ice/timeout/Server.py @@ -29,7 +29,7 @@ class ActivateAdapterThread(threading.Thread): time.sleep(self._timeout / 1000.0) self._adapter.activate() -class TimeoutI(Test._TimeoutDisp): +class TimeoutI(Test.Timeout): def op(self, current=None): pass diff --git a/python/test/Slice/escape/Client.py b/python/test/Slice/escape/Client.py index 6165c266c73..126d2810482 100755 --- a/python/test/Slice/escape/Client.py +++ b/python/test/Slice/escape/Client.py @@ -24,15 +24,15 @@ Ice.loadSlice('Clash.ice') import _and -class delI(_and._delDisp): +class delI(_and._del): def _elifAsync(self, _else, current=None): pass -class execI(_and._execDisp): +class execI(_and._exec): def _finally(self, current=None): assert current.operation == "finally" -class ifI(_and._ifDisp): +class ifI(_and._if): def _elifAsync(self, _else, current=None): pass def _finally(self, current=None): |