BUGFIX: Issue #25

Author: odalet-addup

README.md

@@ -32,6 +32,10 @@ I deemed this renaming necessary as the `Fakes` suffix collides with [Microsoft
 
 ## History
 
+### [Version 1.3.1 - 2020/11/23](https://github.com/addupsolutions/AddUp.FakeRabbitMQ/releases/tag/v1.3.1)
+
+* BUGFIX: #25. Now it is possible to close a `Channel` after its connection was closed without the `Channel.Close` method throwing (this is consistent with how **RabbitMQ.Client** behaves).
+
 ### [Version 1.3.0 - 2020/11/09](https://github.com/addupsolutions/AddUp.FakeRabbitMQ/releases/tag/v1.3.0)
 
 Most of the work in this release was contributed by @inbarbarkai. Thanks to him!

src/AddUp.FakeRabbitMQ.Tests/issues/CloseModelTests.cs

@@ -0,0 +1,23 @@
+using System.Diagnostics.CodeAnalysis;
+using Xunit;
+
+namespace AddUp.RabbitMQ.Fakes.issues
+{
+    [ExcludeFromCodeCoverage]
+    public class CloseModelTests
+    {
+        // This ensures issue #25 is fixed
+        [Fact]
+        public void Closing_a_model_after_disconnection_should_not_throw()
+        {
+            var factory = new FakeConnectionFactory();
+            var connection = factory.CreateConnection();
+
+            var model = connection.CreateModel();
+            connection.Close();
+            model.Close();
+
+            Assert.True(true); // If we didn't throw, we reached this point.
+        }
+    }
+}

src/AddUp.FakeRabbitMQ/FakeModel.cs

@@ -45,7 +45,7 @@ internal sealed class FakeModel : IModel
 
         public void Dispose()
         {
-            if (IsOpen) Abort(); // Abort rather than Close because we do not want Dispose to throw
+            if (IsOpen) Abort();
         }
 
         public IEnumerable<RabbitMessage> GetMessagesPublishedToExchange(string exchange)
@@ -410,7 +410,6 @@ private void Close(ShutdownEventArgs reason, bool abort)
         {
             try
             {
-                if (IsClosed) throw new AlreadyClosedException(reason);
                 CloseReason = reason;
                 ModelShutdown?.Invoke(this, reason);
             }