Merge pull request #1323 from StephenMcConnel/bug-23591

[mono.git] / mcs / class / System.Runtime.Remoting / Test / SyncCalls.cs

diff --git a/mcs/class/System.Runtime.Remoting/Test/SyncCalls.cs b/mcs/class/System.Runtime.Remoting/Test/SyncCalls.cs
index 7b015e33de546504d940137af82119e9a2e6cd8e..4fdc3be11b67443337179b4354c9f3336cb76bb6 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/Test/SyncCalls.cs
+++ b/mcs/class/System.Runtime.Remoting/Test/SyncCalls.cs
@@ -1,5 +1,5 @@
 //
-// MonoTests.System.Runtime.Remoting.SyncCalls.cs
+// MonoTests.Remoting.SyncCalls.cs
 //
 // Author: Lluis Sanchez Gual (lluis@ximian.com)
 //
@@ -9,8 +9,10 @@
 using System;
 using System.Collections;
 using NUnit.Framework;
+using System.Text;
+using System.Runtime.InteropServices;
 
-namespace MonoTests.System.Runtime.Remoting
+namespace MonoTests.Remoting
 {
        public abstract class SyncCallTest : BaseCallTest
        {
@@ -31,9 +33,9 @@ namespace MonoTests.System.Runtime.Remoting
                        return RemoteObject.PrimitiveParams (a, b, c, d);
                }
 
-               public override string PrimitiveParamsInOut (ref int a1, out int a2, ref float b1, out float b2, ref char c1, out char c2, ref string d1, out string d2)
+               public override string PrimitiveParamsInOut (ref int a1, out int a2, ref float b1, out float b2, int filler, ref char c1, out char c2, ref string d1, out string d2)
                {
-                       return RemoteObject.PrimitiveParamsInOut (ref a1, out a2, ref b1, out b2, ref c1, out c2, ref d1, out d2);
+                       return RemoteObject.PrimitiveParamsInOut (ref a1, out a2, ref b1, out b2, filler, ref c1, out c2, ref d1, out d2);
                }
 
                public override Complex ComplexParams (ArrayList a, Complex b, string c)
@@ -41,9 +43,14 @@ namespace MonoTests.System.Runtime.Remoting
                        return RemoteObject.ComplexParams (a, b, c);
                }
 
-               public override Complex ComplexParamsInOut (ref ArrayList a, out Complex b, string c)
+               public override Complex ComplexParamsInOut (ref ArrayList a, out Complex b, [In,Out] byte[] bytes, [In,Out] StringBuilder sb, string c)
                {
-                       return RemoteObject.ComplexParamsInOut (ref a, out b, c);
+                       return RemoteObject.ComplexParamsInOut (ref a, out b, bytes, sb, c);
+               }
+
+               public override void ProcessContextData ()
+               {
+                       RemoteObject.ProcessContextData ();
                }
        }
 
@@ -59,9 +66,9 @@ namespace MonoTests.System.Runtime.Remoting
                        return RemoteObject.PrimitiveParams (a, b, c, d);
                }
 
-               public override string PrimitiveParamsInOut (ref int a1, out int a2, ref float b1, out float b2, ref char c1, out char c2, ref string d1, out string d2)
+               public override string PrimitiveParamsInOut (ref int a1, out int a2, ref float b1, out float b2, int filler, ref char c1, out char c2, ref string d1, out string d2)
                {
-                       return RemoteObject.PrimitiveParamsInOut (ref a1, out a2, ref b1, out b2, ref c1, out c2, ref d1, out d2);
+                       return RemoteObject.PrimitiveParamsInOut (ref a1, out a2, ref b1, out b2, filler, ref c1, out c2, ref d1, out d2);
                }
 
                public override Complex ComplexParams (ArrayList a, Complex b, string c)
@@ -69,9 +76,14 @@ namespace MonoTests.System.Runtime.Remoting
                        return RemoteObject.ComplexParams (a, b, c);
                }
 
-               public override Complex ComplexParamsInOut (ref ArrayList a, out Complex b, string c)
+               public override Complex ComplexParamsInOut (ref ArrayList a, out Complex b, [In,Out] byte[] bytes, [In,Out] StringBuilder sb, string c)
+               {
+                       return RemoteObject.ComplexParamsInOut (ref a, out b, bytes, sb, c);
+               }
+
+               public override void ProcessContextData ()
                {
-                       return RemoteObject.ComplexParamsInOut (ref a, out b, c);
+                       RemoteObject.ProcessContextData ();
                }
        }
 
@@ -87,9 +99,9 @@ namespace MonoTests.System.Runtime.Remoting
                        return RemoteObject.PrimitiveParams (a, b, c, d);
                }
 
-               public override string PrimitiveParamsInOut (ref int a1, out int a2, ref float b1, out float b2, ref char c1, out char c2, ref string d1, out string d2)
+               public override string PrimitiveParamsInOut (ref int a1, out int a2, ref float b1, out float b2, int filler, ref char c1, out char c2, ref string d1, out string d2)
                {
-                       return RemoteObject.PrimitiveParamsInOut (ref a1, out a2, ref b1, out b2, ref c1, out c2, ref d1, out d2);
+                       return RemoteObject.PrimitiveParamsInOut (ref a1, out a2, ref b1, out b2, filler, ref c1, out c2, ref d1, out d2);
                }
 
                public override Complex ComplexParams (ArrayList a, Complex b, string c)
@@ -97,10 +109,14 @@ namespace MonoTests.System.Runtime.Remoting
                        return RemoteObject.ComplexParams (a, b, c);
                }
 
-               public override Complex ComplexParamsInOut (ref ArrayList a, out Complex b, string c)
+               public override Complex ComplexParamsInOut (ref ArrayList a, out Complex b, [In,Out] byte[] bytes, [In,Out] StringBuilder sb, string c)
                {
-                       return RemoteObject.ComplexParamsInOut (ref a, out b, c);
+                       return RemoteObject.ComplexParamsInOut (ref a, out b, bytes, sb, c);
+               }
+
+               public override void ProcessContextData ()
+               {
+                       RemoteObject.ProcessContextData ();
                }
        }
 }
-