Merge pull request dotnet#461 from iamjasonp/fix-tcpclientcred-test

Enable TCP client credential test
iamjasonp · Oct 27, 2015 · 87b0d51 · 87b0d51
2 parents c78ef64 + 045d9b2
commit 87b0d51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
@@ -182,7 +182,8 @@ public static string Tcp_NoSecurity_XmlDuplexCallback_Address
     {
         get { return BridgeClient.GetResourceAddress("WcfService.TestResources.DuplexCallbackXmlComplexTypeResource"); }
     }
-
+
+
     public static string Tcp_CustomBinding_SslStreamSecurity_Address
     {
         get
@@ -191,4 +192,12 @@ public static string Tcp_CustomBinding_SslStreamSecurity_Address
             return BridgeClient.GetResourceAddress("WcfService.TestResources.TcpTransportSecurityWithSslResource");
         }
     }
+
+    public static string Tcp_CustomBinding_SslStreamSecurity_HostName
+    {
+        get
+        {
+            return BridgeClient.GetResourceHostName("WcfService.TestResources.TcpTransportSecurityWithSslResource");
+        }
+    }
 }
diff --git a/....ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeTests.cs b/....ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeTests.cs
@@ -94,7 +94,6 @@ public static void SameBinding_SecurityModeTransport_EchoString()
     // Simple echo of a string using a CustomBinding to mimic a NetTcpBinding with Security.Mode = TransportWithMessageCredentials
     // This does not exactly match the binding elements in a NetTcpBinding which also includes a TransportSecurityBindingElement
     [Fact]
-    [ActiveIssue(310)]
     [OuterLoop]
     public static void SameBinding_SecurityModeTransport_ClientCredentialTypeCertificate_EchoString()
     {
@@ -108,7 +107,8 @@ public static void SameBinding_SecurityModeTransport_ClientCredentialTypeCertifi
                 new BinaryMessageEncodingBindingElement(),
                 new TcpTransportBindingElement());
 
-            factory = new ChannelFactory<IWcfService>(binding, new EndpointAddress(Endpoints.Tcp_CustomBinding_SslStreamSecurity_Address));
+            var endpointIdentity = new DnsEndpointIdentity(Endpoints.Tcp_CustomBinding_SslStreamSecurity_HostName);
+            factory = new ChannelFactory<IWcfService>(binding, new EndpointAddress(new Uri(Endpoints.Tcp_CustomBinding_SslStreamSecurity_Address), endpointIdentity));
 
             IWcfService serviceProxy = factory.CreateChannel();