Restructuring a bit of the tests

nberardi · Sep 10, 2012 · 1b7eb3b · 1b7eb3b
1 parent 7636332
commit 1b7eb3b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 34 deletions.
diff --git a/Raven.Tests/Indexes/CompiledIndex.cs b/Raven.Tests/Indexes/CompiledIndex.cs
@@ -24,7 +24,7 @@ public CompiledIndex()
 		{
 			store =
 
-				NewDocumentStore(new AggregateCatalog
+				NewDocumentStore(catalog:new AggregateCatalog
 				{Catalogs = {new TypeCatalog(typeof (ShoppingCartEventsToShopingCart), typeof (MapOnlyView))}});
 			db = store.DocumentDatabase;
 		}

diff --git a/Raven.Tests/Issues/RavenDB_295.cs b/Raven.Tests/Issues/RavenDB_295.cs
@@ -55,7 +55,7 @@ public void CanUpdateSuggestions()
 		[Fact]
 		public void CanUpdateSuggestions_AfterRestart()
 		{
-			using (var store = NewDocumentStore())
+			using (var store = NewDocumentStore(deleteDirectoryOnDispose: false))
 			{
 				using (var session = store.OpenSession())
 				{
@@ -78,7 +78,7 @@ public void CanUpdateSuggestions_AfterRestart()
 				});
 				Assert.NotEmpty(suggestionQueryResult.Suggestions);
 			}
-			using (var store = NewDocumentStoreRestart())
+			using (var store = NewDocumentStore(deleteDirectoryOnDispose: true, deleteDirectory: false))
 			{
 				using (var session = store.OpenSession())
 				{

diff --git a/Raven.Tests/RavenTest.cs b/Raven.Tests/RavenTest.cs
@@ -46,24 +46,11 @@ static RavenTest()
 			File.Delete("test.log");
 		}
 
-		public EmbeddableDocumentStore NewDocumentStoreRestart(string requestedStorage = null)
-		{
-			return NewDocumentStoreInternal(deleteDirectory: false, requestedStorage: requestedStorage);
-		}
-
-		public EmbeddableDocumentStore NewDocumentStore(string requestedStorage = null)
-		{
-			return NewDocumentStoreInternal(deleteDirectory: true, requestedStorage: requestedStorage);
-		}
-
-		public EmbeddableDocumentStore NewDocumentStore(ComposablePartCatalog catalog, string requestedStorage = null)
-		{
-			return NewDocumentStoreInternal(deleteDirectory: true, catalog: catalog, requestedStorage: requestedStorage);
-		}
-
-		private EmbeddableDocumentStore NewDocumentStoreInternal(bool deleteDirectory,
-			string requestedStorage,
-			 ComposablePartCatalog catalog = null)
+		public EmbeddableDocumentStore NewDocumentStore(
+			bool deleteDirectory = true,
+			string requestedStorage = null,
+			ComposablePartCatalog catalog = null,
+			bool deleteDirectoryOnDispose = true)
 		{
 			path = Path.GetDirectoryName(Assembly.GetAssembly(typeof(DocumentStoreServerTests)).CodeBase);
 			path = Path.Combine(path, "TestDb").Substring(6);
@@ -97,13 +84,15 @@ public EmbeddableDocumentStore NewDocumentStore(ComposablePartCatalog catalog, s
 
 				CreateDefaultIndexes(documentStore);
 
+				if (deleteDirectoryOnDispose)
+					documentStore.Disposed += ClearDatabaseDirectory;
+
 				return documentStore;
 			}
 			catch
 			{
 				// We must dispose of this object in exceptional cases, otherwise this test will break all the following tests.
-				if (documentStore != null)
-					documentStore.Dispose();
+				documentStore.Dispose();
 				throw;
 			}
 		}
@@ -328,9 +317,6 @@ protected void ClearDatabaseDirectory()
 				{
 					IOExtensions.DeleteDirectory(DbName);
 					IOExtensions.DeleteDirectory(DbDirectory);
-
-					// Delete tenants created using the EnsureDatabaseExists method.
-					IOExtensions.DeleteDirectory("Tenants");
 					break;
 				}
 				catch (IOException)
@@ -362,14 +348,17 @@ public IDocumentStore NewRemoteDocumentStore()
 				Url = "http://localhost:8079"
 			};
 
-			store.AfterDispose += (sender, args) => ravenDbServer.Dispose();
+			store.AfterDispose += (sender, args) =>
+			{
+				ravenDbServer.Dispose();
+				ClearDatabaseDirectory();
+			};
 			ModifyStore(store);
 			return store.Initialize();
 		}
 
 		public virtual void Dispose()
 		{
-			ClearDatabaseDirectory();
 			GC.Collect(2);
 			GC.WaitForPendingFinalizers();
 		}

