WIP debugging suite-only failures.

elizabrock · Feb 11, 2015 · e5c5b69 · e5c5b69
1 parent ea0ab07
commit e5c5b69
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/TestWaitForIt/AddingCountdownsTest.cs b/TestWaitForIt/AddingCountdownsTest.cs
@@ -1,6 +1,6 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TestStack.BDDfy;
+using WaitForIt.Model;
 
 namespace TestWaitForIt
 {
@@ -18,6 +18,18 @@ public class AddingCountdownsTest : TestHelper
         // * The event shows up in the main event list and the form goes away
         // * Click "x" to close the form
 
+        [ClassInitialize]
+        public static void SetupTests(TestContext _context)
+        {
+            TestHelper.Setup(_context);
+        }
+
+        [ClassCleanup]
+        public static void CleanUp()
+        {
+            TestHelper.CleanThisUp();
+        }
+
         [TestMethod]
         public void ScenarioHappyPathEventCreation()
         {

diff --git a/TestWaitForIt/EventModelTest.cs b/TestWaitForIt/EventModelTest.cs
@@ -19,8 +19,8 @@ public void CreatingAnEventStoresItInEvents()
         [TestMethod]
         public void CreatingAnEventStoresItsProperties()
         {
-            Event valentines = new Event("Valentine's", "02/14/14");
-            Assert.AreEqual("Valentine's", valentines.Name);
+            Event valentines = new Event("Someday", "02/14/14");
+            Assert.AreEqual("Someday", valentines.Name);
             Assert.AreEqual("02/14/14", valentines.Date);
         }
     }

diff --git a/TestWaitForIt/EventRepositoryTest.cs b/TestWaitForIt/EventRepositoryTest.cs
@@ -27,7 +27,6 @@ public static void SetUp(TestContext _context)
         public static void CleanUp()
         {
             repo.Clear();
-            repo.Dispose();
         }
 
         [TestCleanup]
@@ -40,14 +39,14 @@ public void ClearDatabase()
         public void TestAddToDatabase() //Valid
         {
             Assert.AreEqual(0, repo.GetCount());
-            repo.Add(new Event("New Years Eve", "12/31/2015"));
+            repo.Add(new Event("Old Years Eve", "12/31/2015"));
             Assert.AreEqual(1, repo.GetCount());
         }
 
         [TestMethod]
         public void TestAllMethod()
         {
-            repo.Add(new Event("New Years Eve", "12/31/2015"));
+            repo.Add(new Event("Old Years Eve", "12/31/2015"));
             repo.Add(new Event("Valentine's Day", "02/14/2015"));
             Assert.AreEqual(2, repo.GetCount());
         }
@@ -56,14 +55,14 @@ public void TestAllMethod()
         public void TestGetCount()
         {
             Assert.AreEqual(0, repo.GetCount());
-            repo.Add(new Event("New Years Eve", "12/31/2015"));
+            repo.Add(new Event("Old Years Eve", "12/31/2015"));
             Assert.AreEqual(1, repo.GetCount());
         }
 
         [TestMethod]
         public void TestClear()
         {
-            repo.Add(new Event("New Years Eve", "12/31/2015"));
+            repo.Add(new Event("Old Years Eve", "12/31/2015"));
             repo.Clear();
             Assert.AreEqual(0, repo.GetCount());
         }
@@ -74,10 +73,9 @@ public void TestClear()
         [ExpectedException(typeof(ArgumentException))]
         public void EventsAreUnique()
         {
-            Event e = new Event("New Years Eve", "12/31/2015");
             repo.Clear();
-            repo.Add(e);
-            repo.Add(e);
+            repo.Add(new Event("Old Years Eve", "12/31/2015"));
+            repo.Add(new Event("Old Years Eve", "12/31/2015"));
         }
     }
 }
diff --git a/TestWaitForIt/TestHelper.cs b/TestWaitForIt/TestHelper.cs
@@ -18,7 +18,7 @@ namespace TestWaitForIt
     public class TestHelper
     {
         private static TestContext test_context;
-        private static Window window;
+        protected static Window window;
         private static Application application;
         private static EventRepository repo = new EventRepository();
         private static EventContext context;
@@ -149,8 +149,8 @@ public static void GivenTheseEvents(params Event[] events)
         public static void CleanThisUp()
         {
             window.Close();
-            repo.Clear();
             application.Close();
+            repo.Clear();
         }
     }
 }
diff --git a/TestWaitForIt/ViewingCountdownsTest.cs b/TestWaitForIt/ViewingCountdownsTest.cs
@@ -15,7 +15,7 @@ public class ViewingCountdownsTest : TestHelper
         public static void SetupTests(TestContext _context)
         {
             GivenTheseEvents(
-                new Event("Valentine's Day", "02/14/15"),
+                new Event("Valentine's Eve", "02/13/15"),
                 new Event("Christmas", "12/25/14")
                 );
             TestHelper.Setup(_context);
@@ -31,7 +31,7 @@ public static void CleanUp()
         public void ScenarioViewingCountdownsWhenThereAreEvents()
         {
             ThenIShouldSeeXEvents(2);
-            AndIShouldSeeACountdownFor("Valentine's Day", "02/14/15");
+            AndIShouldSeeACountdownFor("Valentine's Eve", "02/13/15");
             AndIShouldSeeACountdownFor("Christmas", "12/25/14");
             AndIShouldNotSeeTheHelperText();
             AndTheButtonShouldBeEnabled("+");

diff --git a/TestWaitForIt/ZeroStateTest.cs b/TestWaitForIt/ZeroStateTest.cs
@@ -11,21 +11,18 @@
 namespace TestWaitForIt
 {
     [TestClass]
-    public class ZeroStateTest
+    public class ZeroStateTest : TestHelper
     {
-
-        private static TestContext test_context;
-        private static Window window;
-        private static Application application;
-
         [ClassInitialize]
-        public static void Setup(TestContext _context)
+        public static void SetupTests(TestContext _context)
+        {
+            TestHelper.Setup(_context);
+        }
+
+        [ClassCleanup]
+        public static void CleanUp()
         {
-            test_context = _context;
-            var applicationDir = _context.DeploymentDirectory;
-            var applicationPath = Path.Combine(applicationDir, "..\\..\\..\\TestWaitForIt\\bin\\Debug\\WaitForIt");
-            application = Application.Launch(applicationPath);
-            window = application.GetWindow("MainWindow", InitializeOption.NoCache);
+            TestHelper.CleanThisUp();
         }
 
         [TestMethod]
@@ -41,12 +38,5 @@ public void TestZeroStateHelpElements()
             var text = window.Get(SearchCriteria.ByAutomationId("GettingStartedText"));
             Assert.IsTrue(text.Visible);
         }
-
-        [ClassCleanup]
-        public static void CleanThisUp()
-        {
-            window.Close();
-            application.Close();
-        }
     }
 }