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@551497 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 14 insertions, 52 deletions

diff --git a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
index 88a056a245..92f30f8f4d 100644
--- a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
@@ -93,20 +93,6 @@ namespace Qpid.Client.Tests.Channel
         }

         

         [Test]

-        public void DeleteInExistentQueue()

-        {

-            try

-            {

-                _channel.DeleteQueue("Q1", false, false, true);

-                _logger.Info("queue deleted");

-            }

-            catch (AMQException e)

-            {

-                _logger.Info(e.ToString());

-            }

-        }

-

-        [Test]

         public void DeleteUsedQueue()

         {

             // Create the consumer

@@ -123,7 +109,7 @@ namespace Qpid.Client.Tests.Channel
         }

 

         [Test]

-        public void DeleteUnUsedQueue()

+        public void DeleteUnusedQueue()

         {

             // delete the queue

             _channel.DeleteQueue(_queueName, true, true, true);

diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
index a2c71a5432..d74337b42b 100644
--- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
+++ b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
@@ -95,7 +95,6 @@
   </ItemGroup>

   <ItemGroup>

     <None Include="App.config" />

-    <EmbeddedResource Include="connection\QpidTestCert.pfx" />

     <None Include="Qpid.Common.DLL.config">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
index d597b013bb..4204a42015 100644
--- a/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
+++ b/qpid/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/qpid/dotnet/Qpid.Client.Tests/connection/QpidTestCert.pfx b/qpid/dotnet/Qpid.Client.Tests/connection/QpidTestCert.pfx
deleted file mode 100644
index 3f1855c6e9..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/connection/QpidTestCert.pfx
+++ /dev/null
diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
index c3e9affa29..8994279da1 100644
--- a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
+++ b/qpid/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);

-      }

    }

 }

diff --git a/qpid/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build
index 3020f760b8..88d06284d7 100644
--- a/qpid/dotnet/Qpid.Client.Tests/default.build
+++ b/qpid/dotnet/Qpid.Client.Tests/default.build
@@ -18,9 +18,6 @@
                <include name="${build.dir}/Qpid.Messaging.dll" />
                <include name="${build.dir}/Qpid.Sasl.dll" />
             </references>
-            <resources dynamicprefix="true" prefix="${project::get-name()}.Tests">
-               <include name="connection/QpidTestCert.pfx"/>
-            </resources>
         </csc>
          <copy 
             tofile="${build.dir}/${project::get-name()}.Tests.dll.config" 
@@ -34,7 +31,15 @@
     <target name="test" depends="build">
          <nunit2>
             <formatter type="${nant.formatter}" usefile="false" />
-            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+            <test>
+               <assemblies>
+                  <include name="${build.dir}/${project::get-name()}.tests.dll"/>
+               </assemblies>
+               <categories>
+                  <exclude name="Failover"/>
+                  <exclude name="SSL" if="${framework::get-target-framework() == 'mono-2.0'}"/>
+               </categories>
+            </test>
          </nunit2>
     </target>
 </project>
diff --git a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
index 24b16e37ec..7d7426a6a5 100644
--- a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
@@ -27,7 +27,7 @@ using Qpid.Messaging;
 
 namespace Qpid.Client.Tests.failover
 {
-    [TestFixture]
+    [TestFixture, Category("Failover")]
     public class FailoverTest : IConnectionListener
     {
         private static readonly ILog _logger = LogManager.GetLogger(typeof(FailoverTest));
diff --git a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
index ccb95b0c7d..9063149bad 100644
--- a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
@@ -28,7 +28,7 @@ using Qpid.Messaging;
 
 namespace Qpid.Client.Tests.failover
 {
-    [TestFixture]
+    [TestFixture, Category("Failover")]
     public class FailoverTxTest : IConnectionListener
     {
         private static readonly ILog _log = LogManager.GetLogger(typeof(FailoverTxTest));