Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / tests / remoting1.cs

diff --git a/mono/tests/remoting1.cs b/mono/tests/remoting1.cs
index fdc8a6659362f194273d19cea824831b571a38f6..ce9589469e1dfa59b76da3c07504fc79d74551fc 100644 (file)
--- a/mono/tests/remoting1.cs
+++ b/mono/tests/remoting1.cs
@@ -58,15 +58,33 @@ class MyProxy : RealProxy {
        }
 }
 
+public class EmptyProxy : RealProxy
+{
+       public EmptyProxy ( Type type ) : base( type ) 
+       { 
+       }
+
+       public override IMessage Invoke( IMessage msg )
+       {
+               IMethodCallMessage call = (IMethodCallMessage)msg;
+
+               return new ReturnMessage( null, null, 0, null, call );
+       }
+}
+
 public struct MyStruct {
        public int a;
        public int b;
        public int c;
 }
+
+interface R2 {
+}
        
-class R1 : MarshalByRefObject {
+class R1 : MarshalByRefObject, R2 {
 
        public int test_field = 5;
+       public object null_test_field;
        
        public virtual MyStruct Add (int a, out int c, int b) {
                Console.WriteLine ("ADD");
@@ -82,11 +100,15 @@ class R1 : MarshalByRefObject {
        }
 
        public long nonvirtual_Add (int a, int b) {
-               Console.WriteLine ("nonvirtual_Add");
+               Console.WriteLine ("nonvirtual_Add " + a + " + " + b);
                return a + b;
        }
 }
 
+class R3 : MarshalByRefObject {
+       public object anObject;
+}
+
 class Test {
 
        delegate MyStruct RemoteDelegate1 (int a, out int c, int b);
@@ -112,6 +134,8 @@ class Test {
                if (!RemotingServices.IsTransparentProxy (o))
                        return 2;
 
+               Console.WriteLine ("XXXXXXXXXXXX: " + RemotingServices.GetRealProxy (o));
+
                if (o.GetType () != myobj.GetType ())
                        return 3;
 
@@ -171,6 +195,19 @@ class Test {
                RemoteDelegate2 d2 = new RemoteDelegate2 (o.nonvirtual_Add);
                d2 (6, 7);
 
+               if (!(real_proxy.GetTransparentProxy () is R2))
+                       return 14;
+
+               /* Test what happens if the proxy doesn't return the required information */
+               EmptyProxy handler = new EmptyProxy ( typeof (R3) );
+               R3 o3 = (R3)handler.GetTransparentProxy();
+
+               if (o3.anObject != null)
+                       return 15;
+
+               if (o.null_test_field != null)
+                       return 16;
+
                return 0;
        }
 }