Merged Mark's pythonami branch

1 files changed, 41 insertions, 89 deletions

diff --git a/py/test/Ice/slicing/exceptions/AllTests.py b/py/test/Ice/slicing/exceptions/AllTests.py
index 79e09026355..b6913be8bab 100644
--- a/py/test/Ice/slicing/exceptions/AllTests.py
+++ b/py/test/Ice/slicing/exceptions/AllTests.py
@@ -37,11 +37,11 @@ class CallbackBase:
         self._cond.notify()
         self._cond.release()
 
-class AMI_Test_baseAsBaseI(CallbackBase):
-    def ice_response(self):
+class Callback(CallbackBase):
+    def response(self):
         test(False)
 
-    def ice_exception(self, exc):
+    def exception_baseAsBase(self, exc):
         try:
             raise exc
         except Test.Base, b:
@@ -51,11 +51,7 @@ class AMI_Test_baseAsBaseI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_unknownDerivedAsBaseI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_unknownDerivedAsBase(self, exc):
         try:
             raise exc
         except Test.Base, b:
@@ -65,11 +61,7 @@ class AMI_Test_unknownDerivedAsBaseI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_knownDerivedAsBaseI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_knownDerivedAsBase(self, exc):
         try:
             raise exc
         except Test.KnownDerived, k:
@@ -80,11 +72,7 @@ class AMI_Test_knownDerivedAsBaseI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_knownDerivedAsKnownDerivedI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_knownDerivedAsKnownDerived(self, exc):
         try:
             raise exc
         except Test.KnownDerived, k:
@@ -95,11 +83,7 @@ class AMI_Test_knownDerivedAsKnownDerivedI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_unknownIntermediateAsBaseI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_unknownIntermediateAsBase(self, exc):
         try:
             raise exc
         except Test.Base, b:
@@ -109,11 +93,7 @@ class AMI_Test_unknownIntermediateAsBaseI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_knownIntermediateAsBaseI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_knownIntermediateAsBase(self, exc):
         try:
             raise exc
         except Test.KnownIntermediate, ki:
@@ -124,11 +104,7 @@ class AMI_Test_knownIntermediateAsBaseI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_knownMostDerivedAsBaseI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_knownMostDerivedAsBase(self, exc):
         try:
             raise exc
         except Test.KnownMostDerived, kmd:
@@ -140,11 +116,7 @@ class AMI_Test_knownMostDerivedAsBaseI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_knownIntermediateAsKnownIntermediateI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_knownIntermediateAsKnownIntermediate(self, exc):
         try:
             raise exc
         except Test.KnownIntermediate, ki:
@@ -155,11 +127,7 @@ class AMI_Test_knownIntermediateAsKnownIntermediateI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_knownMostDerivedAsKnownMostDerivedI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_knownMostDerivedAsKnownMostDerived(self, exc):
         try:
             raise exc
         except Test.KnownMostDerived, kmd:
@@ -171,11 +139,7 @@ class AMI_Test_knownMostDerivedAsKnownMostDerivedI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_knownMostDerivedAsKnownIntermediateI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_knownMostDerivedAsKnownIntermediate(self, exc):
         try:
             raise exc
         except Test.KnownMostDerived, kmd:
@@ -187,11 +151,7 @@ class AMI_Test_knownMostDerivedAsKnownIntermediateI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_unknownMostDerived1AsBaseI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_unknownMostDerived1AsBase(self, exc):
         try:
             raise exc
         except Test.KnownIntermediate, ki:
@@ -202,11 +162,7 @@ class AMI_Test_unknownMostDerived1AsBaseI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_unknownMostDerived1AsKnownIntermediateI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_unknownMostDerived1AsKnownIntermediate(self, exc):
         try:
             raise exc
         except Test.KnownIntermediate, ki:
@@ -217,11 +173,7 @@ class AMI_Test_unknownMostDerived1AsKnownIntermediateI(CallbackBase):
             test(False)
         self.called()
 
-class AMI_Test_unknownMostDerived2AsBaseI(CallbackBase):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, exc):
+    def exception_unknownMostDerived2AsBase(self, exc):
         try:
             raise exc
         except Test.Base, b:
@@ -247,8 +199,8 @@ def allTests(communicator):
     print "ok"
 
     print "base (AMI)... ",
-    cb = AMI_Test_baseAsBaseI()
-    t.baseAsBase_async(cb)
+    cb = Callback()
+    t.begin_baseAsBase(cb.response, cb.exception_baseAsBase)
     cb.check()
     print "ok"
 
@@ -264,8 +216,8 @@ def allTests(communicator):
     print "ok"
 
     print "slicing of unknown derived (AMI)... ",
-    cb = AMI_Test_unknownDerivedAsBaseI()
-    t.unknownDerivedAsBase_async(cb)
+    cb = Callback()
+    t.begin_unknownDerivedAsBase(cb.response, cb.exception_unknownDerivedAsBase)
     cb.check()
     print "ok"
 
@@ -282,8 +234,8 @@ def allTests(communicator):
     print "ok"
 
     print "non-slicing of known derived as base (AMI)... ",
