* Excluded failover tests from nant builds and SSL tests on mono

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

6 files changed, 26 insertions, 7 deletions

diff --git a/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
index 8039f12558..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>

diff --git a/dotnet/Qpid.Client.Tests/default.build b/dotnet/Qpid.Client.Tests/default.build
index 348f3cfe53..88d06284d7 100644
--- a/dotnet/Qpid.Client.Tests/default.build
+++ b/dotnet/Qpid.Client.Tests/default.build
@@ -31,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/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
index 24b16e37ec..7d7426a6a5 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
+++ b/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/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
index ccb95b0c7d..9063149bad 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
+++ b/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));
diff --git a/dotnet/Qpid.Messaging/IMessageConsumer.cs b/dotnet/Qpid.Messaging/IMessageConsumer.cs
index 77e2ee4729..7767fae995 100644
--- a/dotnet/Qpid.Messaging/IMessageConsumer.cs
+++ b/dotnet/Qpid.Messaging/IMessageConsumer.cs
@@ -37,7 +37,8 @@ namespace Qpid.Messaging
    /// You can attach a delegate to the <see cref="OnMessage"/>
    /// event and be notified when a message arrives, or you can
    /// use the <see cref="Receive"/> and <see cref="ReceiveNoWait"/>
-   /// methods to control when you receive messages.
+   /// methods to control when you receive messages. Be aware that you can use 
+   /// one or the other, but not both at the same time.
    /// </para>
    /// <para>
    /// Regardless of which method you choose, the prefetch settings
diff --git a/dotnet/default.build b/dotnet/default.build
index 89cb3209db..b9d0bf2762 100644
--- a/dotnet/default.build
+++ b/dotnet/default.build
@@ -26,10 +26,15 @@
       <include name="Qpid.Sasl.Tests/default.build" />

       <include name="Qpid.Common.Tests/default.build" />        

       <include name="Qpid.Client.Tests/default.build" />	

+   </fileset>

+

+   <!--

+      Other test or utility assemblies

+   -->

+   <fileset id='other.builds'>

       <include name="TopicListener/default.build" />	

       <include name="TopicPublisher/default.build" />	

    </fileset>

-    

    <!--

       Prepare environment for a debug build

    -->

@@ -80,7 +85,12 @@
 		<nant target="build">

 			<buildfiles refid="tests.builds" />

 		</nant>

-		-->

+		<!-- 

+         Compile test assemblies

+      -->

+		<nant target="build">

+			<buildfiles refid="other.builds" />

+		</nant>

 	</target>

 	

 	<!--