remove unused WaitForUserToContinueTheTest

Particular · Feb 5, 2015 · 489f492 · 489f492
1 parent 6d3bb6c
commit 489f492
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 64 deletions.
diff --git a/src/ServiceControl.UnitTests/CompositeViews/FailedMessageTest.cs b/src/ServiceControl.UnitTests/CompositeViews/FailedMessageTest.cs
@@ -4,14 +4,13 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading;
-    using Infrastructure.RavenDB;
     using MessageFailures;
     using NUnit.Framework;
     using Raven.Client;
     using ServiceControl.MessageFailures.Api;
 
     [TestFixture]
-    public class FailedMessagesTests : TestWithRavenDB
+    public class FailedMessagesTests 
     {
         [Test]
         public void Should_allow_errors_with_no_metadata()

diff --git a/src/ServiceControl.UnitTests/CompositeViews/MessagesViewTests.cs b/src/ServiceControl.UnitTests/CompositeViews/MessagesViewTests.cs
@@ -4,7 +4,6 @@
     using System.Collections.Generic;
     using System.Linq;
     using Contracts.Operations;
-    using Infrastructure.RavenDB;
     using MessageAuditing;
     using MessageFailures;
     using NUnit.Framework;
@@ -13,7 +12,7 @@
     using ServiceControl.CompositeViews.Messages;
 
     [TestFixture]
-    public class MessagesViewTests : TestWithRavenDB
+    public class MessagesViewTests 
     {
         [Test]
         public void Filter_out_system_messages()
@@ -82,7 +81,7 @@ public void Order_by_critical_time()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
 
             using (var session = documentStore.OpenSession())
             {
@@ -125,7 +124,7 @@ public void Order_by_time_sent()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
 
             using (var session = documentStore.OpenSession())
             {
@@ -161,7 +160,7 @@ public void Correct_status_for_repeated_errors()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
 
             using (var session = documentStore.OpenSession())
             {

diff --git a/src/ServiceControl.UnitTests/Expiration/CustomExpirationBundleTests.cs b/src/ServiceControl.UnitTests/Expiration/CustomExpirationBundleTests.cs
@@ -4,7 +4,6 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading;
-    using Infrastructure.RavenDB;
     using MessageAuditing;
     using MessageFailures;
     using NUnit.Framework;
@@ -13,7 +12,7 @@
     using ServiceControl.Infrastructure.RavenDB.Expiration;
 
     [TestFixture]
-    public class CustomExpirationBundleTests : TestWithRavenDB
+    public class CustomExpirationBundleTests
     {
         [Test]
         public void Processed_messages_are_being_expired()
@@ -38,7 +37,7 @@ public void Processed_messages_are_being_expired()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
             Thread.Sleep(Settings.ExpirationProcessTimerInSeconds * 1000 * 2);
 
             using (var session = documentStore.OpenSession())
@@ -85,7 +84,7 @@ public void Many_processed_messages_are_being_expired()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
             Thread.Sleep(Settings.ExpirationProcessTimerInSeconds * 1000 * 10);
             using (var session = documentStore.OpenSession())
             {
@@ -125,7 +124,7 @@ public void Only_processed_messages_are_being_expired()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
             Thread.Sleep(Settings.ExpirationProcessTimerInSeconds * 1000 * 2);
 
             using (var session = documentStore.OpenSession())
@@ -155,7 +154,7 @@ public void Recent_processed_messages_are_not_being_expired()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
             Thread.Sleep(Settings.ExpirationProcessTimerInSeconds * 1000 * 2);
 
             using (var session = documentStore.OpenSession())
@@ -191,7 +190,7 @@ public void Errors_are_not_being_expired()
                 session.SaveChanges();
             }
 
-            WaitForIndexing(documentStore);
+            documentStore.WaitForIndexing();
             Thread.Sleep(Settings.ExpirationProcessTimerInSeconds * 1000 * 2);
 
             using (var session = documentStore.OpenSession())

diff --git a/src/ServiceControl.UnitTests/Infrastructure/RavenDB/TestWithRavenDB.cs b/src/ServiceControl.UnitTests/Infrastructure/RavenDB/TestWithRavenDB.cs
diff --git a/src/ServiceControl.UnitTests/RavenIndexAwaiter.cs b/src/ServiceControl.UnitTests/RavenIndexAwaiter.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Threading;
+using NUnit.Framework;
+using Raven.Client;
+
+public static class RavenIndexAwaiter
+{
+    public static void WaitForIndexing(this IDocumentStore store)
+    {
+        var databaseCommands = store.DatabaseCommands;
+        Assert.True(SpinWait.SpinUntil(() => databaseCommands.GetStatistics().StaleIndexes.Length == 0, TimeSpan.FromSeconds(10)));
+    }
+
+}
diff --git a/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj b/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj
@@ -99,7 +99,7 @@
     <Compile Include="Heartbeats\HeartbeatStatusProviderTests.cs" />
     <Compile Include="Infrastructure\RavenDB\Indexes\InMemoryStoreBuilder.cs" />
     <Compile Include="Infrastructure\RavenDB\RavenBootstrapperTests.cs" />
-    <Compile Include="Infrastructure\RavenDB\TestWithRavenDB.cs" />
+    <Compile Include="RavenIndexAwaiter.cs" />
     <Compile Include="Infrastructure\TransportMessageExtensionsTests.cs" />
     <Compile Include="Operations\UpdateLicenseEnricherTest.cs" />
   </ItemGroup>