Merged revisions 539783-539788 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r539783 | tomasr | 2007-05-19 18:40:32 +0100 (Sat, 19 May 2007) | 8 lines
  
  * QPID-495 (Contributed by Carlos Medina) Implement default timeouts for AttainState and SyncWrite
  * Fix method signatures
  * Remove SSL test with client-side certificates (requires extra setup)
  * Add locks AMSQtateManager and AMQProtocolListener to prevent modification of listener collections while processing notifications
  * Add library/runtime information to ConnectionStartMethodHandler
  * Fix some compiler warnings
  * Added XML documentation for some api interfaces
........
  r539788 | tomasr | 2007-05-19 19:55:33 +0100 (Sat, 19 May 2007) | 1 line
  
  * Excluded failover tests from nant builds and SSL tests on mono
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551497 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 2 insertions, 30 deletions

diff --git a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
index d597b013bb..4204a42015 100644
--- a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
+++ b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
@@ -62,7 +62,7 @@ namespace Qpid.Client.Tests.Connection
 
         [Test]
         [ExpectedException(typeof(AMQConnectionException))]
-        public void connectionFailure()
+        public void ConnectionFailure()
         {
             string url = "amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5673?retries='0''";
             new AMQConnection(QpidConnectionInfo.FromUrl(url));
diff --git a/dotnet/Qpid.Client.Tests/connection/QpidTestCert.pfx b/dotnet/Qpid.Client.Tests/connection/QpidTestCert.pfx
deleted file mode 100644
index 3f1855c6e9..0000000000
--- a/dotnet/Qpid.Client.Tests/connection/QpidTestCert.pfx
+++ /dev/null
diff --git a/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
index c3e9affa29..8994279da1 100644
--- a/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
+++ b/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
@@ -31,7 +31,7 @@ namespace Qpid.Client.Tests.Connection
    /// <summary>

    /// Test SSL/TLS connections to the broker

    /// </summary>

-   [TestFixture]

+   [TestFixture, Category("SSL")]

    public class SslConnectionTest

    {

       /// <summary>

@@ -48,20 +48,6 @@ namespace Qpid.Client.Tests.Connection
          MakeBrokerConnection(sslConfig);

       }

 

-      /// <summary>

-      /// Make a TLS connection to the broker with a 

-      /// client-side certificate

-      /// </summary>

-      [Test]

-      public void DoSslConnectionWithClientCert()

-      {

-         // because for tests we don't usually trust the server certificate

-         // we need here to tell the client to ignore certificate validation errors

-         SslOptions sslConfig = new SslOptions(LoadClientCert(), true);

-

-         MakeBrokerConnection(sslConfig);

-      }

-

       private static void MakeBrokerConnection(SslOptions options)

       {

          IConnectionInfo connectionInfo = new QpidConnectionInfo();

@@ -73,19 +59,5 @@ namespace Qpid.Client.Tests.Connection
             Console.WriteLine("connection = " + connection);

          }

       }

-

-      private static X509Certificate LoadClientCert()

-      {

-         // load a self-issued certificate from an embedded

-         // resource

-         const string name = "Qpid.Client.Tests.connection.QpidTestCert.pfx";

-         Assembly assembly = typeof(SslConnectionTest).Assembly;

-         

-         Stream res = assembly.GetManifestResourceStream(name);

-         byte[] buffer = new byte[res.Length];

-         res.Read(buffer, 0, buffer.Length);

-         

-         return new X509Certificate(buffer);

-      }

    }

 }