Add another roundtrip case.

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/TypedMessageConverterTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/TypedMessageConverterTest.cs
index 230d1f17f68e90000ae3b43f55c5ae19865e3db4..faa52b0c3e95a34221bf8372a8cd992d12d95192 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/TypedMessageConverterTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/TypedMessageConverterTest.cs
@@ -88,7 +88,23 @@ namespace MonoTests.System.ServiceModel.Description
                        Message msg = c.ToMessage (t1);
                        Test1 t2 = (Test1) c.FromMessage (msg);
                        Assert.AreEqual ("test", t2.echo.msg, "#01");
-                       Assert.AreEqual ("testtest", t2.body2, "#01");
+                       Assert.AreEqual ("testtest", t2.body2, "#02");
+               }
+
+               [Test]
+               public void StandardRoundtrip2 ()
+               {
+                       TypedMessageConverter c = TypedMessageConverter.Create (
+                               typeof (Test2), "http://tempuri.org/MyTest");
+                       var t1 = new Test2 ();
+                       t1.Body = new Echo () { msg = "test" };
+                       var uid = Guid.NewGuid ();
+                       t1.Id = uid;
+                       Message msg = c.ToMessage (t1);
+                       var t2 = (Test2) c.FromMessage (msg);
+                       Assert.AreEqual ("test", t2.Body.msg, "#01");
+                       // FIXME: enable it (not working yet)
+                       //Assert.AreEqual (uid, t2.Id, "#02");
                }
 
                [Test]
@@ -102,7 +118,7 @@ namespace MonoTests.System.ServiceModel.Description
                        Message msg = c.ToMessage (t1);
                        Test1 t2 = (Test1) c.FromMessage (msg);
                        Assert.AreEqual ("test", t2.echo.msg, "#01");
-                       Assert.AreEqual ("testtest", t2.body2, "#01");
+                       Assert.AreEqual ("testtest", t2.body2, "#02");
                }
        }
 
@@ -122,4 +138,13 @@ namespace MonoTests.System.ServiceModel.Description
                [DataMember]
                public string msg = "default";
        }
+
+       [MessageContract (IsWrapped = false)]
+       public class Test2
+       {
+               [MessageHeader (Name = "head", Namespace = "urn:foo")]
+               public Guid Id { get; set; }
+               [MessageBodyMember (Name = "body", Namespace = "urn:foo")]
+               public Echo Body { get; set; }
+       }
 }