2009-07-08 Atsushi Enomoto <atsushi@ximian.com>

	* NetPeerTcpBinding.cs : Fix interface implementations.

	* NetPeerTcpBindingTest.cs : a bit of interface implementation test.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index 7578a15ec4d54223c71a50ff15e3c49a21cdb65c..0115417bc10a680bf4cd4411ddc6efbcda995355 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-08  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * NetPeerTcpBinding.cs : Fix interface implementations.
+
 2009-07-02  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ServiceBehaviorAttribute.cs : fill SingletonInstanceContext on

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs
index 134a88fa22f2e1a233a63bdaa0e39db7ef4cd62d..a59ef1515b73a1bfaf1a50ef53144868692b9daf 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs
@@ -39,9 +39,7 @@ using System.Xml;
 
 namespace System.ServiceModel
 {
-       public class NetPeerTcpBinding : Binding,
-               IBindingDeliveryCapabilities, IBindingMulticastCapabilities,
-               ISecurityCapabilities, IBindingRuntimePreferences
+       public class NetPeerTcpBinding : Binding, IBindingRuntimePreferences
        {
                // We don't support PNRP
                public static bool IsPnrpAvailable {
@@ -125,48 +123,8 @@ namespace System.ServiceModel
 
                // explicit interface implementations
 
-               [MonoTODO]
-               bool IBindingDeliveryCapabilities.AssuresOrderedDelivery {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
-               bool IBindingDeliveryCapabilities.QueuedDelivery {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
                bool IBindingRuntimePreferences.ReceiveSynchronously {
-                       get { throw new NotImplementedException (); }
-               }
-
-               bool IBindingMulticastCapabilities.IsMulticast {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
-               ProtectionLevel ISecurityCapabilities.SupportedRequestProtectionLevel {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
-               ProtectionLevel ISecurityCapabilities.SupportedResponseProtectionLevel {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
-               bool ISecurityCapabilities.SupportsClientAuthentication {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
-               bool ISecurityCapabilities.SupportsClientWindowsIdentity {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
-               bool ISecurityCapabilities.SupportsServerAuthentication {
-                       get { throw new NotImplementedException (); }
+                       get { return false; }
                }
        }
 }

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
index 38c02b9c64fc11a737c1c17cb4df7555a973650c..4a477ed7e92edc8dfa2e6c22190b4a1b5a525263 100755 (executable)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-08  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * NetPeerTcpBindingTest.cs : a bit of interface implementation test.
+
 2009-07-07  Atsushi Enomoto  <atsushi@ximian.com>
 
        * EndpointAddress10Test.cs : added a few more serialization tests.

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetPeerTcpBindingTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetPeerTcpBindingTest.cs
index 4977c123996a260dbacc6e921299368ba16e8fcc..9255b87ba4e7bea139cd15a3e9299c258242c311 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetPeerTcpBindingTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetPeerTcpBindingTest.cs
@@ -74,6 +74,8 @@ namespace MonoTests.System.ServiceModel
                        Assert.AreEqual (0, n.Port, "#4");
                        Assert.IsNotNull (n.ReaderQuotas, "#5");
 
+                       Assert.IsFalse (((IBindingRuntimePreferences) n).ReceiveSynchronously, "#6");
+
                        var bec = n.CreateBindingElements ();
                        Assert.IsNotNull (bec.Find<PeerCustomResolverBindingElement> (), "#bec0");
                        Assert.IsNotNull (bec.Find<BinaryMessageEncodingBindingElement> (), "#bec1");