2010-04-05 Atsushi Enomoto <atsushi@ximian.com>

	* WsdlExporterTest.cs : fixed and enabled some working tests.

svn path=/trunk/mcs/; revision=154786

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ChangeLog b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ChangeLog
index f8aebcfdec40842a0309dc36648a1139af8b712d..0550b6debf1e6da5cac3cfd9272745b0a808a04f 100755 (executable)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ChangeLog
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * WsdlExporterTest.cs : fixed and enabled some working tests.
+
 2010-04-02  Atsushi Enomoto  <atsushi@ximian.com>
 
        * FaultDescriptionTest.cs : add new test.

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/WsdlExporterTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/WsdlExporterTest.cs
index 21551925f4ed9b4f897112d550bdb2a1ba7bff22..fafcd01f62bb16e0276220185b38407334c0ae7b 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/WsdlExporterTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/WsdlExporterTest.cs
@@ -224,7 +224,6 @@ namespace MonoTests.System.ServiceModel.Description
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void ExportMessageContract ()
                {
                        WsdlExporter we = new WsdlExporter ();
@@ -270,18 +269,11 @@ namespace MonoTests.System.ServiceModel.Description
                }
 
                [Test]
-               //Currently throws InvalidDataContractException on mono, but once the code is
-               //moved to a IWsdlExportExtension, InvalidOperationException will get throw
-               [Category ("NotWorking")]
-               [Ignore ("fails under .NET; I never bothered to fix the test")]
                public void ExportBar1Contract ()
                {
                        WsdlExporter we = new WsdlExporter ();
                        ContractDescription cd = ContractDescription.GetContract (typeof (Bar1));
-
-                       //Cannot export as operation Foo has >1 param so Message param gets treated
-                       //as any other param, but it is not serializable!
-                       ExportContractExpectException (we, cd, typeof (InvalidOperationException), "ExportBar1Contract");
+                       we.ExportContract (cd);
                }
 
                //Helper methods