Relaxed test timing for slower hardware

Author: Emile Joubert

projects/client/Unit/src/unit/IntegrationFixture.cs renamed to projects/client/Unit/src/unit/Fixtures.cs

@@ -63,4 +63,10 @@ public void Dispose()
             Conn.Close();
         }
     }
+
+    public class TimingFixture
+    {
+        public static readonly int TimingInterval = 200;
+        public static readonly int SafetyMargin = 50;
+    }
 }

projects/client/Unit/src/unit/TestBlockingCell.cs

@@ -1,56 +1,56 @@
-// 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-2011 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
-//
-//       http://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 http://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 VMware, Inc.
-//  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
-//---------------------------------------------------------------------------
-
-using NUnit.Framework;
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Threading;
-
+// 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-2011 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
+//
+//       http://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 http://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 VMware, Inc.
+//  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+//---------------------------------------------------------------------------
+
+using NUnit.Framework;
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Threading;
+
 using RabbitMQ.Util;
 
 namespace RabbitMQ.Client.Unit
 {
     [TestFixture]
-    public class TestBlockingCell
+    public class TestBlockingCell : TimingFixture
     {
         public class DelayedSetter
         {
@@ -101,8 +101,8 @@ public void TestTimeoutShort()
 
             ResetTimer();
             object v;
-            bool r = k.GetValue(250, out v);
-            Assert.Greater(50, ElapsedMs());
+            bool r = k.GetValue(TimingInterval, out v);
+            Assert.Greater(SafetyMargin, ElapsedMs());
             Assert.IsTrue(r);
             Assert.AreEqual(123, v);
         }
@@ -114,8 +114,8 @@ public void TestTimeoutLong()
 
             ResetTimer();
             object v;
-            bool r = k.GetValue(250, out v);
-            Assert.Greater(ElapsedMs(), 200);
+            bool r = k.GetValue(TimingInterval, out v);
+            Assert.Less(TimingInterval - SafetyMargin, ElapsedMs());
             Assert.IsTrue(!r);
             Assert.AreEqual(null, v);
         }
@@ -128,7 +128,7 @@ public void TestTimeoutNegative()
             ResetTimer();
             object v;
             bool r = k.GetValue(-10000, out v);
-            Assert.Greater(50, ElapsedMs());
+            Assert.Greater(SafetyMargin, ElapsedMs());
             Assert.IsTrue(!r);
             Assert.AreEqual(null, v);
         }
@@ -137,12 +137,12 @@ public void TestTimeoutNegative()
         public void TestTimeoutInfinite()
         {
             BlockingCell k = new BlockingCell();
-            SetAfter(250, k, 123);
+            SetAfter(TimingInterval, k, 123);
 
             ResetTimer();
             object v;
             bool r = k.GetValue(Timeout.Infinite, out v);
-            Assert.Greater(ElapsedMs(), 200);
+            Assert.Less(TimingInterval - SafetyMargin, ElapsedMs());
             Assert.IsTrue(r);
             Assert.AreEqual(123, v);
         }
@@ -151,12 +151,12 @@ public void TestTimeoutInfinite()
         public void TestBgShort()
         {
             BlockingCell k = new BlockingCell();
-            SetAfter(50, k, 123);
+            SetAfter(TimingInterval, k, 123);
 
             ResetTimer();
             object v;
-            bool r = k.GetValue(100, out v);
-            Assert.Greater(ElapsedMs(), 40);
+            bool r = k.GetValue(TimingInterval * 2, out v);
+            Assert.Less( TimingInterval - SafetyMargin, ElapsedMs());
             Assert.IsTrue(r);
             Assert.AreEqual(123, v);
         }
@@ -165,12 +165,12 @@ public void TestBgShort()
         public void TestBgLong()
         {
             BlockingCell k = new BlockingCell();
-            SetAfter(150, k, 123);
+            SetAfter(TimingInterval * 2, k, 123);
 
             ResetTimer();
             object v;
-            bool r = k.GetValue(100, out v);
-            Assert.Greater(110, ElapsedMs());
+            bool r = k.GetValue(TimingInterval, out v);
+            Assert.Greater(TimingInterval + SafetyMargin, ElapsedMs());
             Assert.IsTrue(!r);
             Assert.AreEqual(null, v);
         }