summaryrefslogtreecommitdiff
path: root/py/test/Ice/operations
diff options
context:
space:
mode:
Diffstat (limited to 'py/test/Ice/operations')
-rw-r--r--py/test/Ice/operations/ServerAMD.py10
-rw-r--r--py/test/Ice/operations/Test.ice44
-rw-r--r--py/test/Ice/operations/TestAMD.ice44
-rw-r--r--py/test/Ice/operations/TestI.py10
-rw-r--r--py/test/Ice/operations/Twoways.py2
-rw-r--r--py/test/Ice/operations/TwowaysAMI.py36
6 files changed, 73 insertions, 73 deletions
diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py
index 32609fe07f3..efedfc29c3a 100644
--- a/py/test/Ice/operations/ServerAMD.py
+++ b/py/test/Ice/operations/ServerAMD.py
@@ -97,7 +97,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
cb.ice_response(p2, p1)
def opByteS_async(self, cb, p1, p2, current=None):
- # By default sequence<byte> maps to a string.
+ # By default sequence<byte> maps to a string.
p3 = map(ord, p1)
p3.reverse()
r = map(ord, p1)
@@ -219,14 +219,14 @@ class MyDerivedClassI(Test.MyDerivedClass):
class TestCheckedCastI(Test.TestCheckedCast):
def __init__(self):
- self.ctx = None
+ self.ctx = None
def getContext(self, current):
- return self.ctx;
+ return self.ctx;
def ice_isA(self, s, current):
- self.ctx = current.ctx
- return Test.TestCheckedCast.ice_isA(self, s, current)
+ self.ctx = current.ctx
+ return Test.TestCheckedCast.ice_isA(self, s, current)
def run(args, communicator):
communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp")
diff --git a/py/test/Ice/operations/Test.ice b/py/test/Ice/operations/Test.ice
index 9c5e2b5d905..625066059a9 100644
--- a/py/test/Ice/operations/Test.ice
+++ b/py/test/Ice/operations/Test.ice
@@ -73,75 +73,75 @@ dictionary<string, MyEnum> StringMyEnumD;
void opVoid();
byte opByte(byte p1, byte p2,
- out byte p3);
+ out byte p3);
bool opBool(bool p1, bool p2,
- out bool p3);
+ out bool p3);
long opShortIntLong(short p1, int p2, long p3,
- out short p4, out int p5, out long p6);
+ out short p4, out int p5, out long p6);
double opFloatDouble(float p1, double p2,
- out float p3, out double p4);
+ out float p3, out double p4);
string opString(string p1, string p2,
- out string p3);
+ out string p3);
MyEnum opMyEnum(MyEnum p1, out MyEnum p2);
MyClass* opMyClass(MyClass* p1, out MyClass* p2, out MyClass* p3);
Structure opStruct(Structure p1, Structure p2,
- out Structure p3);
+ out Structure p3);
ByteS opByteS(ByteS p1, ByteS p2,
- out ByteS p3);
+ out ByteS p3);
BoolS opBoolS(BoolS p1, BoolS p2,
- out BoolS p3);
+ out BoolS p3);
LongS opShortIntLongS(Test::ShortS p1, IntS p2, LongS p3,
- out ::Test::ShortS p4, out IntS p5, out LongS p6);
+ out ::Test::ShortS p4, out IntS p5, out LongS p6);
DoubleS opFloatDoubleS(FloatS p1, DoubleS p2,
- out FloatS p3, out DoubleS p4);
+ out FloatS p3, out DoubleS p4);
StringS opStringS(StringS p1, StringS p2,
- out StringS p3);
+ out StringS p3);
ByteSS opByteSS(ByteSS p1, ByteSS p2,
- out ByteSS p3);
+ out ByteSS p3);
BoolSS opBoolSS(BoolSS p1, BoolSS p2,
- out BoolSS p3);
+ out BoolSS p3);
LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3,
- out ShortSS p4, out IntSS p5, out LongSS p6);
+ out ShortSS p4, out IntSS p5, out LongSS p6);
DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2,
- out FloatSS p3, out DoubleSS p4);
+ out FloatSS p3, out DoubleSS p4);
StringSS opStringSS(StringSS p1, StringSS p2,
- out StringSS p3);
+ out StringSS p3);
StringSSS opStringSSS(StringSSS p1, StringSSS p2,
- out StringSSS p3);
+ out StringSSS p3);
ByteBoolD opByteBoolD(ByteBoolD p1, ByteBoolD p2,
- out ByteBoolD p3);
+ out ByteBoolD p3);
ShortIntD opShortIntD(ShortIntD p1, ShortIntD p2,
- out ShortIntD p3);
+ out ShortIntD p3);
LongFloatD opLongFloatD(LongFloatD p1, LongFloatD p2,
- out LongFloatD p3);
+ out LongFloatD p3);
StringStringD opStringStringD(StringStringD p1, StringStringD p2,
- out StringStringD p3);
+ out StringStringD p3);
StringMyEnumD opStringMyEnumD(StringMyEnumD p1, StringMyEnumD p2,
- out StringMyEnumD p3);
+ out StringMyEnumD p3);
IntS opIntS(IntS s);
diff --git a/py/test/Ice/operations/TestAMD.ice b/py/test/Ice/operations/TestAMD.ice
index 1cd8bc7ec0b..7d1b34a292b 100644
--- a/py/test/Ice/operations/TestAMD.ice
+++ b/py/test/Ice/operations/TestAMD.ice
@@ -71,75 +71,75 @@ dictionary<string, MyEnum> StringMyEnumD;
void opVoid();
byte opByte(byte p1, byte p2,
- out byte p3);
+ out byte p3);
bool opBool(bool p1, bool p2,
- out bool p3);
+ out bool p3);
long opShortIntLong(short p1, int p2, long p3,
- out short p4, out int p5, out long p6);
+ out short p4, out int p5, out long p6);
double opFloatDouble(float p1, double p2,
- out float p3, out double p4);
+ out float p3, out double p4);
string opString(string p1, string p2,
- out string p3);
+ out string p3);
MyEnum opMyEnum(MyEnum p1, out MyEnum p2);
MyClass* opMyClass(MyClass* p1, out MyClass* p2, out MyClass* p3);
Structure opStruct(Structure p1, Structure p2,
- out Structure p3);
+ out Structure p3);
ByteS opByteS(ByteS p1, ByteS p2,
- out ByteS p3);
+ out ByteS p3);
BoolS opBoolS(BoolS p1, BoolS p2,
- out BoolS p3);
+ out BoolS p3);
LongS opShortIntLongS(Test::ShortS p1, IntS p2, LongS p3,
- out ::Test::ShortS p4, out IntS p5, out LongS p6);
+ out ::Test::ShortS p4, out IntS p5, out LongS p6);
DoubleS opFloatDoubleS(FloatS p1, DoubleS p2,
- out FloatS p3, out DoubleS p4);
+ out FloatS p3, out DoubleS p4);
StringS opStringS(StringS p1, StringS p2,
- out StringS p3);
+ out StringS p3);
ByteSS opByteSS(ByteSS p1, ByteSS p2,
- out ByteSS p3);
+ out ByteSS p3);
BoolSS opBoolSS(BoolSS p1, BoolSS p2,
- out BoolSS p3);
+ out BoolSS p3);
LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3,
- out ShortSS p4, out IntSS p5, out LongSS p6);
+ out ShortSS p4, out IntSS p5, out LongSS p6);
DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2,
- out FloatSS p3, out DoubleSS p4);
+ out FloatSS p3, out DoubleSS p4);
StringSS opStringSS(StringSS p1, StringSS p2,
- out StringSS p3);
+ out StringSS p3);
StringSSS opStringSSS(StringSSS p1, StringSSS p2,
- out StringSSS p3);
+ out StringSSS p3);
ByteBoolD opByteBoolD(ByteBoolD p1, ByteBoolD p2,
- out ByteBoolD p3);
+ out ByteBoolD p3);
ShortIntD opShortIntD(ShortIntD p1, ShortIntD p2,
- out ShortIntD p3);
+ out ShortIntD p3);
LongFloatD opLongFloatD(LongFloatD p1, LongFloatD p2,
- out LongFloatD p3);
+ out LongFloatD p3);
StringStringD opStringStringD(StringStringD p1, StringStringD p2,
- out StringStringD p3);
+ out StringStringD p3);
StringMyEnumD opStringMyEnumD(StringMyEnumD p1, StringMyEnumD p2,
- out StringMyEnumD p3);
+ out StringMyEnumD p3);
IntS opIntS(IntS s);
diff --git a/py/test/Ice/operations/TestI.py b/py/test/Ice/operations/TestI.py
index 5c1a43b42b6..b7462097a14 100644
--- a/py/test/Ice/operations/TestI.py
+++ b/py/test/Ice/operations/TestI.py
@@ -48,7 +48,7 @@ class MyDerivedClassI(Test.MyDerivedClass):
return (p2, p1)
def opByteS(self, p1, p2, current=None):
- # By default sequence<byte> maps to a string.
+ # By default sequence<byte> maps to a string.
p3 = map(ord, p1)
p3.reverse()
r = map(ord, p1)
@@ -170,11 +170,11 @@ class MyDerivedClassI(Test.MyDerivedClass):
class TestCheckedCastI(Test.TestCheckedCast):
def __init__(self):
- self.ctx = None
+ self.ctx = None
def getContext(self, current):
- return self.ctx;
+ return self.ctx;
def ice_isA(self, s, current):
- self.ctx = current.ctx
- return Test.TestCheckedCast.ice_isA(self, s, current)
+ self.ctx = current.ctx
+ return Test.TestCheckedCast.ice_isA(self, s, current)
diff --git a/py/test/Ice/operations/Twoways.py b/py/test/Ice/operations/Twoways.py
index 23ebae4032a..e18d79e8975 100644
--- a/py/test/Ice/operations/Twoways.py
+++ b/py/test/Ice/operations/Twoways.py
@@ -607,7 +607,7 @@ def twoways(communicator, p):
ic = Ice.initialize(data=initData)
ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'}
-
+
p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010 -t 10000"))
ic.getImplicitContext().setContext(ctx)
diff --git a/py/test/Ice/operations/TwowaysAMI.py b/py/test/Ice/operations/TwowaysAMI.py
index 6f1f9b2a24e..3e7ab4535da 100644
--- a/py/test/Ice/operations/TwowaysAMI.py
+++ b/py/test/Ice/operations/TwowaysAMI.py
@@ -148,21 +148,21 @@ class AMI_MyClass_opMyEnumI(CallbackBase):
class AMI_MyClass_opMyClassI(CallbackBase):
def __init__(self, communicator):
CallbackBase.__init__(self)
- self._communicator = communicator
+ self._communicator = communicator
def ice_response(self, r, c1, c2):
test(c1.ice_getIdentity() == self._communicator.stringToIdentity("test"))
test(c2.ice_getIdentity() == self._communicator.stringToIdentity("noSuchIdentity"))
test(r.ice_getIdentity() == self._communicator.stringToIdentity("test"))
- # We can't do the callbacks below in thread per connection mode.
- if self._communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0:
- r.opVoid()
- c1.opVoid()
- try:
- c2.opVoid()
- test(False)
- except Ice.ObjectNotExistException:
- pass
+ # We can't do the callbacks below in thread per connection mode.
+ if self._communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0:
+ r.opVoid()
+ c1.opVoid()
+ try:
+ c2.opVoid()
+ test(False)
+ except Ice.ObjectNotExistException:
+ pass
self.called()
def ice_exception(self, ex):
@@ -180,9 +180,9 @@ class AMI_MyClass_opStructI(CallbackBase):
test(rso.s.s == "def")
test(so.e == Test.MyEnum.enum3)
test(so.s.s == "a new string")
- # We can't do the callbacks below in thread per connection mode.
- if self._communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0:
- so.p.opVoid()
+ # We can't do the callbacks below in thread per connection mode.
+ if self._communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0:
+ so.p.opVoid()
self.called()
def ice_exception(self, ex):
@@ -527,9 +527,9 @@ def twowaysAMI(communicator, p):
oneway = Test.MyClassPrx.uncheckedCast(p.ice_oneway())
cb = AMI_MyClass_opVoidExI()
try:
- oneway.opVoid_async(cb)
+ oneway.opVoid_async(cb)
except Ice.Exception:
- test(False)
+ test(False)
test(cb.check())
# Check that a call to a twoway operation raises TwowayOnlyException
@@ -537,9 +537,9 @@ def twowaysAMI(communicator, p):
oneway = Test.MyClassPrx.uncheckedCast(p.ice_oneway())
cb = AMI_MyClass_opByteExI()
try:
- oneway.opByte_async(cb, 0, 0)
+ oneway.opByte_async(cb, 0, 0)
except Ice.Exception:
- test(False)
+ test(False)
test(cb.check())
#
@@ -867,7 +867,7 @@ def twowaysAMI(communicator, p):
ic = Ice.initialize(data=initData)
ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'}
-
+
p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010 -t 10000"))
ic.getImplicitContext().setContext(ctx)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:39:53 +0000