diff options
38 files changed, 197 insertions, 4 deletions
diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp index 38cdca817de..0854573df38 100644 --- a/cpp/test/Ice/operations/BatchOneways.cpp +++ b/cpp/test/Ice/operations/BatchOneways.cpp @@ -199,7 +199,16 @@ batchOneways(const Test::MyClassPrxPtr& p) ic->destroy(); } - if(batch->ice_getConnection() && + bool supportsCompress = true; + try + { + supportsCompress = p->supportsCompress(); + } + catch(const Ice::OperationNotExistException&) + { + } + + if(supportsCompress && batch->ice_getConnection() && p->ice_getCommunicator()->getProperties()->getProperty("Ice.Override.Compress") == "") { Ice::ObjectPrxPtr prx = batch->ice_getConnection()->createProxy(batch->ice_getIdentity())->ice_batchOneway(); diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice index d4c6f1c088a..e4e393e858a 100644 --- a/cpp/test/Ice/operations/Test.ice +++ b/cpp/test/Ice/operations/Test.ice @@ -98,6 +98,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice index 60de31074fe..31f8ff044a6 100644 --- a/cpp/test/Ice/operations/TestAMD.ice +++ b/cpp/test/Ice/operations/TestAMD.ice @@ -96,6 +96,8 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index c0ecb21857b..0127f931826 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -99,6 +99,17 @@ MyDerivedClassI::shutdownAsync(function<void()> response, } void +MyDerivedClassI::supportsCompressAsync(std::function<void(bool)> response, + std::function<void(std::exception_ptr)>, const Ice::Current&) +{ +#if defined(ICE_OS_UWP) + response(false); +#else + response(true); +#endif +} + +void MyDerivedClassI::opVoidAsync(function<void()> response, function<void(exception_ptr)>, const Ice::Current& current) @@ -1072,6 +1083,17 @@ MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const I } void +MyDerivedClassI::supportsCompress_async(const Test::AMD_MyClass_supportsCompressPtr& cb, + const Ice::Current&) +{ +#if defined(ICE_OS_UWP) + cb->ice_response(false); +#else + cb->ice_response(true); +#endif +} + +void MyDerivedClassI::opVoid_async(const Test::AMD_MyClass_opVoidPtr& cb, const Ice::Current& current) { test(current.mode == ICE_ENUM(OperationMode, Normal)); diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h index 7c934fb9cb8..2bcb5433a30 100644 --- a/cpp/test/Ice/operations/TestAMDI.h +++ b/cpp/test/Ice/operations/TestAMDI.h @@ -37,6 +37,10 @@ public: ::std::function<void(std::exception_ptr)>, const Ice::Current&); + virtual void supportsCompressAsync(std::function<void(bool)>, + std::function<void(std::exception_ptr)>, + const Ice::Current&); + virtual void opVoidAsync(::std::function<void()>, ::std::function<void(std::exception_ptr)>, const Ice::Current&); @@ -409,6 +413,9 @@ public: virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&, const Ice::Current&); + virtual void supportsCompress_async(const Test::AMD_MyClass_supportsCompressPtr&, + const Ice::Current&); + virtual void opVoid_async(const Test::AMD_MyClass_opVoidPtr&, const Ice::Current&); diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 1d2de97466b..4d0f3c0584a 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -64,6 +64,16 @@ MyDerivedClassI::shutdown(const Ice::Current& current) current.adapter->getCommunicator()->shutdown(); } +bool +MyDerivedClassI::supportsCompress(const Ice::Current& current) +{ +#if defined(ICE_OS_UWP) + return false; +#else + return true; +#endif +} + void MyDerivedClassI::opVoid(const Ice::Current& current) { diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h index 484ebc15c77..d1897d9e130 100644 --- a/cpp/test/Ice/operations/TestI.h +++ b/cpp/test/Ice/operations/TestI.h @@ -33,6 +33,8 @@ public: virtual void shutdown(const Ice::Current&); + virtual bool supportsCompress(const Ice::Current&); + virtual void opVoid(const Ice::Current&); virtual Ice::Byte opByte(Ice::Byte, diff --git a/cpp/test/ios/controller/Bundle/ControllerI.mm b/cpp/test/ios/controller/Bundle/ControllerI.mm index f7742af4a1e..aa53de48d7b 100644 --- a/cpp/test/ios/controller/Bundle/ControllerI.mm +++ b/cpp/test/ios/controller/Bundle/ControllerI.mm @@ -159,7 +159,8 @@ MainHelperI::shutdown() bool MainHelperI::redirect() { - return _dll.find("client") != string::npos || _dll.find("collocated") != string::npos; + //return _dll.find("client") != string::npos || _dll.find("collocated") != string::npos; + return true; } void diff --git a/csharp/test/Ice/operations/BatchOneways.cs b/csharp/test/Ice/operations/BatchOneways.cs index f7ba198dcb8..accc2531290 100644 --- a/csharp/test/Ice/operations/BatchOneways.cs +++ b/csharp/test/Ice/operations/BatchOneways.cs @@ -164,7 +164,17 @@ class BatchOneways } p.ice_ping(); - if(p.ice_getConnection() != null && + + bool supportsCompress = true; + try + { + supportsCompress = p.supportsCompress(); + } + catch(Ice.OperationNotExistException) + { + } + + if(supportsCompress && p.ice_getConnection() != null && p.ice_getCommunicator().getProperties().getProperty("Ice.Override.Compress").Equals("")) { Ice.ObjectPrx prx = p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway(); diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs index 8e9cfb10629..36e6b9df1b4 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs @@ -94,6 +94,11 @@ public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_ return null; } + public override Task<bool> supportsCompressAsync(Ice.Current current) + { + return Task.FromResult<bool>(true); + } + public override Task opVoidAsync(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs index e6d5c97cca0..4fd9d770edc 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs @@ -73,6 +73,11 @@ public sealed class MyDerivedClassTieI : MyDerivedClassOperations_ return null; } + public Task<bool> supportsCompressAsync(Ice.Current current) + { + return Task.FromResult<bool>(true); + } + public Task opVoidAsync(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); diff --git a/csharp/test/Ice/operations/MyDerivedClassI.cs b/csharp/test/Ice/operations/MyDerivedClassI.cs index bac9ebc256f..809d3425256 100644 --- a/csharp/test/Ice/operations/MyDerivedClassI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassI.cs @@ -53,6 +53,11 @@ public sealed class MyDerivedClassI : Test.MyDerivedClassDisp_ current.adapter.getCommunicator().shutdown(); } + public override bool supportsCompress(Ice.Current current) + { + return IceInternal.BZip2.supported(); + } + public override void opVoid(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); diff --git a/csharp/test/Ice/operations/MyDerivedClassTieI.cs b/csharp/test/Ice/operations/MyDerivedClassTieI.cs index aa06063d19a..f0fa101429d 100644 --- a/csharp/test/Ice/operations/MyDerivedClassTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassTieI.cs @@ -32,6 +32,11 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ current.adapter.getCommunicator().shutdown(); } + public bool supportsCompress(Ice.Current current) + { + return IceInternal.BZip2.supported(); + } + public void opVoid(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice index ccae3dfbd4e..568f6373c43 100644 --- a/csharp/test/Ice/operations/Test.ice +++ b/csharp/test/Ice/operations/Test.ice @@ -97,6 +97,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice index 25ee82366a7..467aa97907d 100644 --- a/csharp/test/Ice/operations/TestAMD.ice +++ b/csharp/test/Ice/operations/TestAMD.ice @@ -95,6 +95,8 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java index c8e76fbb773..d1c21e5e9d1 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java @@ -101,6 +101,14 @@ public final class AMDMyDerivedClassI extends _MyDerivedClassDisp @Override synchronized public void + supportsCompress_async(AMD_MyClass_supportsCompress cb, + Ice.Current current) + { + cb.ice_response(true); + } + + @Override + synchronized public void opVoid_async(AMD_MyClass_opVoid cb, Ice.Current current) { diff --git a/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java index 08d192ffd57..c263136f6e6 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java +++ b/java-compat/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java @@ -65,6 +65,14 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations @Override synchronized public void + supportsCompress_async(AMD_MyClass_supportsCompress cb, + Ice.Current current) + { + cb.ice_response(true); + } + + @Override + synchronized public void opVoid_async(AMD_MyClass_opVoid cb, Ice.Current current) { diff --git a/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java b/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java index 3f010aa3d70..f207464ecfe 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java +++ b/java-compat/test/src/main/java/test/Ice/operations/BatchOneways.java @@ -186,6 +186,15 @@ class BatchOneways ic.destroy(); } + boolean supportsCompress = true; + try + { + supportsCompress = p.supportsCompress(); + } + catch(Ice.OperationNotExistException ex) + { + } + p.ice_ping(); if(p.ice_getConnection() != null && properties.getProperty("Ice.Override.Compress").equals("")) { diff --git a/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java index 412b413de31..fb0a1d50f22 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java +++ b/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java @@ -69,6 +69,13 @@ public final class MyDerivedClassI extends _MyDerivedClassDisp } @Override + public boolean + supportsCompress(Ice.Current current) + { + return IceInternal.BZip2.supported(); + } + + @Override public void opVoid(Ice.Current current) { diff --git a/java-compat/test/src/main/java/test/Ice/operations/Test.ice b/java-compat/test/src/main/java/test/Ice/operations/Test.ice index d747fb15f19..fdb0749149b 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/Test.ice @@ -96,6 +96,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice index 17aeb247f7c..c435b4be32c 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -96,6 +96,8 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java index cc1796f8986..a1c40812f49 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java +++ b/java-compat/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java @@ -33,6 +33,13 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations } @Override + public boolean + supportsCompress(Ice.Current current) + { + return IceInternal.BZip2.supported(); + } + + @Override public void opVoid(Ice.Current current) { diff --git a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java index 750911119c1..ecb6cae5c7a 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java @@ -95,6 +95,12 @@ public final class AMDMyDerivedClassI implements MyDerivedClass } @Override + synchronized public CompletionStage<Boolean> supportsCompressAsync(Current current) + { + return CompletableFuture.completedFuture(true); + } + + @Override synchronized public CompletionStage<Void> opVoidAsync(Current current) { test(current.mode == com.zeroc.Ice.OperationMode.Normal); diff --git a/java/test/src/main/java/test/Ice/operations/BatchOneways.java b/java/test/src/main/java/test/Ice/operations/BatchOneways.java index f1747f75ac1..68931d622b5 100644 --- a/java/test/src/main/java/test/Ice/operations/BatchOneways.java +++ b/java/test/src/main/java/test/Ice/operations/BatchOneways.java @@ -180,8 +180,18 @@ class BatchOneways ic.destroy(); } + boolean supportsCompress = true; + try + { + supportsCompress = p.supportsCompress(); + } + catch(com.zeroc.Ice.OperationNotExistException ex) + { + } + p.ice_ping(); - if(p.ice_getConnection() != null && properties.getProperty("Ice.Override.Compress").equals("")) + if(supportsCompress && p.ice_getConnection() != null && + properties.getProperty("Ice.Override.Compress").equals("")) { com.zeroc.Ice.ObjectPrx prx = p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway(); diff --git a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java index 5f9772e038c..65ddcf56f00 100644 --- a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java @@ -64,6 +64,12 @@ public final class MyDerivedClassI implements MyDerivedClass } @Override + public boolean supportsCompress(Current current) + { + return com.zeroc.IceInternal.BZip2.supported(); + } + + @Override public void opVoid(Current current) { test(current.mode == com.zeroc.Ice.OperationMode.Normal); diff --git a/java/test/src/main/java/test/Ice/operations/Test.ice b/java/test/src/main/java/test/Ice/operations/Test.ice index a0f397831cc..0b30ebe26fc 100644 --- a/java/test/src/main/java/test/Ice/operations/Test.ice +++ b/java/test/src/main/java/test/Ice/operations/Test.ice @@ -96,6 +96,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/java/test/src/main/java/test/Ice/operations/TestAMD.ice b/java/test/src/main/java/test/Ice/operations/TestAMD.ice index 5cfb4e9ee7c..6b5c9b7921e 100644 --- a/java/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -96,6 +96,8 @@ dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD; { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/js/test/Ice/operations/AMDMyDerivedClassI.js b/js/test/Ice/operations/AMDMyDerivedClassI.js index 58b91ccec8f..6d25ec7642b 100644 --- a/js/test/Ice/operations/AMDMyDerivedClassI.js +++ b/js/test/Ice/operations/AMDMyDerivedClassI.js @@ -61,6 +61,11 @@ current.adapter.getCommunicator().shutdown(); } + async supportsCompress(current) + { + return false; + } + async opVoid(current) { test(current.mode === Ice.OperationMode.Normal); diff --git a/js/test/Ice/operations/MyDerivedClassI.js b/js/test/Ice/operations/MyDerivedClassI.js index 0314e0c6a23..f627221934f 100644 --- a/js/test/Ice/operations/MyDerivedClassI.js +++ b/js/test/Ice/operations/MyDerivedClassI.js @@ -61,6 +61,11 @@ current.adapter.getCommunicator().shutdown(); } + supportsCompress(current) + { + return false; + } + opVoid(current) { test(current.mode === Ice.OperationMode.Normal); diff --git a/js/test/Ice/operations/Test.ice b/js/test/Ice/operations/Test.ice index 5b91f23eb1c..04457b4be92 100644 --- a/js/test/Ice/operations/Test.ice +++ b/js/test/Ice/operations/Test.ice @@ -96,6 +96,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, @@ -287,6 +289,8 @@ interface Echo void startBatch(); void flushBatch(); void shutdown(); + +bool supportsCompress(); } // diff --git a/matlab/test/Ice/operations/Test.ice b/matlab/test/Ice/operations/Test.ice index 4ae52d91ca9..097e2dcfa78 100644 --- a/matlab/test/Ice/operations/Test.ice +++ b/matlab/test/Ice/operations/Test.ice @@ -97,6 +97,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/objective-c/test/Ice/operations/OperationsTest.ice b/objective-c/test/Ice/operations/OperationsTest.ice index 654afb00918..7e87d4bed05 100644 --- a/objective-c/test/Ice/operations/OperationsTest.ice +++ b/objective-c/test/Ice/operations/OperationsTest.ice @@ -119,6 +119,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/objective-c/test/Ice/operations/TestI.m b/objective-c/test/Ice/operations/TestI.m index 1dd7d277063..8c4a5847d32 100644 --- a/objective-c/test/Ice/operations/TestI.m +++ b/objective-c/test/Ice/operations/TestI.m @@ -856,4 +856,9 @@ { [[current.adapter getCommunicator] shutdown]; } + +-(BOOL) supportsCompress:(ICECurrent*)current +{ + return YES; +} @end diff --git a/php/test/Ice/operations/Test.ice b/php/test/Ice/operations/Test.ice index 57714be2f8e..b8ff0b6f083 100644 --- a/php/test/Ice/operations/Test.ice +++ b/php/test/Ice/operations/Test.ice @@ -83,6 +83,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/python/test/Ice/operations/Test.ice b/python/test/Ice/operations/Test.ice index ad12e426866..1a6adf0c5ca 100644 --- a/python/test/Ice/operations/Test.ice +++ b/python/test/Ice/operations/Test.ice @@ -95,6 +95,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, diff --git a/python/test/Ice/operations/TestAMDI.py b/python/test/Ice/operations/TestAMDI.py index 7c095a9a529..f5e0bb10e1a 100755 --- a/python/test/Ice/operations/TestAMDI.py +++ b/python/test/Ice/operations/TestAMDI.py @@ -63,6 +63,9 @@ class MyDerivedClassI(Test.MyDerivedClass): current.adapter.getCommunicator().shutdown() + def supportsCompress(self, current=None): + return Ice.Future.completed(True) + def opVoid(self, current=None): test(current.mode == Ice.OperationMode.Normal) diff --git a/python/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py index c58e4729b48..84eb7df938e 100644 --- a/python/test/Ice/operations/TestI.py +++ b/python/test/Ice/operations/TestI.py @@ -37,6 +37,9 @@ class MyDerivedClassI(Test.MyDerivedClass): def shutdown(self, current=None): current.adapter.getCommunicator().shutdown() + def supportsCompress(self, current=None): + return True + def opVoid(self, current=None): test(current.mode == Ice.OperationMode.Normal) diff --git a/ruby/test/Ice/operations/Test.ice b/ruby/test/Ice/operations/Test.ice index cf72cba9a89..fc7caac0cc7 100644 --- a/ruby/test/Ice/operations/Test.ice +++ b/ruby/test/Ice/operations/Test.ice @@ -95,6 +95,8 @@ interface MyClass { void shutdown(); + bool supportsCompress(); + void opVoid(); byte opByte(byte p1, byte p2, |