diff options
Diffstat (limited to 'swift/test')
61 files changed, 219 insertions, 154 deletions
diff --git a/swift/test/Ice/acm/Server.swift b/swift/test/Ice/acm/Server.swift index f666867671f..fac21ebc502 100644 --- a/swift/test/Ice/acm/Server.swift +++ b/swift/test/Ice/acm/Server.swift @@ -19,7 +19,8 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) communicator.getProperties().setProperty(key: "TestAdapter.ACM.Timeout", value: "0") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: RemoteCommunicatorI(), id: Ice.stringToIdentity("communicator")) + try adapter.add(servant: RemoteCommunicatorDisp(RemoteCommunicatorI()), + id: Ice.stringToIdentity("communicator")) try adapter.activate() serverReady() communicator.getProperties().setProperty(key: "Ice.PrintAdapterReady", value: "0") diff --git a/swift/test/Ice/acm/TestI.swift b/swift/test/Ice/acm/TestI.swift index caddea135a2..04d2a4b0528 100644 --- a/swift/test/Ice/acm/TestI.swift +++ b/swift/test/Ice/acm/TestI.swift @@ -34,7 +34,8 @@ class RemoteCommunicatorI: RemoteCommunicator { endpoints: "\(defaultProtocol) -h \"\(defaultHost)\"" ) - return try uncheckedCast(prx: current.adapter!.addWithUUID(RemoteObjectAdapterI(adapter: adapter)), + return try uncheckedCast( + prx: current.adapter!.addWithUUID(RemoteObjectAdapterDisp(RemoteObjectAdapterI(adapter: adapter))), type: RemoteObjectAdapterPrx.self) } @@ -49,7 +50,8 @@ class RemoteObjectAdapterI: RemoteObjectAdapter { init(adapter: Ice.ObjectAdapter) throws { _adapter = adapter - _testIntf = try uncheckedCast(prx: adapter.add(servant: TestI(), id: Ice.stringToIdentity("test")), + _testIntf = try uncheckedCast(prx: adapter.add(servant: TestIntfDisp(TestI()), + id: Ice.stringToIdentity("test")), type: TestIntfPrx.self) try _adapter.activate() } diff --git a/swift/test/Ice/adapterDeactivation/TestI.swift b/swift/test/Ice/adapterDeactivation/TestI.swift index aecef215785..ba33dbd9ef1 100644 --- a/swift/test/Ice/adapterDeactivation/TestI.swift +++ b/swift/test/Ice/adapterDeactivation/TestI.swift @@ -64,22 +64,22 @@ class ServantLocatorI: Ice.ServantLocator { precondition(_deactivated) } - func locate(_ current: Ice.Current) throws -> (returnValue: Object?, cookie: AnyObject?) { + func locate(_ current: Ice.Current) throws -> (returnValue: Disp?, cookie: AnyObject?) { try withLock(&_lock) { try _helper.test(!_deactivated) } if current.id.name == "router" { - return (_router, CookieI()) + return (RouterDisp(_router), CookieI()) } try _helper.test(current.id.category == "") try _helper.test(current.id.name == "test") - return (TestI(), CookieI()) + return (TestIntfDisp(TestI()), CookieI()) } - func finished(curr current: Ice.Current, servant: Ice.Object, cookie: Swift.AnyObject?) throws { + func finished(curr current: Ice.Current, servant: Ice.Disp, cookie: Swift.AnyObject?) throws { try withLock(&_lock) { try _helper.test(!_deactivated) } diff --git a/swift/test/Ice/admin/AllTests.swift b/swift/test/Ice/admin/AllTests.swift index 55e33ed1408..c403354e6f4 100644 --- a/swift/test/Ice/admin/AllTests.swift +++ b/swift/test/Ice/admin/AllTests.swift @@ -77,13 +77,13 @@ func testFacets(com: Ice.Communicator, builtInFacets: Bool, helper: TestHelper) let f2 = TestFacetI() let f3 = TestFacetI() - try com.addAdminFacet(servant: f1, facet: "Facet1") - try com.addAdminFacet(servant: f2, facet: "Facet2") - try com.addAdminFacet(servant: f3, facet: "Facet3") + try com.addAdminFacet(servant: TestFacetDisp(f1), facet: "Facet1") + try com.addAdminFacet(servant: TestFacetDisp(f2), facet: "Facet2") + try com.addAdminFacet(servant: TestFacetDisp(f3), facet: "Facet3") - try helper.test(com.findAdminFacet("Facet1") as! TestFacetI === f1) - try helper.test(com.findAdminFacet("Facet2") as! TestFacetI === f2) - try helper.test(com.findAdminFacet("Facet3") as! TestFacetI === f3) + try helper.test((com.findAdminFacet("Facet1") as! TestFacetDisp).servant as? TestFacetI === f1) + try helper.test((com.findAdminFacet("Facet2") as! TestFacetDisp).servant as? TestFacetI === f2) + try helper.test((com.findAdminFacet("Facet3") as! TestFacetDisp).servant as? TestFacetI === f3) try helper.test(com.findAdminFacet("Bogus") == nil) var facetMap = com.findAllAdminFacets() @@ -102,7 +102,7 @@ func testFacets(com: Ice.Communicator, builtInFacets: Bool, helper: TestHelper) try helper.test(facetMap["Facet3"] != nil) do { - try com.addAdminFacet(servant: f1, facet: "Facet1") + try com.addAdminFacet(servant: TestFacetDisp(f1), facet: "Facet1") try helper.test(false) } catch is Ice.AlreadyRegisteredException {} @@ -382,7 +382,8 @@ func allTests(_ helper: TestHelper) throws { let remoteLogger = RemoteLoggerI(helper: helper) - let myProxy = try uncheckedCast(prx: adapter.addWithUUID(remoteLogger), type: Ice.RemoteLoggerPrx.self) + let myProxy = try uncheckedCast(prx: adapter.addWithUUID(Ice.RemoteLoggerDisp(remoteLogger)), + type: Ice.RemoteLoggerPrx.self) try adapter.activate() diff --git a/swift/test/Ice/admin/Server.swift b/swift/test/Ice/admin/Server.swift index dd763990ce8..b2d3212f803 100644 --- a/swift/test/Ice/admin/Server.swift +++ b/swift/test/Ice/admin/Server.swift @@ -15,7 +15,8 @@ class Server: TestHelperI { value: "\(self.getTestEndpoint(num: 0)) -t 10000") let adapter = try communicator.createObjectAdapter("TestAdapter") let id = try Ice.stringToIdentity("factory") - try adapter.add(servant: RemoteCommunicatorFactoryI(), id: id) + try adapter.add(servant: RemoteCommunicatorFactoryDisp(RemoteCommunicatorFactoryI()), + id: id) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/admin/TestI.swift b/swift/test/Ice/admin/TestI.swift index c6cf5557f1d..07adc55b588 100644 --- a/swift/test/Ice/admin/TestI.swift +++ b/swift/test/Ice/admin/TestI.swift @@ -115,7 +115,7 @@ class RemoteCommunicatorFactoryI: RemoteCommunicatorFactory { // // Install a custom admin facet. // - try communicator.addAdminFacet(servant: TestFacetI(), facet: "TestFacet") + try communicator.addAdminFacet(servant: TestFacetDisp(TestFacetI()), facet: "TestFacet") // // The RemoteCommunicator servant also implements PropertiesAdminUpdateCallback. @@ -123,12 +123,14 @@ class RemoteCommunicatorFactoryI: RemoteCommunicatorFactory { // let servant = RemoteCommunicatorI(communicator: communicator) - if let propFacet = communicator.findAdminFacet("Properties") as? NativePropertiesAdmin { + if let propDisp = communicator.findAdminFacet("Properties") as? PropertiesAdminDisp, + let propFacet = propDisp.servant as? NativePropertiesAdmin { _ = propFacet.addUpdateCallback { changes in servant.updated(changes: changes) } } - return try uncheckedCast(prx: current.adapter!.addWithUUID(servant), type: RemoteCommunicatorPrx.self) + return try uncheckedCast(prx: current.adapter!.addWithUUID(RemoteCommunicatorDisp(servant)), + type: RemoteCommunicatorPrx.self) } func shutdown(current: Ice.Current) throws { diff --git a/swift/test/Ice/ami/Collocated.swift b/swift/test/Ice/ami/Collocated.swift index 5d6f883bd1f..bdec62b40a9 100644 --- a/swift/test/Ice/ami/Collocated.swift +++ b/swift/test/Ice/ami/Collocated.swift @@ -41,10 +41,13 @@ class Collocated: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") let adapter2 = try communicator.createObjectAdapter("ControllerAdapter") - try adapter.add(servant: TestI(helper: self), id: Ice.stringToIdentity("test")) - try adapter.add(servant: TestII(), id: Ice.stringToIdentity("test2")) + try adapter.add(servant: TestIntfDisp(TestI(helper: self)), + id: Ice.stringToIdentity("test")) + try adapter.add(servant: OuterInnerTestIntfDisp(TestII()), + id: Ice.stringToIdentity("test2")) try adapter.activate() - try adapter2.add(servant: TestControllerI(adapter: adapter), id: Ice.stringToIdentity("testController")) + try adapter2.add(servant: TestIntfControllerDisp(TestControllerI(adapter: adapter)), + id: Ice.stringToIdentity("testController")) try adapter2.activate() try allTests(self, collocated: true) } diff --git a/swift/test/Ice/ami/Server.swift b/swift/test/Ice/ami/Server.swift index 2d43d224df6..4457d7863bc 100644 --- a/swift/test/Ice/ami/Server.swift +++ b/swift/test/Ice/ami/Server.swift @@ -44,10 +44,11 @@ class Server: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") let adapter2 = try communicator.createObjectAdapter("ControllerAdapter") - try adapter.add(servant: TestI(helper: self), id: Ice.stringToIdentity("test")) - try adapter.add(servant: TestII(), id: Ice.stringToIdentity("test2")) + try adapter.add(servant: TestIntfDisp(TestI(helper: self)), id: Ice.stringToIdentity("test")) + try adapter.add(servant: OuterInnerTestIntfDisp(TestII()), id: Ice.stringToIdentity("test2")) try adapter.activate() - try adapter2.add(servant: TestControllerI(adapter: adapter), id: Ice.stringToIdentity("testController")) + try adapter2.add(servant: TestIntfControllerDisp(TestControllerI(adapter: adapter)), + id: Ice.stringToIdentity("testController")) try adapter2.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/binding/Server.swift b/swift/test/Ice/binding/Server.swift index a0bcdf232e0..c45fa06fb05 100644 --- a/swift/test/Ice/binding/Server.swift +++ b/swift/test/Ice/binding/Server.swift @@ -20,7 +20,8 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: RemoteCommunicatorI(helper: self), id: Ice.stringToIdentity("communicator")) + try adapter.add(servant: RemoteCommunicatorDisp(RemoteCommunicatorI(helper: self)), + id: Ice.stringToIdentity("communicator")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/binding/TestI.swift b/swift/test/Ice/binding/TestI.swift index 6c6afe09f6d..4e9f7e5f696 100644 --- a/swift/test/Ice/binding/TestI.swift +++ b/swift/test/Ice/binding/TestI.swift @@ -34,8 +34,9 @@ class RemoteCommunicatorI: RemoteCommunicator { } communicator.getProperties().setProperty(key: "\(name).ThreadPool.Size", value: "1") let adapter = try communicator.createObjectAdapterWithEndpoints(name: name, endpoints: endpoints) - return try uncheckedCast(prx: current.adapter!.addWithUUID(RemoteObjectAdapterI(adapter)), - type: RemoteObjectAdapterPrx.self) + return try uncheckedCast( + prx: current.adapter!.addWithUUID(RemoteObjectAdapterDisp(RemoteObjectAdapterI(adapter))), + type: RemoteObjectAdapterPrx.self) } catch let ex as Ice.SocketException { retry -= 1 if retry == 0 { @@ -57,7 +58,8 @@ class RemoteCommunicatorI: RemoteCommunicator { class RemoteObjectAdapterI: RemoteObjectAdapter { init(_ adapter: Ice.ObjectAdapter ) throws { _adapter = adapter - _testIntf = try uncheckedCast(prx: _adapter.add(servant: TestI(), id: Ice.stringToIdentity("test")), + _testIntf = try uncheckedCast(prx: _adapter.add(servant: TestIntfDisp(TestI()), + id: Ice.stringToIdentity("test")), type: TestIntfPrx.self) try _adapter.activate() } diff --git a/swift/test/Ice/defaultServant/AllTests.swift b/swift/test/Ice/defaultServant/AllTests.swift index b44f8ca0955..37ee8dbb400 100644 --- a/swift/test/Ice/defaultServant/AllTests.swift +++ b/swift/test/Ice/defaultServant/AllTests.swift @@ -5,7 +5,19 @@ import Ice import TestCommon -class MyObjectI: MyObject { +final class MyObjectI: MyObject, Object { + func ice_id(current: Current) -> String { + return MyObjectDisp.staticId + } + + func ice_ids(current: Current) -> [String] { + return MyObjectDisp.staticIds + } + + func ice_isA(s: String, current: Current) -> Bool { + return MyObjectDisp.staticIds.contains(s) + } + func ice_ping(current: Ice.Current) throws { if current.id.name == "ObjectNotExist" { throw Ice.ObjectNotExistException(id: current.id, facet: "", operation: "ice_ping") @@ -40,7 +52,7 @@ func allTests(_ helper: TestHelper) throws { // // Register default servant with category "foo" // - try oa.addDefaultServant(servant: servant, category: "foo") + try oa.addDefaultServant(servant: MyObjectDisp(servant), category: "foo") // // Start test @@ -48,7 +60,7 @@ func allTests(_ helper: TestHelper) throws { output.write("testing single category... ") var r = oa.findDefaultServant("foo") - try test((r as? MyObjectI) === servant) + try test((r as! MyObjectDisp).servant as? MyObjectI === servant) r = oa.findDefaultServant("bar") try test(r == nil) @@ -118,13 +130,13 @@ func allTests(_ helper: TestHelper) throws { output.write("testing default category... ") - try oa.addDefaultServant(servant: servant, category: "") + try oa.addDefaultServant(servant: MyObjectDisp(servant), category: "") r = oa.findDefaultServant("bar") try test(r == nil) r = oa.findDefaultServant("") - try test((r as? MyObjectI) === servant) + try test((r as! MyObjectDisp).servant as? MyObjectI === servant) for name in names { identity.name = name diff --git a/swift/test/Ice/enums/Server.swift b/swift/test/Ice/enums/Server.swift index a7b85c4ed97..98361086fab 100644 --- a/swift/test/Ice/enums/Server.swift +++ b/swift/test/Ice/enums/Server.swift @@ -15,7 +15,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: TestI(), id: Ice.stringToIdentity("test")) + try adapter.add(servant: TestIntfDisp(TestI()), id: Ice.stringToIdentity("test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/exceptions/AllTests.swift b/swift/test/Ice/exceptions/AllTests.swift index fda7aafda47..71624b3578c 100644 --- a/swift/test/Ice/exceptions/AllTests.swift +++ b/swift/test/Ice/exceptions/AllTests.swift @@ -8,11 +8,11 @@ import PromiseKit class ServantLocatorI: Ice.ServantLocator { - func locate(_ curr: Current) throws -> (returnValue: Object?, cookie: AnyObject?) { + func locate(_ curr: Current) throws -> (returnValue: Disp?, cookie: AnyObject?) { return (nil, nil) } - func finished(curr: Current, servant: Object, cookie: AnyObject?) throws { + func finished(curr: Current, servant: Disp, cookie: AnyObject?) throws { } func deactivate(_ category: String) { @@ -50,9 +50,9 @@ func allTests(_ helper: TestHelper) throws -> ThrowerPrx { communicator.getProperties().setProperty(key: "TestAdapter1.Endpoints", value: "tcp -h *") var adapter = try communicator.createObjectAdapter("TestAdapter1") let obj = EmptyI() - _ = try adapter.add(servant: obj, id: Ice.stringToIdentity("x")) + _ = try adapter.add(servant: EmptyDisp(obj), id: Ice.stringToIdentity("x")) do { - _ = try adapter.add(servant: obj, id: Ice.stringToIdentity("x")) + _ = try adapter.add(servant: EmptyDisp(obj), id: Ice.stringToIdentity("x")) try test(false) } catch is Ice.AlreadyRegisteredException {} diff --git a/swift/test/Ice/exceptions/Collocated.swift b/swift/test/Ice/exceptions/Collocated.swift index 07fd2e169ee..8ca47a8a677 100644 --- a/swift/test/Ice/exceptions/Collocated.swift +++ b/swift/test/Ice/exceptions/Collocated.swift @@ -30,7 +30,7 @@ class Collocated: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") let obj = ThrowerI() - try adapter.add(servant: obj, id: Ice.stringToIdentity("thrower")) + try adapter.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower")) try adapter.activate() diff --git a/swift/test/Ice/exceptions/Server.swift b/swift/test/Ice/exceptions/Server.swift index d1cb9aeab4e..682ef6da0de 100644 --- a/swift/test/Ice/exceptions/Server.swift +++ b/swift/test/Ice/exceptions/Server.swift @@ -46,9 +46,9 @@ class Server: TestHelperI { let adapter3 = try communicator.createObjectAdapter("TestAdapter3") let obj = ThrowerI() - try adapter.add(servant: obj, id: Ice.stringToIdentity("thrower")) - try adapter2.add(servant: obj, id: Ice.stringToIdentity("thrower")) - try adapter3.add(servant: obj, id: Ice.stringToIdentity("thrower")) + try adapter.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower")) + try adapter2.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower")) + try adapter3.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower")) try adapter.activate() try adapter2.activate() diff --git a/swift/test/Ice/exceptions/ServerAMD.swift b/swift/test/Ice/exceptions/ServerAMD.swift index b9706ce81c7..3ec3c3f4c6a 100644 --- a/swift/test/Ice/exceptions/ServerAMD.swift +++ b/swift/test/Ice/exceptions/ServerAMD.swift @@ -46,9 +46,9 @@ class ServerAMD: TestHelperI { let adapter3 = try communicator.createObjectAdapter("TestAdapter3") let obj = ThrowerI() - try adapter.add(servant: obj, id: Ice.stringToIdentity("thrower")) - try adapter2.add(servant: obj, id: Ice.stringToIdentity("thrower")) - try adapter3.add(servant: obj, id: Ice.stringToIdentity("thrower")) + try adapter.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower")) + try adapter2.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower")) + try adapter3.add(servant: ThrowerDisp(obj), id: Ice.stringToIdentity("thrower")) try adapter.activate() try adapter2.activate() diff --git a/swift/test/Ice/facets/AllTests.swift b/swift/test/Ice/facets/AllTests.swift index e2f6e5b60fd..ddd475352cd 100644 --- a/swift/test/Ice/facets/AllTests.swift +++ b/swift/test/Ice/facets/AllTests.swift @@ -40,10 +40,10 @@ func allTests(_ helper: TestHelper) throws -> GPrx { communicator.getProperties().setProperty(key: "FacetExceptionTestAdapter.Endpoints", value: "tcp -h *") let adapter = try communicator.createObjectAdapter("FacetExceptionTestAdapter") let obj = EmptyI() - _ = try adapter.add(servant: obj, id: Ice.stringToIdentity("d")) - _ = try adapter.addFacet(servant: obj, id: Ice.stringToIdentity("d"), facet: "facetABCD") + _ = try adapter.add(servant: EmptyDisp(obj), id: Ice.stringToIdentity("d")) + _ = try adapter.addFacet(servant: EmptyDisp(obj), id: Ice.stringToIdentity("d"), facet: "facetABCD") do { - _ = try adapter.addFacet(servant: obj, id: Ice.stringToIdentity("d"), facet: "facetABCD") + _ = try adapter.addFacet(servant: EmptyDisp(obj), id: Ice.stringToIdentity("d"), facet: "facetABCD") try test(false) } catch is Ice.AlreadyRegisteredException {} @@ -57,25 +57,25 @@ func allTests(_ helper: TestHelper) throws -> GPrx { output.write("testing removeAllFacets... ") let obj1 = EmptyI() let obj2 = EmptyI() - _ = try adapter.addFacet(servant: obj1, id: Ice.stringToIdentity("id1"), facet: "f1") - _ = try adapter.addFacet(servant: obj2, id: Ice.stringToIdentity("id1"), facet: "f2") + _ = try adapter.addFacet(servant: EmptyDisp(obj1), id: Ice.stringToIdentity("id1"), facet: "f1") + _ = try adapter.addFacet(servant: EmptyDisp(obj2), id: Ice.stringToIdentity("id1"), facet: "f2") let obj3 = EmptyI() - _ = try adapter.addFacet(servant: obj1, id: Ice.stringToIdentity("id2"), facet: "f1") - _ = try adapter.addFacet(servant: obj2, id: Ice.stringToIdentity("id2"), facet: "f2") - _ = try adapter.addFacet(servant: obj3, id: Ice.stringToIdentity("id2"), facet: "") + _ = try adapter.addFacet(servant: EmptyDisp(obj1), id: Ice.stringToIdentity("id2"), facet: "f1") + _ = try adapter.addFacet(servant: EmptyDisp(obj2), id: Ice.stringToIdentity("id2"), facet: "f2") + _ = try adapter.addFacet(servant: EmptyDisp(obj3), id: Ice.stringToIdentity("id2"), facet: "") var fm = try adapter.removeAllFacets(Ice.stringToIdentity("id1")) try test(fm.count == 2) - try test(fm["f1"] as? EmptyI === obj1) - try test(fm["f2"] as? EmptyI === obj2) + try test((fm["f1"] as! EmptyDisp).servant as? EmptyI === obj1) + try test((fm["f2"] as! EmptyDisp).servant as? EmptyI === obj2) do { _ = try adapter.removeAllFacets(Ice.stringToIdentity("id1")) try test(false) } catch is Ice.NotRegisteredException {} fm = try adapter.removeAllFacets(Ice.stringToIdentity("id2")) try test(fm.count == 3) - try test(fm["f1"] as? EmptyI === obj1) - try test(fm["f2"] as? EmptyI === obj2) - try test(fm[""] as? EmptyI === obj3) + try test((fm["f1"] as! EmptyDisp).servant as? EmptyI === obj1) + try test((fm["f2"] as! EmptyDisp).servant as? EmptyI === obj2) + try test((fm[""] as! EmptyDisp).servant as? EmptyI === obj3) output.writeLine("ok") adapter.deactivate() diff --git a/swift/test/Ice/facets/Collocated.swift b/swift/test/Ice/facets/Collocated.swift index e654755d1d9..95f6047ba6d 100644 --- a/swift/test/Ice/facets/Collocated.swift +++ b/swift/test/Ice/facets/Collocated.swift @@ -17,14 +17,14 @@ class Collocated: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") let d = DI() - try adapter.add(servant: d, id: Ice.stringToIdentity("d")) - try adapter.addFacet(servant: d, id: Ice.stringToIdentity("d"), facet: "facetABCD") + try adapter.add(servant: DDisp(d), id: Ice.stringToIdentity("d")) + try adapter.addFacet(servant: DDisp(d), id: Ice.stringToIdentity("d"), facet: "facetABCD") let f = FI() - try adapter.addFacet(servant: f, id: Ice.stringToIdentity("d"), facet: "facetEF") + try adapter.addFacet(servant: FDisp(f), id: Ice.stringToIdentity("d"), facet: "facetEF") let h = HI(communicator: communicator) - try adapter.addFacet(servant: h, id: Ice.stringToIdentity("d"), facet: "facetGH") + try adapter.addFacet(servant: HDisp(h), id: Ice.stringToIdentity("d"), facet: "facetGH") try adapter.activate() diff --git a/swift/test/Ice/facets/Server.swift b/swift/test/Ice/facets/Server.swift index ba669d8063d..da4ea827302 100644 --- a/swift/test/Ice/facets/Server.swift +++ b/swift/test/Ice/facets/Server.swift @@ -18,14 +18,14 @@ class Server: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") let d = DI() - try adapter.add(servant: d, id: Ice.stringToIdentity("d")) - try adapter.addFacet(servant: d, id: Ice.stringToIdentity("d"), facet: "facetABCD") + try adapter.add(servant: DDisp(d), id: Ice.stringToIdentity("d")) + try adapter.addFacet(servant: DDisp(d), id: Ice.stringToIdentity("d"), facet: "facetABCD") let f = FI() - try adapter.addFacet(servant: f, id: Ice.stringToIdentity("d"), facet: "facetEF") + try adapter.addFacet(servant: FDisp(f), id: Ice.stringToIdentity("d"), facet: "facetEF") let h = HI(communicator: communicator) - try adapter.addFacet(servant: h, id: Ice.stringToIdentity("d"), facet: "facetGH") + try adapter.addFacet(servant: HDisp(h), id: Ice.stringToIdentity("d"), facet: "facetGH") try adapter.activate() diff --git a/swift/test/Ice/hold/Server.swift b/swift/test/Ice/hold/Server.swift index 599e96e4f00..f1d2d18639a 100644 --- a/swift/test/Ice/hold/Server.swift +++ b/swift/test/Ice/hold/Server.swift @@ -19,7 +19,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter1.ThreadPool.SizeWarn", value: "0") communicator.getProperties().setProperty(key: "TestAdapter1.ThreadPool.Serialize", value: "0") let adapter1 = try communicator.createObjectAdapter("TestAdapter1") - try adapter1.add(servant: HoldI(adapter: adapter1, helper: self), id: Ice.stringToIdentity("hold")) + try adapter1.add(servant: HoldDisp(HoldI(adapter: adapter1, helper: self)), id: Ice.stringToIdentity("hold")) communicator.getProperties().setProperty(key: "TestAdapter2.Endpoints", value: getTestEndpoint(num: 1)) communicator.getProperties().setProperty(key: "TestAdapter2.ThreadPool.Size", value: "5") @@ -27,7 +27,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter2.ThreadPool.SizeWarn", value: "0") communicator.getProperties().setProperty(key: "TestAdapter2.ThreadPool.Serialize", value: "1") let adapter2 = try communicator.createObjectAdapter("TestAdapter2") - try adapter2.add(servant: HoldI(adapter: adapter2, helper: self), id: Ice.stringToIdentity("hold")) + try adapter2.add(servant: HoldDisp(HoldI(adapter: adapter2, helper: self)), id: Ice.stringToIdentity("hold")) try adapter1.activate() try adapter2.activate() diff --git a/swift/test/Ice/info/Server.swift b/swift/test/Ice/info/Server.swift index 8fac73d45bd..efbb26039a5 100644 --- a/swift/test/Ice/info/Server.swift +++ b/swift/test/Ice/info/Server.swift @@ -18,7 +18,7 @@ class Server: TestHelperI { key: "TestAdapter.Endpoints", value: "\(getTestEndpoint(num: 0)):\(getTestEndpoint(num: 0, prot: "udp"))") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: TestI(), id: Ice.stringToIdentity("test")) + try adapter.add(servant: TestIntfDisp(TestI()), id: Ice.stringToIdentity("test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/inheritance/Collocated.swift b/swift/test/Ice/inheritance/Collocated.swift index cbe57ff6c0c..503c7975988 100644 --- a/swift/test/Ice/inheritance/Collocated.swift +++ b/swift/test/Ice/inheritance/Collocated.swift @@ -16,7 +16,7 @@ class Collocated: TestHelperI { key: "TestAdapter.Endpoints", value: "\(getTestEndpoint(num: 0)):\(getTestEndpoint(num: 0, prot: "udp"))") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: InitialI(adapter), id: Ice.stringToIdentity("initial")) + try adapter.add(servant: InitialDisp(InitialI(adapter)), id: Ice.stringToIdentity("initial")) try adapter.activate() _ = try allTests(self) diff --git a/swift/test/Ice/inheritance/Server.swift b/swift/test/Ice/inheritance/Server.swift index 578a3ca4ff8..f466aebfb94 100644 --- a/swift/test/Ice/inheritance/Server.swift +++ b/swift/test/Ice/inheritance/Server.swift @@ -18,7 +18,7 @@ class Server: TestHelperI { key: "TestAdapter.Endpoints", value: "\(getTestEndpoint(num: 0)):\(getTestEndpoint(num: 0, prot: "udp"))") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: InitialI(adapter), id: Ice.stringToIdentity("initial")) + try adapter.add(servant: InitialDisp(InitialI(adapter)), id: Ice.stringToIdentity("initial")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/inheritance/TestI.swift b/swift/test/Ice/inheritance/TestI.swift index 6c3f847df6d..a0054d1cc23 100644 --- a/swift/test/Ice/inheritance/TestI.swift +++ b/swift/test/Ice/inheritance/TestI.swift @@ -5,13 +5,13 @@ import Ice import TestCommon -class CAI: MACADisp { +class CAI: MACAOperations { func caop(p: MACAPrx?, current: Ice.Current) throws -> MACAPrx? { return p } } -class CBI: MBCBDisp { +class CBI: MBCBOperations { func caop(p: MACAPrx?, current: Ice.Current) throws -> MACAPrx? { return p } @@ -21,7 +21,7 @@ class CBI: MBCBDisp { } } -class CCI: MACCDisp { +class CCI: MACCOperations { func caop(p: MACAPrx?, current: Ice.Current) throws -> MACAPrx? { return p } @@ -35,7 +35,7 @@ class CCI: MACCDisp { } } -class CDI: MACDDisp { +class CDI: MACDOperations { func caop(p: MACAPrx?, current: Ice.Current) throws -> MACAPrx? { return p } @@ -123,14 +123,14 @@ class InitialI: Initial { let _ic: MAICPrx init(_ adapter: Ice.ObjectAdapter) throws { - _ca = try uncheckedCast(prx: adapter.addWithUUID(CAI()), type: MACAPrx.self) - _cb = try uncheckedCast(prx: adapter.addWithUUID(CBI()), type: MBCBPrx.self) - _cc = try uncheckedCast(prx: adapter.addWithUUID(CCI()), type: MACCPrx.self) - _cd = try uncheckedCast(prx: adapter.addWithUUID(CDI()), type: MACDPrx.self) - _ia = try uncheckedCast(prx: adapter.addWithUUID(IAI()), type: MAIAPrx.self) - _ib1 = try uncheckedCast(prx: adapter.addWithUUID(IB1I()), type: MBIB1Prx.self) - _ib2 = try uncheckedCast(prx: adapter.addWithUUID(IB2I()), type: MBIB2Prx.self) - _ic = try uncheckedCast(prx: adapter.addWithUUID(ICI()), type: MAICPrx.self) + _ca = try uncheckedCast(prx: adapter.addWithUUID(MACADisp(CAI())), type: MACAPrx.self) + _cb = try uncheckedCast(prx: adapter.addWithUUID(MBCBDisp(CBI())), type: MBCBPrx.self) + _cc = try uncheckedCast(prx: adapter.addWithUUID(MACCDisp(CCI())), type: MACCPrx.self) + _cd = try uncheckedCast(prx: adapter.addWithUUID(MACDDisp(CDI())), type: MACDPrx.self) + _ia = try uncheckedCast(prx: adapter.addWithUUID(MAIADisp(IAI())), type: MAIAPrx.self) + _ib1 = try uncheckedCast(prx: adapter.addWithUUID(MBIB1Disp(IB1I())), type: MBIB1Prx.self) + _ib2 = try uncheckedCast(prx: adapter.addWithUUID(MBIB2Disp(IB2I())), type: MBIB2Prx.self) + _ic = try uncheckedCast(prx: adapter.addWithUUID(MAICDisp(ICI())), type: MAICPrx.self) } func caop(current: Ice.Current) throws -> MACAPrx? { diff --git a/swift/test/Ice/invoke/Server.swift b/swift/test/Ice/invoke/Server.swift index 3bd198fe1c9..cd45bd97489 100644 --- a/swift/test/Ice/invoke/Server.swift +++ b/swift/test/Ice/invoke/Server.swift @@ -7,7 +7,7 @@ import TestCommon import Dispatch class ServantLocatorI: Ice.ServantLocator { - var _blobject: Ice.Object + var _blobject: Ice.Disp init (_ async: Bool) { if async { @@ -17,11 +17,11 @@ class ServantLocatorI: Ice.ServantLocator { } } - func locate(_ curr: Ice.Current) -> (returnValue: Ice.Object?, cookie: AnyObject?) { + func locate(_ curr: Ice.Current) -> (returnValue: Ice.Disp?, cookie: AnyObject?) { return (_blobject, nil) } - func finished(curr: Ice.Current, servant: Ice.Object, cookie: AnyObject?) {} + func finished(curr: Ice.Current, servant: Ice.Disp, cookie: AnyObject?) {} func deactivate(_ category: String) {} } diff --git a/swift/test/Ice/location/AllTests.swift b/swift/test/Ice/location/AllTests.swift index 8bb7307c08b..25ef72bd89c 100644 --- a/swift/test/Ice/location/AllTests.swift +++ b/swift/test/Ice/location/AllTests.swift @@ -485,7 +485,7 @@ func allTests(_ helper: TestHelper) throws { var ident = Ice.Identity() ident.name = UUID().uuidString - try registry.addObject(adapter.add(servant: HelloI(), id: ident)) + try registry.addObject(adapter.add(servant: HelloDisp(HelloI()), id: ident)) try adapter.activate() /*let helloPrx*/ _ = try checkedCast( diff --git a/swift/test/Ice/location/Server.swift b/swift/test/Ice/location/Server.swift index f42f7df5c6d..f19aab1341f 100644 --- a/swift/test/Ice/location/Server.swift +++ b/swift/test/Ice/location/Server.swift @@ -34,13 +34,14 @@ class Server: TestHelperI { // let registry = ServerLocatorRegistry() let object = ServerManagerI(registry: registry, helper: self) - try adapter.add(servant: object, id: Ice.stringToIdentity("ServerManager")) + try adapter.add(servant: ServerManagerDisp(object), id: Ice.stringToIdentity("ServerManager")) try registry.addObject(adapter.createProxy(Ice.stringToIdentity("ServerManager"))) - let registryPrx = try uncheckedCast(prx: adapter.add(servant: registry, id: Ice.stringToIdentity("registry")), + let registryPrx = try uncheckedCast(prx: adapter.add(servant: TestLocatorRegistryDisp(registry), + id: Ice.stringToIdentity("registry")), type: Ice.LocatorRegistryPrx.self) let locator = ServerLocator(registry: registry, registryPrx: registryPrx) - try adapter.add(servant: locator, id: Ice.stringToIdentity("locator")) + try adapter.add(servant: TestLocatorDisp(locator), id: Ice.stringToIdentity("locator")) try adapter.activate() serverReady() diff --git a/swift/test/Ice/location/TestI.swift b/swift/test/Ice/location/TestI.swift index d7b89f4e90b..db06c5458d0 100644 --- a/swift/test/Ice/location/TestI.swift +++ b/swift/test/Ice/location/TestI.swift @@ -23,7 +23,7 @@ class TestI: TestIntf { _adapter2 = adapter2 _registry = registry - try _registry.addObject(_adapter1.add(servant: HelloI(), id: Ice.stringToIdentity("hello"))) + try _registry.addObject(_adapter1.add(servant: HelloDisp(HelloI()), id: Ice.stringToIdentity("hello"))) } func shutdown(current: Ice.Current) throws { @@ -112,9 +112,9 @@ class ServerManagerI: ServerManager { try adapter2.setLocator(uncheckedCast(prx: locator, type: Ice.LocatorPrx.self)) let object = try TestI(adapter1: adapter, adapter2: adapter2, registry: _registry) - try _registry.addObject(adapter.add(servant: object, id: Ice.stringToIdentity("test"))) - try _registry.addObject(adapter.add(servant: object, id: Ice.stringToIdentity("test2"))) - _ = try adapter.add(servant: object, id: Ice.stringToIdentity("test3")) + try _registry.addObject(adapter.add(servant: TestIntfDisp(object), id: Ice.stringToIdentity("test"))) + try _registry.addObject(adapter.add(servant: TestIntfDisp(object), id: Ice.stringToIdentity("test2"))) + _ = try adapter.add(servant: TestIntfDisp(object), id: Ice.stringToIdentity("test3")) try adapter.activate() try adapter2.activate() diff --git a/swift/test/Ice/objects/Collocated.swift b/swift/test/Ice/objects/Collocated.swift index 516e1800ca4..df0f0a75cd5 100644 --- a/swift/test/Ice/objects/Collocated.swift +++ b/swift/test/Ice/objects/Collocated.swift @@ -29,8 +29,9 @@ class Collocated: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: InitialI(adapter), id: Ice.stringToIdentity("initial")) - try adapter.add(servant: UnexpectedObjectExceptionTestI(), id: Ice.stringToIdentity("uoet")) + try adapter.add(servant: InitialDisp(InitialI(adapter)), id: Ice.stringToIdentity("initial")) + try adapter.add(servant: UnexpectedObjectExceptionTestI(), + id: Ice.stringToIdentity("uoet")) try adapter.activate() let initial = try allTests(self) diff --git a/swift/test/Ice/objects/Server.swift b/swift/test/Ice/objects/Server.swift index 1400b99049e..dbff74b4d7f 100644 --- a/swift/test/Ice/objects/Server.swift +++ b/swift/test/Ice/objects/Server.swift @@ -23,7 +23,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: InitialI(adapter), id: Ice.stringToIdentity("initial")) + try adapter.add(servant: InitialDisp(InitialI(adapter)), id: Ice.stringToIdentity("initial")) try adapter.add(servant: UnexpectedObjectExceptionTestI(), id: Ice.stringToIdentity("uoet")) try adapter.activate() serverReady() diff --git a/swift/test/Ice/operations/Collocated.swift b/swift/test/Ice/operations/Collocated.swift index e5f7d964712..23f2e49f087 100644 --- a/swift/test/Ice/operations/Collocated.swift +++ b/swift/test/Ice/operations/Collocated.swift @@ -34,8 +34,9 @@ class Collocated: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: MyDerivedClassI(self), id: Ice.stringToIdentity("test")) - try adapter.add(servant: BI(), id: Ice.stringToIdentity("b")) + try adapter.add(servant: MBDisp(BI()), id: Ice.stringToIdentity("b")) + try adapter.add(servant: MyDerivedClassDisp(MyDerivedClassI(self)), + id: Ice.stringToIdentity("test")) try adapter.activate() _ = try allTests(helper: self) } diff --git a/swift/test/Ice/operations/Server.swift b/swift/test/Ice/operations/Server.swift index 6b4085a721d..714bbc43b94 100644 --- a/swift/test/Ice/operations/Server.swift +++ b/swift/test/Ice/operations/Server.swift @@ -29,8 +29,8 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: MyDerivedClassI(self), id: Ice.stringToIdentity("test")) - try adapter.add(servant: BI(), id: Ice.stringToIdentity("b")) + try adapter.add(servant: MBDisp(BI()), id: Ice.stringToIdentity("b")) + try adapter.add(servant: MyDerivedClassDisp(MyDerivedClassI(self)), id: Ice.stringToIdentity("test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/operations/ServerAMD.swift b/swift/test/Ice/operations/ServerAMD.swift index a407d4a6259..dab66459eae 100644 --- a/swift/test/Ice/operations/ServerAMD.swift +++ b/swift/test/Ice/operations/ServerAMD.swift @@ -29,8 +29,8 @@ class ServerAMD: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: MyDerivedClassI(self), id: Ice.stringToIdentity("test")) - try adapter.add(servant: BI(), id: Ice.stringToIdentity("b")) + try adapter.add(servant: MBDisp(BI()), id: Ice.stringToIdentity("b")) + try adapter.add(servant: MyDerivedClassDisp(MyDerivedClassI(self)), id: Ice.stringToIdentity("test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/operations/TestAMDI.swift b/swift/test/Ice/operations/TestAMDI.swift index 9076d9623c2..7d8b718b48f 100644 --- a/swift/test/Ice/operations/TestAMDI.swift +++ b/swift/test/Ice/operations/TestAMDI.swift @@ -7,7 +7,7 @@ import TestCommon import Foundation import PromiseKit -class BI: MBDisp { +class BI: MBOperations { func opBAsync(current: Ice.Current) -> Promise<Void> { return Promise.value(()) } diff --git a/swift/test/Ice/operations/TestI.swift b/swift/test/Ice/operations/TestI.swift index cfad2b2b8fa..b2f0ee8cfe1 100644 --- a/swift/test/Ice/operations/TestI.swift +++ b/swift/test/Ice/operations/TestI.swift @@ -6,9 +6,12 @@ import Ice import TestCommon import Foundation -class BI: MBDisp { - func opB(current: Ice.Current) throws {} - func opIntf(current: Ice.Current) throws {} +class BI: MBOperations { + func opB(current: Ice.Current) throws { + } + + func opIntf(current: Ice.Current) throws { + } } class MyDerivedClassI: MyDerivedClass { diff --git a/swift/test/Ice/optional/Server.swift b/swift/test/Ice/optional/Server.swift index 926199da0d1..0aedb17b402 100644 --- a/swift/test/Ice/optional/Server.swift +++ b/swift/test/Ice/optional/Server.swift @@ -19,7 +19,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: InitialI(), id: Ice.stringToIdentity("initial")) + try adapter.add(servant: InitialDisp(InitialI()), id: Ice.stringToIdentity("initial")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/optional/ServerAMD.swift b/swift/test/Ice/optional/ServerAMD.swift index 15aa35690f5..39e8e1bfb90 100644 --- a/swift/test/Ice/optional/ServerAMD.swift +++ b/swift/test/Ice/optional/ServerAMD.swift @@ -19,7 +19,7 @@ class ServerAMD: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: InitialI(), id: Ice.stringToIdentity("initial")) + try adapter.add(servant: InitialDisp(InitialI()), id: Ice.stringToIdentity("initial")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/proxy/Collocated.swift b/swift/test/Ice/proxy/Collocated.swift index fea36f9b994..88f17e2d2f1 100644 --- a/swift/test/Ice/proxy/Collocated.swift +++ b/swift/test/Ice/proxy/Collocated.swift @@ -21,7 +21,8 @@ class Collocated: TestHelperI { } communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: MyDerivedClassI(), id: Ice.stringToIdentity("test")) + try adapter.add(servant: MyDerivedClassDisp(MyDerivedClassI()), + id: Ice.stringToIdentity("test")) // try adapter.activate() // Don't activate OA to ensure collocation is used _ = try allTests(self) } diff --git a/swift/test/Ice/proxy/Server.swift b/swift/test/Ice/proxy/Server.swift index b94c900f48c..724dca6fece 100644 --- a/swift/test/Ice/proxy/Server.swift +++ b/swift/test/Ice/proxy/Server.swift @@ -22,7 +22,8 @@ class Server: TestHelperI { } communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: MyDerivedClassI(), id: Ice.stringToIdentity("test")) + try adapter.add(servant: MyDerivedClassDisp(MyDerivedClassI()), + id: Ice.stringToIdentity("test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/proxy/ServerAMD.swift b/swift/test/Ice/proxy/ServerAMD.swift index 40086d927d5..1b73068b0c4 100644 --- a/swift/test/Ice/proxy/ServerAMD.swift +++ b/swift/test/Ice/proxy/ServerAMD.swift @@ -23,7 +23,7 @@ class ServerAMD: TestHelperI { } communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: MyDerivedClassI(), id: Ice.stringToIdentity("test")) + try adapter.add(servant: MyDerivedClassDisp(MyDerivedClassI()), id: Ice.stringToIdentity("test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/proxy/TestAMDI.swift b/swift/test/Ice/proxy/TestAMDI.swift index 70cd73981d1..58aaaf90012 100644 --- a/swift/test/Ice/proxy/TestAMDI.swift +++ b/swift/test/Ice/proxy/TestAMDI.swift @@ -4,7 +4,7 @@ import Ice import PromiseKit -class MyDerivedClassI: MyDerivedClass { +final class MyDerivedClassI: MyDerivedClass, Object { var _ctx: [String: String] init() { @@ -27,8 +27,22 @@ class MyDerivedClassI: MyDerivedClass { return Promise.value(_ctx) } - func ice_isA(s: String, current: Ice.Current) throws -> Bool { + func ice_isA(s: String, current: Ice.Current) -> Bool { + _ctx = current.ctx + return MyDerivedClassDisp.staticIds.contains(s) + } + + func ice_ids(current: Ice.Current) -> [String] { + _ctx = current.ctx + return MyDerivedClassDisp.staticIds + } + + func ice_id(current: Ice.Current) -> String { + _ctx = current.ctx + return MyDerivedClassDisp.staticId + } + + func ice_ping(current: Ice.Current) { _ctx = current.ctx - return try ice_ids(current: current).contains(s) } } diff --git a/swift/test/Ice/proxy/TestI.swift b/swift/test/Ice/proxy/TestI.swift index 6921d88b3f7..3a8e6a388ed 100644 --- a/swift/test/Ice/proxy/TestI.swift +++ b/swift/test/Ice/proxy/TestI.swift @@ -3,7 +3,7 @@ // import Ice -class MyDerivedClassI: MyDerivedClass { +final class MyDerivedClassI: MyDerivedClass, Object { var _ctx: [String: String] init() { @@ -25,8 +25,22 @@ class MyDerivedClassI: MyDerivedClass { return _ctx } - func ice_isA(s: String, current: Ice.Current) throws -> Bool { + func ice_isA(s: String, current: Ice.Current) -> Bool { + _ctx = current.ctx + return MyDerivedClassDisp.staticIds.contains(s) + } + + func ice_id(current: Ice.Current) -> String { + _ctx = current.ctx + return MyDerivedClassDisp.staticId + } + + func ice_ids(current: Ice.Current) -> [String] { + _ctx = current.ctx + return MyDerivedClassDisp.staticIds + } + + func ice_ping(current: Current) { _ctx = current.ctx - return try ice_ids(current: current).contains(s) } } diff --git a/swift/test/Ice/retry/Collocated.swift b/swift/test/Ice/retry/Collocated.swift index 18cb17c6141..7fa231ed6bc 100644 --- a/swift/test/Ice/retry/Collocated.swift +++ b/swift/test/Ice/retry/Collocated.swift @@ -19,7 +19,7 @@ class Collocated: TestHelperI { } communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: RetryI(), id: Ice.stringToIdentity("retry")) + try adapter.add(servant: RetryDisp(RetryI()), id: Ice.stringToIdentity("retry")) // try adapter.activate() // Don't activate OA to ensure collocation is used _ = try allTests(helper: self) } diff --git a/swift/test/Ice/retry/Server.swift b/swift/test/Ice/retry/Server.swift index 8c71d6e0b2a..33482b0cb15 100644 --- a/swift/test/Ice/retry/Server.swift +++ b/swift/test/Ice/retry/Server.swift @@ -18,7 +18,7 @@ class Server: TestHelperI { } communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: RetryI(), id: Ice.stringToIdentity("retry")) + try adapter.add(servant: RetryDisp(RetryI()), id: Ice.stringToIdentity("retry")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/scope/Server.swift b/swift/test/Ice/scope/Server.swift index 15abefcb4c3..8166e79a796 100644 --- a/swift/test/Ice/scope/Server.swift +++ b/swift/test/Ice/scope/Server.swift @@ -18,10 +18,10 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: I1(), id: Ice.stringToIdentity("i1")) - try adapter.add(servant: I2(), id: Ice.stringToIdentity("i2")) - try adapter.add(servant: I3(), id: Ice.stringToIdentity("i3")) - try adapter.add(servant: I4(), id: Ice.stringToIdentity("i4")) + try adapter.add(servant: IDisp(I1()), id: Ice.stringToIdentity("i1")) + try adapter.add(servant: InnerIDisp(I2()), id: Ice.stringToIdentity("i2")) + try adapter.add(servant: InnerInner2IDisp(I3()), id: Ice.stringToIdentity("i3")) + try adapter.add(servant: InnerTestInner2IDisp(I4()), id: Ice.stringToIdentity("i4")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/servantLocator/Collocated.swift b/swift/test/Ice/servantLocator/Collocated.swift index 48239fc0a41..79833404042 100644 --- a/swift/test/Ice/servantLocator/Collocated.swift +++ b/swift/test/Ice/servantLocator/Collocated.swift @@ -22,8 +22,8 @@ class Collocated: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") try adapter.addServantLocator(locator: ServantLocatorI("category", self), category: "category") try adapter.addServantLocator(locator: ServantLocatorI("", self), category: "") - try adapter.add(servant: TestI(), id: Ice.stringToIdentity("asm")) - try adapter.add(servant: TestActivationI(self), id: Ice.stringToIdentity("test/activation")) + try adapter.add(servant: TestIntfDisp(TestI()), id: Ice.stringToIdentity("asm")) + try adapter.add(servant: TestActivationDisp(TestActivationI(self)), id: Ice.stringToIdentity("test/activation")) try adapter.activate() _ = try allTests(self) } diff --git a/swift/test/Ice/servantLocator/ServantLocatorI.swift b/swift/test/Ice/servantLocator/ServantLocatorI.swift index 71ca2224e1c..d7230b3ab46 100644 --- a/swift/test/Ice/servantLocator/ServantLocatorI.swift +++ b/swift/test/Ice/servantLocator/ServantLocatorI.swift @@ -32,7 +32,7 @@ class ServantLocatorI: Ice.ServantLocator { } } - func locate(_ curr: Ice.Current) throws -> (returnValue: Ice.Object?, cookie: AnyObject?) { + func locate(_ curr: Ice.Current) throws -> (returnValue: Ice.Disp?, cookie: AnyObject?) { try withLock(&_lock) { try _helper.test(!_deactivated) } @@ -55,10 +55,10 @@ class ServantLocatorI: Ice.ServantLocator { try _helper.test(_requestId == -1) _requestId = curr.requestId - return (TestI(), CookieI()) + return (TestIntfDisp(TestI()), CookieI()) } - func finished(curr: Ice.Current, servant: Ice.Object, cookie: AnyObject?) throws { + func finished(curr: Ice.Current, servant: Ice.Disp, cookie: AnyObject?) throws { try withLock(&_lock) { try _helper.test(!_deactivated) } diff --git a/swift/test/Ice/servantLocator/Server.swift b/swift/test/Ice/servantLocator/Server.swift index ebecfb31e2f..d1b4e9780d5 100644 --- a/swift/test/Ice/servantLocator/Server.swift +++ b/swift/test/Ice/servantLocator/Server.swift @@ -22,8 +22,8 @@ class Server: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") try adapter.addServantLocator(locator: ServantLocatorI("category", self), category: "category") try adapter.addServantLocator(locator: ServantLocatorI("", self), category: "") - try adapter.add(servant: TestI(), id: Ice.stringToIdentity("asm")) - try adapter.add(servant: TestActivationI(self), id: Ice.stringToIdentity("test/activation")) + try adapter.add(servant: TestIntfDisp(TestI()), id: Ice.stringToIdentity("asm")) + try adapter.add(servant: TestActivationDisp(TestActivationI(self)), id: Ice.stringToIdentity("test/activation")) try adapter.activate() serverReady() adapter.waitForDeactivate() diff --git a/swift/test/Ice/servantLocator/ServerAMD.swift b/swift/test/Ice/servantLocator/ServerAMD.swift index 7eb0b89d979..67ac190048e 100644 --- a/swift/test/Ice/servantLocator/ServerAMD.swift +++ b/swift/test/Ice/servantLocator/ServerAMD.swift @@ -22,8 +22,8 @@ class ServerAMD: TestHelperI { let adapter = try communicator.createObjectAdapter("TestAdapter") try adapter.addServantLocator(locator: ServantLocatorI("category", self), category: "category") try adapter.addServantLocator(locator: ServantLocatorI("", self), category: "") - try adapter.add(servant: TestI(), id: Ice.stringToIdentity("asm")) - try adapter.add(servant: TestActivationI(self), id: Ice.stringToIdentity("test/activation")) + try adapter.add(servant: TestIntfDisp(TestI()), id: Ice.stringToIdentity("asm")) + try adapter.add(servant: TestActivationDisp(TestActivationI(self)), id: Ice.stringToIdentity("test/activation")) try adapter.activate() serverReady() adapter.waitForDeactivate() diff --git a/swift/test/Ice/slicing/exceptions/AllTests.swift b/swift/test/Ice/slicing/exceptions/AllTests.swift index 0b3ac8dbc28..b4bf991b378 100644 --- a/swift/test/Ice/slicing/exceptions/AllTests.swift +++ b/swift/test/Ice/slicing/exceptions/AllTests.swift @@ -489,7 +489,7 @@ public func allTests(_ helper: TestHelper) throws -> TestIntfPrx { do { let adapter = try communicator.createObjectAdapter("") - let relay = try uncheckedCast(prx: adapter.addWithUUID(RelayI()), + let relay = try uncheckedCast(prx: adapter.addWithUUID(RelayDisp(RelayI())), type: RelayPrx.self) try adapter.activate() try testPrx.ice_getConnection()!.setAdapter(adapter) diff --git a/swift/test/Ice/slicing/exceptions/Server.swift b/swift/test/Ice/slicing/exceptions/Server.swift index bc8f7e53c89..ef5e7e12313 100644 --- a/swift/test/Ice/slicing/exceptions/Server.swift +++ b/swift/test/Ice/slicing/exceptions/Server.swift @@ -19,7 +19,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: "\(getTestEndpoint(num: 0)) -t 2000") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: TestI(self), id: Ice.stringToIdentity("Test")) + try adapter.add(servant: TestIntfDisp(TestI(self)), id: Ice.stringToIdentity("Test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/slicing/exceptions/ServerAMD.swift b/swift/test/Ice/slicing/exceptions/ServerAMD.swift index 037ae4b6937..a61d252bebc 100644 --- a/swift/test/Ice/slicing/exceptions/ServerAMD.swift +++ b/swift/test/Ice/slicing/exceptions/ServerAMD.swift @@ -19,7 +19,7 @@ class ServerAMD: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: "\(getTestEndpoint(num: 0)) -t 2000") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: TestI(self), id: Ice.stringToIdentity("Test")) + try adapter.add(servant: TestIntfDisp(TestI(self)), id: Ice.stringToIdentity("Test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/slicing/objects/Server.swift b/swift/test/Ice/slicing/objects/Server.swift index 477438fda06..256170c4df3 100644 --- a/swift/test/Ice/slicing/objects/Server.swift +++ b/swift/test/Ice/slicing/objects/Server.swift @@ -19,7 +19,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: "\(getTestEndpoint(num: 0)) -t 2000") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: TestI(self), id: Ice.stringToIdentity("Test")) + try adapter.add(servant: TestIntfDisp(TestI(self)), id: Ice.stringToIdentity("Test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/slicing/objects/ServerAMD.swift b/swift/test/Ice/slicing/objects/ServerAMD.swift index 6c712515a10..18e972b6913 100644 --- a/swift/test/Ice/slicing/objects/ServerAMD.swift +++ b/swift/test/Ice/slicing/objects/ServerAMD.swift @@ -19,7 +19,7 @@ class ServerAMD: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: "\(getTestEndpoint(num: 0)) -t 2000") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: TestI(self), id: Ice.stringToIdentity("Test")) + try adapter.add(servant: TestIntfDisp(TestI(self)), id: Ice.stringToIdentity("Test")) try adapter.activate() serverReady() communicator.waitForShutdown() diff --git a/swift/test/Ice/timeout/AllTests.swift b/swift/test/Ice/timeout/AllTests.swift index bcce3a4ed23..ae2687c4b61 100644 --- a/swift/test/Ice/timeout/AllTests.swift +++ b/swift/test/Ice/timeout/AllTests.swift @@ -323,7 +323,7 @@ public func allTests(helper: TestHelper) throws { let adapter = try communicator.createObjectAdapter("TimeoutCollocated") try adapter.activate() - let proxy = try uncheckedCast(prx: adapter.addWithUUID(TimeoutI()), + let proxy = try uncheckedCast(prx: adapter.addWithUUID(TimeoutDisp(TimeoutI())), type: TimeoutPrx.self).ice_invocationTimeout(100) do { try proxy.sleep(500) diff --git a/swift/test/Ice/timeout/Server.swift b/swift/test/Ice/timeout/Server.swift index c409e261386..37a5e37d939 100644 --- a/swift/test/Ice/timeout/Server.swift +++ b/swift/test/Ice/timeout/Server.swift @@ -37,11 +37,11 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "ControllerAdapter.ThreadPool.Size", value: "1") let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: TimeoutI(), id: Ice.stringToIdentity("timeout")) + try adapter.add(servant: TimeoutDisp(TimeoutI()), id: Ice.stringToIdentity("timeout")) try adapter.activate() let controllerAdapter = try communicator.createObjectAdapter("ControllerAdapter") - try controllerAdapter.add(servant: ControllerI(adapter), id: Ice.stringToIdentity("controller")) + try controllerAdapter.add(servant: ControllerDisp(ControllerI(adapter)), id: Ice.stringToIdentity("controller")) try controllerAdapter.activate() serverReady() diff --git a/swift/test/Ice/udp/AllTests.swift b/swift/test/Ice/udp/AllTests.swift index 4feb9a4f580..7c8a36c2804 100644 --- a/swift/test/Ice/udp/AllTests.swift +++ b/swift/test/Ice/udp/AllTests.swift @@ -52,7 +52,8 @@ public func allTests(_ helper: TestHelper) throws { communicator.getProperties().setProperty(key: "ReplyAdapter.Endpoints", value: "udp") let adapter = try communicator.createObjectAdapter("ReplyAdapter") var replyI = PingReplyI() - var reply = try uncheckedCast(prx: adapter.addWithUUID(replyI), type: PingReplyPrx.self).ice_datagram() + var reply = try uncheckedCast(prx: adapter.addWithUUID(PingReplyDisp(replyI)), + type: PingReplyPrx.self).ice_datagram() try adapter.activate() let output = helper.getWriter() @@ -75,7 +76,8 @@ public func allTests(_ helper: TestHelper) throws { // If the 3 datagrams were not received within the 2 seconds, we try again to // receive 3 new datagrams using a new object. We give up after 5 retries. replyI = PingReplyI() - reply = try uncheckedCast(prx: adapter.addWithUUID(replyI), type: PingReplyPrx.self).ice_datagram() + reply = try uncheckedCast(prx: adapter.addWithUUID(PingReplyDisp(replyI)), + type: PingReplyPrx.self).ice_datagram() } try test(ret) @@ -139,7 +141,7 @@ public func allTests(_ helper: TestHelper) throws { break } replyI = PingReplyI() - reply = try uncheckedCast(prx: adapter.addWithUUID(replyI).ice_datagram(), + reply = try uncheckedCast(prx: adapter.addWithUUID(PingReplyDisp(replyI)).ice_datagram(), type: PingReplyPrx.self) } @@ -162,7 +164,8 @@ public func allTests(_ helper: TestHelper) throws { break // Success } replyI = PingReplyI() - reply = try uncheckedCast(prx: adapter.addWithUUID(replyI), type: PingReplyPrx.self).ice_datagram() + reply = try uncheckedCast(prx: adapter.addWithUUID(PingReplyDisp(replyI)), + type: PingReplyPrx.self).ice_datagram() } try test(ret) output.writeLine("ok") diff --git a/swift/test/Ice/udp/Server.swift b/swift/test/Ice/udp/Server.swift index 755796941f0..0efc312436e 100644 --- a/swift/test/Ice/udp/Server.swift +++ b/swift/test/Ice/udp/Server.swift @@ -23,14 +23,14 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "ControlAdapter.Endpoints", value: getTestEndpoint(num: num ?? 0, prot: "tcp")) let adapter = try communicator.createObjectAdapter("ControlAdapter") - try adapter.add(servant: TestIntfI(), id: Ice.stringToIdentity("control")) + try adapter.add(servant: TestIntfDisp(TestIntfI()), id: Ice.stringToIdentity("control")) try adapter.activate() serverReady() if num == 0 { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0, prot: "udp")) let adapter2 = try communicator.createObjectAdapter("TestAdapter") - try adapter2.add(servant: TestIntfI(), id: Ice.stringToIdentity("test")) + try adapter2.add(servant: TestIntfDisp(TestIntfI()), id: Ice.stringToIdentity("test")) try adapter2.activate() } @@ -47,7 +47,7 @@ class Server: TestHelperI { endpoint += "\(getTestPort(properties: properties, num: 10))" communicator.getProperties().setProperty(key: "McastTestAdapter.Endpoints", value: endpoint) let mcastAdapter = try communicator.createObjectAdapter("McastTestAdapter") - try mcastAdapter.add(servant: TestIntfI(), id: Ice.stringToIdentity("test")) + try mcastAdapter.add(servant: TestIntfDisp(TestIntfI()), id: Ice.stringToIdentity("test")) try mcastAdapter.activate() communicator.waitForShutdown() } diff --git a/swift/test/IceSSL/configuration/Server.swift b/swift/test/IceSSL/configuration/Server.swift index a417f1c2bc5..1fdbf3286e9 100644 --- a/swift/test/IceSSL/configuration/Server.swift +++ b/swift/test/IceSSL/configuration/Server.swift @@ -23,7 +23,7 @@ class Server: TestHelperI { communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0, prot: "tcp")) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: ServerFactoryI(defaultDir: path, helper: self), + try adapter.add(servant: SSLServerFactoryDisp(ServerFactoryI(defaultDir: path, helper: self)), id: Ice.stringToIdentity("factory")) try adapter.activate() serverReady() diff --git a/swift/test/IceSSL/configuration/TestI.swift b/swift/test/IceSSL/configuration/TestI.swift index f985d3f651f..f453c63f78a 100644 --- a/swift/test/IceSSL/configuration/TestI.swift +++ b/swift/test/IceSSL/configuration/TestI.swift @@ -71,7 +71,7 @@ class ServerFactoryI: SSLServerFactory { let communicator = try Ice.initialize(initData) let adapter = try communicator.createObjectAdapterWithEndpoints(name: "ServerAdapter", endpoints: "ssl") let server = ServerI(communicator: communicator, helper: _helper) - let obj = try adapter.addWithUUID(server) + let obj = try adapter.addWithUUID(SSLServerDisp(server)) _servers[obj.ice_getIdentity()] = server try adapter.activate() return uncheckedCast(prx: obj, type: SSLServerPrx.self) diff --git a/swift/test/Slice/escape/Client.swift b/swift/test/Slice/escape/Client.swift index 33f61d6332d..fdbda0b243e 100644 --- a/swift/test/Slice/escape/Client.swift +++ b/swift/test/Slice/escape/Client.swift @@ -34,9 +34,9 @@ public class Client: TestHelperI { } communicator.getProperties().setProperty(key: "TestAdapter.Endpoints", value: getTestEndpoint(num: 0)) let adapter = try communicator.createObjectAdapter("TestAdapter") - try adapter.add(servant: breakI(), id: Ice.stringToIdentity("test")) - try adapter.add(servant: funcI(), id: Ice.stringToIdentity("test1")) - try adapter.add(servant: doI(), id: Ice.stringToIdentity("test2")) + try adapter.add(servant: breakDisp(breakI()), id: Ice.stringToIdentity("test")) + try adapter.add(servant: funcDisp(funcI()), id: Ice.stringToIdentity("test1")) + try adapter.add(servant: doDisp(doI()), id: Ice.stringToIdentity("test2")) try adapter.activate() let out = getWriter() |