re-implemented Remove method

Author: NdubuisiJr

DataStructures/Lists/CircularBuffer.cs

@@ -119,7 +119,7 @@ public T Pop()
         #region IEnumerable Implementation
         public IEnumerator<T> GetEnumerator() 
         {
-            for (int i = _start; i <= Count; i++) 
+            for (int i = _start; i < Count; i++) 
             {
                 yield return _circularBuffer[i];
             }
@@ -207,28 +207,21 @@ public void CopyTo(T[] array, int arrayIndex)
         /// </summary>
         public bool Remove(T item) 
         {
-            var result = false;
-            for (int i = 0; i < _circularBuffer.Length; i++) 
+            if (!IsEmpty && Contains(item)) 
             {
-                if (item.Equals(_circularBuffer[i])) 
+               var sourceArray = _circularBuffer.Except(new T[] { item }).ToArray();
+                _circularBuffer = new T[Length + 1];
+                Array.Copy(sourceArray, _circularBuffer, sourceArray.Length);
+
+                if (!item.Equals(default(T))) 
                 {
-                    _circularBuffer[i] = default(T);
-                    --_count;
-                    result = true;
-                    int j = i;
-                    // Moving elements one step forward
-                    while(j < Length ) 
-                    {
-                        var temp = _circularBuffer[j];
-                        _circularBuffer[j] = _circularBuffer[j + 1];
-                        _circularBuffer[j + 1] = temp;
-                        j++;
-                    }
-                    _end = i + _count ;
-                    break;
-                }
+                    _end = sourceArray.Length - 1;
+                    _count = sourceArray.Length-1;
+                }  
+                return true;
             }
-            return result;
+
+            return false;
         }
         #endregion
     }

UnitTest/DataStructuresTests/CircularBufferTest.cs

@@ -155,19 +155,63 @@ public static void TestingICollectionImplementation()
             Assert.Equal(3, array[0]);
             Assert.Equal(34, array[1]);
             Assert.Equal(24, array[2]);
-            
-            //Testing Remove
-            Assert.True(circularBuffer.Remove(3));
-            Assert.False(circularBuffer.Remove(14));
 
             //Testing Count
-            Assert.Equal(2, circularBuffer.Count);
+            Assert.Equal(3, circularBuffer.Count);
             //Testing clear
             circularBuffer.Clear();
             Assert.Equal(0, circularBuffer.Pop());
             Assert.Equal(0, circularBuffer.Pop());
             Assert.Equal(0, circularBuffer.Pop());
             Assert.Empty(circularBuffer);
         }
+        [Fact]
+        public static void TestingRemoveMethod() {
+            var circularBuffer = new CircularBuffer<byte>(5, false);
+            circularBuffer.Add(3);
+            circularBuffer.Add(34);
+            circularBuffer.Add(24);
+            circularBuffer.Add(31);
+            circularBuffer.Add(14);
+            
+            //Removing default(T) from the buffer. buffer should not be affected since default is not contained
+            circularBuffer.Remove(default(byte));
+            Assert.Equal(3, circularBuffer.Pop());
+            Assert.Equal(34, circularBuffer.Pop());
+            Assert.Equal(24, circularBuffer.Pop());
+            Assert.Equal(31, circularBuffer.Pop());
+            Assert.Equal(14, circularBuffer.Pop());
+
+            //Filling the buffer again with some duplicate entries
+            circularBuffer.Add(3);
+            circularBuffer.Add(3);
+            circularBuffer.Add(3);
+            circularBuffer.Add(31);
+            circularBuffer.Add(14);
+
+            circularBuffer.Remove(3);
+            Assert.Equal(5 - 3, circularBuffer.Count);
+
+            circularBuffer = new CircularBuffer<byte>(3, false);
+            circularBuffer.Add(1);
+            circularBuffer.Add(2);
+            circularBuffer.Add(3);
+            Assert.Equal(3, circularBuffer.Count);
+            //Removing elements one by one from the end
+            circularBuffer.Remove(3);
+            circularBuffer.Remove(2);
+            circularBuffer.Remove(1);
+            Assert.Empty(circularBuffer);
+            //Adding elements back
+            circularBuffer.Add(1);
+            circularBuffer.Add(2);
+            circularBuffer.Add(3);
+            Assert.Equal(3, circularBuffer.Count);
+
+            //buffer would yield these results if it was poped initially
+            Assert.Equal(1, circularBuffer.Pop());
+            Assert.Equal(2, circularBuffer.Pop());
+            Assert.Equal(3, circularBuffer.Pop());
+        }
     }
 }