merge bug25558 into stable

Author: Tim Watson

projects/client/RabbitMQ.Client/src/util/IntAllocator.cs

@@ -62,7 +62,7 @@ public class IntAllocator{
      * A class representing a list of inclusive intervals
      */
     public class IntervalList{
-      public IntervalList(int start, int end){
+      public IntervalList(int start, int end) {
         this.Start = start;
         this.End = end;
       }
@@ -154,8 +154,9 @@ public int Allocate()
       if(unsortedCount > 0){
         return unsorted[--unsortedCount];
       } else if (Base != null) {
-        int result = Base.Start++;
-        if(Base.Start == Base.End) Base = Base.Next;
+        int result = Base.Start;
+        if (Base.Start == Base.End) Base = Base.Next;
+        else Base.Start++;
         return result;
       } else {
         return -1;

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

@@ -0,0 +1,95 @@
+// 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-2013 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) 2013-2013 VMware, Inc.  All rights reserved.
+//---------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using RabbitMQ.Util;
+using NUnit.Framework;
+
+namespace RabbitMQ.Client.Unit
+{
+    [TestFixture]
+    public class TestIntAllocator
+    {
+        [Test]
+        public void TestRandomAllocation()
+        {
+            int repeatCount = 10000;
+            int range = 100;
+            IList<int> allocated = new List<int>();
+            IntAllocator intAllocator = new IntAllocator(0, range);
+            Random rand = new Random();
+            while (repeatCount-- > 0)
+            {
+                if (rand.Next(2) == 0)
+                {
+                    int a = intAllocator.Allocate();
+                    if (a > -1)
+                    {
+                        Assert.False(allocated.Contains(a));
+                        allocated.Add(a);
+                    }
+                }
+                else if (allocated.Count > 0)
+                {
+                    int a = allocated[0];
+                    intAllocator.Free(a);
+                    allocated.RemoveAt(0);
+                }
+            }
+        }
+
+        [Test]
+        public void TestAllocateAll()
+        {
+            int range = 100;
+            IList<int> allocated = new List<int>();
+            IntAllocator intAllocator = new IntAllocator(0, range);
+            for (int i=0; i <= range; i++)
+            {
+                int a = intAllocator.Allocate();
+                Assert.AreNotEqual(-1, a);
+                Assert.False(allocated.Contains(a));
+                allocated.Add(a);
+            }
+        }
+    }
+}
+