Add Count() method. Fix Clear(int) when > 32. Add more test cases to get full coverage.

2 files changed, 65 insertions, 1 deletions

diff --git a/gendarme/framework/Gendarme.Framework/Bitmask.cs b/gendarme/framework/Gendarme.Framework/Bitmask.cs
index 099198d2..438953ee 100644
--- a/gendarme/framework/Gendarme.Framework/Bitmask.cs
+++ b/gendarme/framework/Gendarme.Framework/Bitmask.cs
@@ -66,7 +66,7 @@ namespace Gendarme.Framework {
 		public void Clear (T bit)
 		{
 			unchecked {
-				mask &= (ulong) ~(1 << bit.ToInt32 (null));
+				mask &= ~((ulong) 1 << bit.ToInt32 (null));
 			}
 		}
 
@@ -78,6 +78,19 @@ namespace Gendarme.Framework {
 			mask = 0;
 		}
 
+		public int Count ()
+		{
+			if (mask == 0)
+				return 0;
+
+			int count = 0;
+			for (int i = 0; i < 64; i++) {
+				if (((mask >> i) & 1) == 1)
+					count++;
+			}
+			return count;
+		}
+
 		/// <summary>
 		/// Get the bit represented by the parameter
 		/// </summary>
diff --git a/gendarme/framework/Test/Gendarme.Framework/BitmaskTest.cs b/gendarme/framework/Test/Gendarme.Framework/BitmaskTest.cs
index b9ddd364..d8698a2a 100644
--- a/gendarme/framework/Test/Gendarme.Framework/BitmaskTest.cs
+++ b/gendarme/framework/Test/Gendarme.Framework/BitmaskTest.cs
@@ -56,6 +56,57 @@ namespace Test.Framework {
 		}
 
 		[Test]
+		public void Count ()
+		{
+			Bitmask<long> x = new Bitmask<long> ();
+			Assert.AreEqual (0, x.Count (), "0");
+			x.SetAll ();
+			Assert.AreEqual (64, x.Count (), "64");
+			for (int i = 63; i >= 0; i--) {
+				x.Clear (i);
+				Assert.AreEqual (i, x.Count (), i.ToString ());
+			}
+		}
+
+		[Test]
+		public void Intersect ()
+		{
+			Bitmask<long> x = new Bitmask<long> ();
+			Assert.IsTrue (x.Intersect (null), "null"); // special case since they are equals
+			Assert.IsFalse (x.Intersect (x), "self");
+
+			Bitmask<long> all = new Bitmask<long> ();
+			all.SetAll ();
+			Assert.IsFalse (x.Intersect (all), "x N all");
+			Assert.IsFalse (all.Intersect (x), "all N x");
+
+			x.Set (0);
+			Assert.IsTrue (x.Intersect (all), "1 N all");
+			Assert.IsTrue (all.Intersect (x), "all N 1");
+
+			Assert.IsTrue (x.Intersect (x), "self 1");
+		}
+
+		[Test]
+		public void IsSubsetOf ()
+		{
+			Bitmask<long> x = new Bitmask<long> ();
+			Assert.IsFalse (x.IsSubsetOf (null), "null");
+			Assert.IsTrue (x.IsSubsetOf (x), "self");
+
+			Bitmask<long> all = new Bitmask<long> ();
+			all.SetAll ();
+			Assert.IsTrue (x.IsSubsetOf (all), "x < all");
+			Assert.IsFalse (all.IsSubsetOf (x), "all < x");
+
+			x.Set (0);
+			Assert.IsTrue (x.IsSubsetOf (all), "1 < all");
+			Assert.IsFalse (all.IsSubsetOf (x), "all < 1");
+
+			Assert.IsTrue (x.IsSubsetOf (x), "self 1");
+		}
+
+		[Test]
 		public void SetClearAll ()
 		{
 			Bitmask<long> x = new Bitmask<long> ();