-    cb = AMI_Test_knownDerivedAsBaseI()
-    t.knownDerivedAsBase_async(cb)
+    cb = Callback()
+    t.begin_knownDerivedAsBase(cb.response, cb.exception_knownDerivedAsBase)
     cb.check()
     print "ok"
 
@@ -300,8 +252,8 @@ def allTests(communicator):
     print "ok"
 
     print "non-slicing of known derived as derived (AMI)... ",
-    cb = AMI_Test_knownDerivedAsKnownDerivedI()
-    t.knownDerivedAsKnownDerived_async(cb)
+    cb = Callback()
+    t.begin_knownDerivedAsKnownDerived(cb.response, cb.exception_knownDerivedAsKnownDerived)
     cb.check()
     print "ok"
 
@@ -317,8 +269,8 @@ def allTests(communicator):
     print "ok"
 
     print "slicing of unknown intermediate as base (AMI)... ",
-    cb = AMI_Test_unknownIntermediateAsBaseI()
-    t.unknownIntermediateAsBase_async(cb)
+    cb = Callback()
+    t.begin_unknownIntermediateAsBase(cb.response, cb.exception_unknownIntermediateAsBase)
     cb.check()
     print "ok"
 
@@ -335,8 +287,8 @@ def allTests(communicator):
     print "ok"
 
     print "slicing of known intermediate as base (AMI)... ",
-    cb = AMI_Test_knownIntermediateAsBaseI()
-    t.knownIntermediateAsBase_async(cb)
+    cb = Callback()
+    t.begin_knownIntermediateAsBase(cb.response, cb.exception_knownIntermediateAsBase)
     cb.check()
     print "ok"
 
@@ -354,8 +306,8 @@ def allTests(communicator):
     print "ok"
 
     print "slicing of known most derived as base (AMI)... ",
-    cb = AMI_Test_knownMostDerivedAsBaseI()
-    t.knownMostDerivedAsBase_async(cb)
+    cb = Callback()
+    t.begin_knownMostDerivedAsBase(cb.response, cb.exception_knownMostDerivedAsBase)
     cb.check()
     print "ok"
 
@@ -372,8 +324,8 @@ def allTests(communicator):
     print "ok"
 
     print "non-slicing of known intermediate as intermediate (AMI)... ",
-    cb = AMI_Test_knownIntermediateAsKnownIntermediateI()
-    t.knownIntermediateAsKnownIntermediate_async(cb)
+    cb = Callback()
+    t.begin_knownIntermediateAsKnownIntermediate(cb.response, cb.exception_knownIntermediateAsKnownIntermediate)
     cb.check()
     print "ok"
 
@@ -391,8 +343,8 @@ def allTests(communicator):
     print "ok"
 
     print "non-slicing of known most derived as intermediate (AMI)... ",
-    cb = AMI_Test_knownMostDerivedAsKnownIntermediateI()
-    t.knownMostDerivedAsKnownIntermediate_async(cb)
+    cb = Callback()
+    t.begin_knownMostDerivedAsKnownIntermediate(cb.response, cb.exception_knownMostDerivedAsKnownIntermediate)
     cb.check()
     print "ok"
 
@@ -410,8 +362,8 @@ def allTests(communicator):
     print "ok"
 
     print "non-slicing of known most derived as most derived (AMI)... ",
-    cb = AMI_Test_knownMostDerivedAsKnownMostDerivedI()
-    t.knownMostDerivedAsKnownMostDerived_async(cb)
+    cb = Callback()
+    t.begin_knownMostDerivedAsKnownMostDerived(cb.response, cb.exception_knownMostDerivedAsKnownMostDerived)
     cb.check()
     print "ok"
 
@@ -428,8 +380,8 @@ def allTests(communicator):
     print "ok"
 
     print "slicing of unknown most derived, known intermediate as base (AMI)... ",
-    cb = AMI_Test_unknownMostDerived1AsBaseI()
-    t.unknownMostDerived1AsBase_async(cb)
+    cb = Callback()
+    t.begin_unknownMostDerived1AsBase(cb.response, cb.exception_unknownMostDerived1AsBase)
     cb.check()
     print "ok"
 
@@ -446,8 +398,8 @@ def allTests(communicator):
     print "ok"
 
     print "slicing of unknown most derived, known intermediate as intermediate (AMI)... ",
-    cb = AMI_Test_unknownMostDerived1AsKnownIntermediateI()
-    t.unknownMostDerived1AsKnownIntermediate_async(cb)
+    cb = Callback()
+    t.begin_unknownMostDerived1AsKnownIntermediate(cb.response, cb.exception_unknownMostDerived1AsKnownIntermediate)
     cb.check()
     print "ok"
 
@@ -463,8 +415,8 @@ def allTests(communicator):
     print "ok"
 
     print "slicing of unknown most derived, unknown intermediate as base (AMI)... ",
-    cb = AMI_Test_unknownMostDerived2AsBaseI()
-    t.unknownMostDerived2AsBase_async(cb)
+    cb = Callback()
+    t.begin_unknownMostDerived2AsBase(cb.response, cb.exception_unknownMostDerived2AsBase)
     cb.check()
     print "ok"