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 a230fb40b4bae24651a5639d093afae95e5f7521..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);
@@ -110,27 +132,29 @@ class Test {
                        return 1;
                
                if (!RemotingServices.IsTransparentProxy (o))
-                       return 1;
+                       return 2;
+
+               Console.WriteLine ("XXXXXXXXXXXX: " + RemotingServices.GetRealProxy (o));
 
                if (o.GetType () != myobj.GetType ())
-                       return 1;
-               
+                       return 3;
+
                MyStruct myres = o.Add (2, out res, 3);
 
                Console.WriteLine ("Result: " + myres.a + " " +
                                   myres.b + " " + myres.c +  " " + res);
 
                if (myres.a != 2)
-                       return 1;
+                       return 4;
                
                if (myres.b != 3)
-                       return 1;
+                       return 5;
                
                if (myres.c != 5)
-                       return 1;
+                       return 6;
 
                if (res != 5)
-                       return 1;
+                       return 7;
 
                R1 o2 = new R1 ();
                
@@ -140,7 +164,7 @@ class Test {
 
                Console.WriteLine ("Result: " + lres);
                if (lres != 5)
-                       return 1;
+                       return 8;
                
                lres = test_call (o);
 
@@ -148,7 +172,7 @@ class Test {
                
                Console.WriteLine ("test_field: " + o.test_field);
                if (o.test_field != 2)
-                       return 1;
+                       return 9;
 
                RemoteDelegate1 d1 = new RemoteDelegate1 (o.Add);
                MyStruct myres2 = d1 (2, out res, 3);
@@ -157,20 +181,33 @@ class Test {
                                   myres2.b + " " + myres2.c +  " " + res);
 
                if (myres2.a != 2)
-                       return 1;
+                       return 10;
                
                if (myres2.b != 3)
-                       return 1;
+                       return 11;
                
                if (myres2.c != 5)
-                       return 1;
+                       return 12;
 
                if (res != 5)
-                       return 1;
+                       return 13;
 
                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;
        }
 }