From 97052d58aea5ee3a261d092f884b3ff843cf2871 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 27 Feb 2014 01:43:44 +0000 Subject: [PATCH] Tidying up tests. --- .../Styling/SelectorTests_Class.cs | 19 ++++++++++++------- .../Styling/SelectorTests_Descendent.cs | 3 +-- Perspex.UnitTests/Styling/SelectorTests_Id.cs | 11 ++++++++--- .../Styling/SelectorTests_OfType.cs | 11 ++++++++--- .../Styling/SelectorTests_Template.cs | 3 +-- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/Perspex.UnitTests/Styling/SelectorTests_Class.cs b/Perspex.UnitTests/Styling/SelectorTests_Class.cs index d2525bb52c..63b19a82b1 100644 --- a/Perspex.UnitTests/Styling/SelectorTests_Class.cs +++ b/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 diff --git a/Perspex.UnitTests/Styling/SelectorTests_Descendent.cs b/Perspex.UnitTests/Styling/SelectorTests_Descendent.cs index 8e85e011c6..71faf8ec8c 100644 --- a/Perspex.UnitTests/Styling/SelectorTests_Descendent.cs +++ b/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(); } diff --git a/Perspex.UnitTests/Styling/SelectorTests_Id.cs b/Perspex.UnitTests/Styling/SelectorTests_Id.cs index a338821e2a..505208c3eb 100644 --- a/Perspex.UnitTests/Styling/SelectorTests_Id.cs +++ b/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().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 { } diff --git a/Perspex.UnitTests/Styling/SelectorTests_OfType.cs b/Perspex.UnitTests/Styling/SelectorTests_OfType.cs index ed98d8e612..3f33de8966 100644 --- a/Perspex.UnitTests/Styling/SelectorTests_OfType.cs +++ b/Perspex.UnitTests/Styling/SelectorTests_OfType.cs @@ -22,7 +22,7 @@ namespace Perspex.UnitTests.Styling var control = new Control1(); var target = new Selector().OfType(); - 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(); - 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().Object }; var target = new Selector().OfType(); - 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 { } diff --git a/Perspex.UnitTests/Styling/SelectorTests_Template.cs b/Perspex.UnitTests/Styling/SelectorTests_Template.cs index 595c7d46fd..0c7878ea18 100644 --- a/Perspex.UnitTests/Styling/SelectorTests_Template.cs +++ b/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(); }