Merge pull request #1402 from rabbitmq/lukebakken/integration-test-collection

Ensure tests that interact with RabbitMQ do not run in parallel

Author: lukebakken

projects/Unit/TestAmqpTcpEndpointParsing.cs

@@ -30,12 +30,10 @@
 //---------------------------------------------------------------------------
 
 using System;
-
 using Xunit;
 
 namespace RabbitMQ.Client.Unit
 {
-
     public class TestAmqpTcpEndpointParsing
     {
         [Fact]

projects/Unit/TestAmqpUri.cs

@@ -30,7 +30,6 @@
 //---------------------------------------------------------------------------
 
 using System;
-
 using Xunit;
 
 namespace RabbitMQ.Client.Unit

projects/Unit/TestAsyncConsumer.cs

@@ -34,13 +34,13 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-
 using RabbitMQ.Client.Events;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace RabbitMQ.Client.Unit
 {
+    [Collection("IntegrationFixture")]
     public class TestAsyncConsumer
     {
         private readonly ITestOutputHelper _output;

projects/Unit/TestAsyncConsumerExceptions.cs

@@ -32,9 +32,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-
 using RabbitMQ.Client.Events;
-
 using Xunit;
 using Xunit.Abstractions;
 

projects/Unit/TestAuth.cs

@@ -30,15 +30,13 @@
 //---------------------------------------------------------------------------
 
 using RabbitMQ.Client.Exceptions;
-
 using Xunit;
 
 namespace RabbitMQ.Client.Unit
 {
-
+    [Collection("IntegrationFixture")]
     public class TestAuth
     {
-
         [Fact]
         public void TestAuthFailure()
         {
@@ -60,4 +58,3 @@ public void TestAuthFailure()
         }
     }
 }
-

projects/Unit/TestBasicGet.cs

@@ -30,7 +30,6 @@
 //---------------------------------------------------------------------------
 
 using RabbitMQ.Client.Exceptions;
-
 using Xunit;
 using Xunit.Abstractions;
 

projects/Unit/TestBasicProperties.cs

@@ -34,9 +34,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-
 using RabbitMQ.Client.Events;
-
 using Xunit;
 
 namespace RabbitMQ.Client.Unit

projects/Unit/TestBasicPublish.cs

@@ -1,14 +1,45 @@
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 2.0.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (c) 2007-2020 VMware, Inc.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       https://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v2.0:
+//
+//---------------------------------------------------------------------------
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+//
+//  Copyright (c) 2011-2020 VMware, Inc. or its affiliates.  All rights reserved.
+//---------------------------------------------------------------------------
+
 using System;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-
 using RabbitMQ.Client.Events;
 using Xunit;
 using Xunit.Sdk;
 
 namespace RabbitMQ.Client.Unit
 {
+    [Collection("IntegrationFixture")]
     public class TestBasicPublish
     {
         [Fact]

projects/Unit/TestBlockingCell.cs

@@ -31,9 +31,7 @@
 
 using System;
 using System.Threading;
-
 using RabbitMQ.Util;
-
 using Xunit;
 
 namespace RabbitMQ.Client.Unit

projects/Unit/TestChannelAllocation.cs

@@ -31,14 +31,13 @@
 
 using System;
 using System.Collections.Generic;
-
 using RabbitMQ.Client.Impl;
-
 using Xunit;
 
 namespace RabbitMQ.Client.Unit
 {
-    public class TestIChannelAllocation : IDisposable
+    [Collection("IntegrationFixture")]
+    public class TestChannelAllocation : IDisposable
     {
         public const int CHANNEL_COUNT = 100;
 
@@ -49,15 +48,13 @@ public int ChannelNumber(IChannel channel)
             return ((AutorecoveringChannel)channel).ChannelNumber;
         }
 
-        public TestIChannelAllocation()
+        public TestChannelAllocation()
         {
             _c = new ConnectionFactory().CreateConnection();
-
         }
 
         public void Dispose() => _c.Close();
 
-
         [Fact]
         public void AllocateInOrder()
         {
@@ -108,6 +105,5 @@ public void AllocateAfterFreeingMany()
             foreach (IChannel channel in channels)
                 Assert.Equal(k++, ChannelNumber(channel));
         }
-
     }
 }