diff --git a/Raven.Tests/Triggers/AttachmentDeleteTrigger.cs b/Raven.Tests/Triggers/AttachmentDeleteTrigger.cs
@@ -23,7 +23,7 @@ public class AttachmentDeleteTrigger: RavenTest
 
 		public AttachmentDeleteTrigger()
 		{
-			store = NewDocumentStore((new TypeCatalog(typeof (RefuseAttachmentDeleteTrigger))));
+			store = NewDocumentStore(catalog:(new TypeCatalog(typeof (RefuseAttachmentDeleteTrigger))));
 			db = store.DocumentDatabase;
 		}
 

diff --git a/Raven.Tests/Triggers/AttachmentPutTriggers.cs b/Raven.Tests/Triggers/AttachmentPutTriggers.cs
@@ -23,7 +23,7 @@ public class AttachmentPutTriggers: RavenTest
 
 		public AttachmentPutTriggers()
 		{
-			store = NewDocumentStore((new TypeCatalog(typeof (AuditAttachmentPutTrigger), typeof(RefuseBigAttachmentPutTrigger))));
+			store = NewDocumentStore(catalog:(new TypeCatalog(typeof (AuditAttachmentPutTrigger), typeof(RefuseBigAttachmentPutTrigger))));
 			db = store.DocumentDatabase;
 		}
 

diff --git a/Raven.Tests/Triggers/AttachmentReadTrigger.cs b/Raven.Tests/Triggers/AttachmentReadTrigger.cs
@@ -24,7 +24,7 @@ public class AttachmentReadTrigger : RavenTest
 
 		public AttachmentReadTrigger()
 		{
-			store = NewDocumentStore((new TypeCatalog(typeof (HideAttachmentByCaseReadTrigger))));
+			store = NewDocumentStore(catalog:(new TypeCatalog(typeof (HideAttachmentByCaseReadTrigger))));
 			db = store.DocumentDatabase;
 		}
 

diff --git a/Raven.Tests/Triggers/DeleteTriggers.cs b/Raven.Tests/Triggers/DeleteTriggers.cs
@@ -20,7 +20,7 @@ public class DeleteTriggers : RavenTest
 
 		public DeleteTriggers()
 		{
-			store = NewDocumentStore((new TypeCatalog(typeof (CascadeDeleteTrigger))));
+			store = NewDocumentStore( catalog: (new TypeCatalog(typeof (CascadeDeleteTrigger))));
 			db = store.DocumentDatabase;
 		}
 

diff --git a/Raven.Tests/Triggers/IndexTriggers.cs b/Raven.Tests/Triggers/IndexTriggers.cs
@@ -22,7 +22,7 @@ public class IndexTriggers : RavenTest
 
 		public IndexTriggers()
 		{
-			store = NewDocumentStore((new TypeCatalog(typeof(IndexToDataTable))));
+			store = NewDocumentStore(catalog:(new TypeCatalog(typeof(IndexToDataTable))));
 		}
 
 		public override void Dispose()

diff --git a/Raven.Tests/Triggers/PutTriggers.cs b/Raven.Tests/Triggers/PutTriggers.cs
@@ -22,7 +22,7 @@ public class PutTriggers : RavenTest
 
 		public PutTriggers()
 		{
-			store = NewDocumentStore((new TypeCatalog(typeof (VetoCapitalNamesPutTrigger), typeof(AuditPutTrigger))));
+			store = NewDocumentStore(catalog:(new TypeCatalog(typeof (VetoCapitalNamesPutTrigger), typeof(AuditPutTrigger))));
 			db = store.DocumentDatabase;
 		}