Merge pull request #823 from AndrzejKrol/Use_ContinuationTimeout_From…

…_ConnectionFactory

AutorecoveringConnection uses ContinuationTimeout from ConnectionFactory

projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs

@@ -299,6 +299,7 @@ public RecoveryAwareModel CreateNonRecoveringModel()
         {
             ISession session = _delegate.CreateSession();
             var result = new RecoveryAwareModel(session);
+            result.ContinuationTimeout = _factory.ContinuationTimeout;
             result._Private_ChannelOpen("");
             return result;
         }

projects/Unit/Fixtures.cs

@@ -165,6 +165,16 @@ internal IConnection CreateNonRecoveringConnection()
             return cf.CreateConnection($"UNIT_CONN:{Guid.NewGuid()}");
         }
 
+        internal IConnection CreateConnectionWithContinuationTimeout(bool automaticRecoveryEnabled, TimeSpan continuationTimeout)
+        {
+            var cf = new ConnectionFactory
+            {
+                AutomaticRecoveryEnabled = automaticRecoveryEnabled,
+                ContinuationTimeout = continuationTimeout
+            };
+            return cf.CreateConnection($"UNIT_CONN:{Guid.NewGuid()}");
+        }
+
         //
         // Channels
         //

projects/Unit/TestConnectionFactoryContinuationTimeout.cs

@@ -0,0 +1,69 @@
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 1.1.
+//
+// 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 v1.1:
+//
+//---------------------------------------------------------------------------
+//  The contents of this file are subject to the Mozilla Public License
+//  Version 1.1 (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.mozilla.org/MPL/
+//
+//  Software distributed under the License is distributed on an "AS IS"
+//  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+//  the License for the specific language governing rights and
+//  limitations under the License.
+//
+//  The Original Code is RabbitMQ.
+//
+//  The Initial Developer of the Original Code is Pivotal Software, Inc.
+//  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
+//---------------------------------------------------------------------------
+
+using System;
+using NUnit.Framework;
+
+namespace RabbitMQ.Client.Unit
+{
+    [TestFixture]
+    internal class TestConnectionFactoryContinuationTimeout : IntegrationFixture
+    {
+        [Test]
+        public void TestConnectionFactoryContinuationTimeoutOnRecoveringConnection()
+        {
+            var continuationTimeout = TimeSpan.FromSeconds(777);
+            using (IConnection c = CreateConnectionWithContinuationTimeout(true, continuationTimeout))
+            {
+                Assert.AreEqual(continuationTimeout, c.CreateModel().ContinuationTimeout);
+            }
+        }
+
+        [Test]
+        public void TestConnectionFactoryContinuationTimeoutOnNonRecoveringConnection()
+        {
+            var continuationTimeout = TimeSpan.FromSeconds(777);
+            using (IConnection c = CreateConnectionWithContinuationTimeout(false, continuationTimeout))
+            {
+                Assert.AreEqual(continuationTimeout, c.CreateModel().ContinuationTimeout);
+            }
+        }
+    }
+}