2009-09-11 Atsushi Enomoto <atsushi@ximian.com>

	* ChannelDispatcherTest.cs : refine AcceptChannel invocation check
	  and make it not to fail on .NET.

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

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChangeLog b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChangeLog
index d7d7e43fe0f8d6f6accfc32f9e7a8bf978375319..3c16a87a3165f133b88b85c7802c90d13f25f1b3 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChangeLog
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-11  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ChannelDispatcherTest.cs : refine AcceptChannel invocation check
+         and make it not to fail on .NET.
+
 2009-07-02  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ChannelDispatcherTest.cs : add singleton instance context test

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChannelDispatcherTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChannelDispatcherTest.cs
index 911e7601d89d2a2cf8a8f50ac13e1d4a5250c8bf..5bbdb9b57db9cf5bd1c71706b7797da06e448243 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChannelDispatcherTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/ChannelDispatcherTest.cs
@@ -251,7 +251,7 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 
                        try {
                                h.Open (TimeSpan.FromSeconds (10));
-                               Assert.IsTrue (listener.AcceptChannelTried, "#1"); // while it throws NIE ...
+                               Assert.IsTrue (listener.BeginAcceptChannelTried, "#1"); // while it throws NIE ...
                                Assert.IsFalse (listener.WaitForChannelTried, "#2");
                                Assert.IsNotNull (ed.DispatchRuntime, "#3");
                                Assert.IsNull (ed.DispatchRuntime.InstanceProvider, "#4");
@@ -330,6 +330,7 @@ namespace MonoTests.System.ServiceModel.Dispatcher
                        }
 
                        public bool AcceptChannelTried { get; set; }
+                       public bool BeginAcceptChannelTried { get; set; }
 
                        public TChannel AcceptChannel ()
                        {
@@ -345,13 +346,13 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 
                        public IAsyncResult BeginAcceptChannel (AsyncCallback callback, object state)
                        {
-                               AcceptChannelTried = true;
+                               BeginAcceptChannelTried = true;
                                throw new NotImplementedException ();
                        }
 
                        public IAsyncResult BeginAcceptChannel (TimeSpan timeout, AsyncCallback callback, object state)
                        {
-                               AcceptChannelTried = true;
+                               BeginAcceptChannelTried = true;
                                throw new NotImplementedException ();
                        }