diff options
| author | Joe George <joe@zeroc.com> | 2020-07-08 12:16:43 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2020-07-08 12:16:43 -0400 |
| commit | 52afaa55469c60eeafbc863e9288305874069fb7 (patch) | |
| tree | 3595b4f74c7528feb7fb1ecb14e43ce85aeb8e74 | |
| parent | Add class cycle detection during unmarshaling (#946) (diff) | |
| download | ice-52afaa55469c60eeafbc863e9288305874069fb7.tar.bz2 ice-52afaa55469c60eeafbc863e9288305874069fb7.tar.xz ice-52afaa55469c60eeafbc863e9288305874069fb7.zip | |
Class cycle test fixes
| -rw-r--r-- | matlab/test/Ice/objects/AllTests.m | 2 | ||||
| -rw-r--r-- | objective-c/test/Ice/optional/Server.m | 1 | ||||
| -rw-r--r-- | swift/test/Ice/optional/Server.swift | 2 | ||||
| -rw-r--r-- | swift/test/Ice/optional/ServerAMD.swift | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/matlab/test/Ice/objects/AllTests.m b/matlab/test/Ice/objects/AllTests.m index a12538eb07e..47bf9d747a4 100644 --- a/matlab/test/Ice/objects/AllTests.m +++ b/matlab/test/Ice/objects/AllTests.m @@ -317,7 +317,7 @@ classdef AllTests initial.setCycle(rec); assert(acceptsCycles); catch ex - assert(!acceptsCycles); + assert(~acceptsCycles); end fprintf('ok\n'); diff --git a/objective-c/test/Ice/optional/Server.m b/objective-c/test/Ice/optional/Server.m index 351f7421538..23a43dbfbf2 100644 --- a/objective-c/test/Ice/optional/Server.m +++ b/objective-c/test/Ice/optional/Server.m @@ -44,6 +44,7 @@ main(int argc, char* argv[]) { ICEInitializationData* initData = [ICEInitializationData initializationData]; initData.properties = defaultServerProperties(&argc, argv); + [initData.properties setProperty:@"Ice.AcceptClassCycles" value:@"1"]; #if TARGET_OS_IPHONE initData.prefixTable_ = [NSDictionary dictionaryWithObjectsAndKeys: @"TestOptional", @"::Test", diff --git a/swift/test/Ice/optional/Server.swift b/swift/test/Ice/optional/Server.swift index 0aedb17b402..259e6170c4f 100644 --- a/swift/test/Ice/optional/Server.swift +++ b/swift/test/Ice/optional/Server.swift @@ -8,7 +8,7 @@ import TestCommon class Server: TestHelperI { public override func run(args: [String]) throws { let properties = try createTestProperties(args) - + properties.setProperty(key: "Ice.AcceptClassCycles", value: "1") var initData = Ice.InitializationData() initData.properties = properties initData.classResolverPrefix = ["IceOptional"] diff --git a/swift/test/Ice/optional/ServerAMD.swift b/swift/test/Ice/optional/ServerAMD.swift index 39e8e1bfb90..ffe514119ef 100644 --- a/swift/test/Ice/optional/ServerAMD.swift +++ b/swift/test/Ice/optional/ServerAMD.swift @@ -8,7 +8,7 @@ import TestCommon class ServerAMD: TestHelperI { public override func run(args: [String]) throws { let properties = try createTestProperties(args) - + properties.setProperty(key: "Ice.AcceptClassCycles", value: "1") var initData = Ice.InitializationData() initData.properties = properties initData.classResolverPrefix = ["IceOptionalAMD"] |