Tidying up tests.

Perspex.UnitTests/Styling/SelectorTests_Class.cs

@@ -26,7 +26,7 @@ namespace Perspex.UnitTests.Styling
 
             var target = new Selector().Class("foo");
 
-            CollectionAssert.AreEqual(new[] { true }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsTrue(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -39,7 +39,7 @@ namespace Perspex.UnitTests.Styling
 
             var target = new Selector().Class("foo");
 
-            CollectionAssert.AreEqual(new[] { false }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -53,7 +53,7 @@ namespace Perspex.UnitTests.Styling
 
             var target = new Selector().Class("foo");
 
-            CollectionAssert.AreEqual(new[] { false }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -64,9 +64,9 @@ namespace Perspex.UnitTests.Styling
             var target = new Selector().Class("foo");
             var activator = target.GetActivator(control);
 
-            CollectionAssert.AreEqual(new[] { false }, activator.Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
             control.Classes.Add("foo");
-            CollectionAssert.AreEqual(new[] { true }, activator.Take(1).ToEnumerable().ToArray());
+            Assert.IsTrue(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -80,9 +80,14 @@ namespace Perspex.UnitTests.Styling
             var target = new Selector().Class("foo");
             var activator = target.GetActivator(control);
 
-            CollectionAssert.AreEqual(new[] { true }, activator.Take(1).ToEnumerable().ToArray());
+            Assert.IsTrue(ActivatorValue(target, control));
             control.Classes.Remove("foo");
-            CollectionAssert.AreEqual(new[] { false }, activator.Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
+        }
+
+        private static bool ActivatorValue(Selector selector, IStyleable control)
+        {
+            return selector.GetActivator(control).Take(1).ToEnumerable().Single();
         }
 
         public class Control1 : TestControlBase

Perspex.UnitTests/Styling/SelectorTests_Descendent.cs

@@ -12,7 +12,6 @@ namespace Perspex.UnitTests.Styling
     using Moq;
     using Perspex.Controls;
     using Perspex.Styling;
-    using Match = Perspex.Styling.Selector;
 
     [TestClass]
     public class SelectorTests_Descendent
@@ -79,7 +78,7 @@ namespace Perspex.UnitTests.Styling
             Assert.IsFalse(ActivatorValue(selector, child.Object));
         }
 
-        private static bool ActivatorValue(Match selector, IStyleable control)
+        private static bool ActivatorValue(Selector selector, IStyleable control)
         {
             return selector.GetActivator(control).Take(1).ToEnumerable().Single();
         }

Perspex.UnitTests/Styling/SelectorTests_Id.cs

@@ -24,7 +24,7 @@ namespace Perspex.UnitTests.Styling
             var control = new Control1 { Id = "foo" };
             var target = new Selector().Id("foo");
 
-            CollectionAssert.AreEqual(new[] { true }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsTrue(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -33,7 +33,7 @@ namespace Perspex.UnitTests.Styling
             var control = new Control1 { Id = "foo" };
             var target = new Selector().Id("bar");
 
-            CollectionAssert.AreEqual(new[] { false }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -42,7 +42,7 @@ namespace Perspex.UnitTests.Styling
             var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
             var target = new Selector().Id("foo");
 
-            CollectionAssert.AreEqual(new[] { false }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -67,6 +67,11 @@ namespace Perspex.UnitTests.Styling
             Assert.AreEqual(0, control.SubscribeCheckObservable.SubscribedCount);
         }
 
+        private static bool ActivatorValue(Selector selector, IStyleable control)
+        {
+            return selector.GetActivator(control).Take(1).ToEnumerable().Single();
+        }
+
         public class Control1 : TestControlBase
         {
         }

Perspex.UnitTests/Styling/SelectorTests_OfType.cs

@@ -22,7 +22,7 @@ namespace Perspex.UnitTests.Styling
             var control = new Control1();
             var target = new Selector().OfType<Control1>();
 
-            CollectionAssert.AreEqual(new[] { true }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsTrue(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -31,7 +31,7 @@ namespace Perspex.UnitTests.Styling
             var control = new Control2();
             var target = new Selector().OfType<Control1>();
 
-            CollectionAssert.AreEqual(new[] { false }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -40,7 +40,7 @@ namespace Perspex.UnitTests.Styling
             var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
             var target = new Selector().OfType<Control1>();
 
-            CollectionAssert.AreEqual(new[] { false }, target.GetActivator(control).Take(1).ToEnumerable().ToArray());
+            Assert.IsFalse(ActivatorValue(target, control));
         }
 
         [TestMethod]
@@ -65,6 +65,11 @@ namespace Perspex.UnitTests.Styling
             Assert.AreEqual(0, control.SubscribeCheckObservable.SubscribedCount);
         }
 
+        private static bool ActivatorValue(Selector selector, IStyleable control)
+        {
+            return selector.GetActivator(control).Take(1).ToEnumerable().Single();
+        }
+
         public class Control1 : TestControlBase
         {
         }

Perspex.UnitTests/Styling/SelectorTests_Template.cs

@@ -12,7 +12,6 @@ namespace Perspex.UnitTests.Styling
     using Moq;
     using Perspex.Controls;
     using Perspex.Styling;
-    using Match = Perspex.Styling.Selector;
 
     [TestClass]
     public class SelectorTests_Template
@@ -100,7 +99,7 @@ namespace Perspex.UnitTests.Styling
             Assert.IsFalse(ActivatorValue(selector, border));
         }
 
-        private static bool ActivatorValue(Match selector, IStyleable control)
+        private static bool ActivatorValue(Selector selector, IStyleable control)
         {
             return selector.GetActivator(control).Take(1).ToEnumerable().Single();
         }