Use const to hold a const string.

Marmort · Apr 3, 2012 · 54ffed5 · 54ffed5
1 parent fdc638a
commit 54ffed5
Show file tree

Hide file tree

Showing 32 changed files with 161 additions and 251 deletions.
diff --git a/Raven.Tests/Bugs/HierarchicalData.cs b/Raven.Tests/Bugs/HierarchicalData.cs
@@ -8,8 +8,6 @@
 using Raven.Json.Linq;
 using Raven.Database;
 using Raven.Database.Config;
-using Raven.Database.Data;
-using Raven.Database.Indexing;
 using Raven.Tests.Storage;
 using Xunit;
 
@@ -24,7 +22,7 @@ public HierarchicalData()
 			db =
 				new DocumentDatabase(new RavenConfiguration
 				{
-					DataDirectory = "raven.db.test.esent",
+					DataDirectory = DataDir,
 				});
 		}
 
@@ -68,4 +66,4 @@ public void CanCreateHierarchicalIndexes()
 			Assert.Equal(1, queryResult.Results.Count);
 		}
 	}
-}
+}
diff --git a/Raven.Tests/Bugs/IndexingBehavior.cs b/Raven.Tests/Bugs/IndexingBehavior.cs
@@ -3,17 +3,14 @@
 //     Copyright (c) Hibernating Rhinos LTD. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.Threading;
 using Raven.Abstractions.Data;
 using Raven.Abstractions.Indexing;
 using Raven.Json.Linq;
 using Raven.Client.Indexes;
 using Raven.Database;
 using Raven.Database.Config;
-using Raven.Database.Data;
 using Raven.Database.Exceptions;
-using Raven.Database.Indexing;
 using Raven.Tests.Storage;
 using Xunit;
 
@@ -28,7 +25,7 @@ public IndexingBehavior()
 			db =
 				new DocumentDatabase(new RavenConfiguration
 				{
-					DataDirectory = "raven.db.test.esent", 
+					DataDirectory = DataDir, 
 					RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true
 				});
 			db.PutIndex(new RavenDocumentsByEntityName().IndexName, new RavenDocumentsByEntityName().CreateIndexDefinition());
@@ -150,4 +147,4 @@ public void AfterDeletingAndStoringTheDocumentIsIndexed()
 			Assert.Equal(1, queryResult.TotalResults);
 		}
 	}
-}
+}
diff --git a/Raven.Tests/Bugs/ReadDataFromServer.cs b/Raven.Tests/Bugs/ReadDataFromServer.cs
@@ -18,7 +18,7 @@ public class ReadDataFromServer : AbstractDocumentStorageTest
 		[Fact]
 		public void CanReadDataProperly()
 		{
-			using(new RavenDbServer(new RavenConfiguration {DataDirectory = "raven.db.test.esent", RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true, Port = 8079}))
+			using(new RavenDbServer(new RavenConfiguration {DataDirectory = DataDir, RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true, Port = 8079}))
 			{
 				using (var webClient = new WebClient())
 				{

diff --git a/Raven.Tests/Indexes/CompiledIndex.cs b/Raven.Tests/Indexes/CompiledIndex.cs
@@ -3,20 +3,16 @@
 //     Copyright (c) Hibernating Rhinos LTD. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.ComponentModel.Composition.Hosting;
 using System.Threading;
-using Newtonsoft.Json;
 using Raven.Abstractions;
 using Raven.Abstractions.Data;
 using Raven.Abstractions.Extensions;
 using Raven.Json.Linq;
 using Raven.Database;
 using Raven.Database.Config;
-using Raven.Database.Data;
 using Raven.Tests.Storage;
 using Xunit;
-using Raven.Database.Json;
 
 namespace Raven.Tests.Indexes
 {
@@ -28,23 +24,19 @@ public CompiledIndex()
 		{
 			db = new DocumentDatabase(new RavenConfiguration
 			{
-				DataDirectory = "raven.db.test.esent",
+				DataDirectory = DataDir,
 				RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true,
 				Catalog = { Catalogs = { new TypeCatalog(typeof(ShoppingCartEventsToShopingCart), typeof(MapOnlyView)) } }
 			});
 			db.SpinBackgroundWorkers();
 		}
 
-		#region IDisposable Members
-
 		public override void Dispose()
 		{
 			db.Dispose();
 			base.Dispose();
 		}
 
-		#endregion
-
 		[Fact]
 		public void CanGetDataFromCompiledIndex()
 		{
@@ -153,4 +145,4 @@ public void CompileIndexWillTurnEventsToAggregate()
 			Assert.Equal(2, cart.ItemsCount);
 		}
 	}
-}
+}
diff --git a/Raven.Tests/Indexes/ComplexIndexOnNotAnalyzedField.cs b/Raven.Tests/Indexes/ComplexIndexOnNotAnalyzedField.cs
@@ -8,8 +8,6 @@
 using Raven.Json.Linq;
 using Raven.Database;
 using Raven.Database.Config;
-using Raven.Database.Data;
-using Raven.Database.Indexing;
 using Raven.Tests.Storage;
 using Xunit;
 
@@ -23,22 +21,18 @@ public ComplexIndexOnNotAnalyzedField()
 		{
 			db = new DocumentDatabase(new RavenConfiguration
 			{
-				DataDirectory = "raven.db.test.esent",
+				DataDirectory = DataDir,
 				RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true
 			});
 			db.SpinBackgroundWorkers();
 		}
 
-		#region IDisposable Members
-
 		public override void Dispose()
 		{
 			db.Dispose();
 			base.Dispose();
 		}
 
-		#endregion
-
 		[Fact]
 		public void CanQueryOnKey()
 		{

diff --git a/Raven.Tests/Indexes/DocumentsToIndex.cs b/Raven.Tests/Indexes/DocumentsToIndex.cs
@@ -23,20 +23,16 @@ public class DocumentsToIndex : AbstractDocumentStorageTest
 
 		public DocumentsToIndex()
 		{
-			db = new DocumentDatabase(new RavenConfiguration {DataDirectory = "raven.db.test.esent", RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true});
+			db = new DocumentDatabase(new RavenConfiguration {DataDirectory = DataDir, RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true});
 			db.SpinBackgroundWorkers();
 		}
 
-		#region IDisposable Members
-
 		public override void Dispose()
 		{
 			db.Dispose();
 			base.Dispose();
 		}
 
-		#endregion
-
 		[Fact]
 		public void Can_Read_values_from_index()
 		{

diff --git a/Raven.Tests/Indexes/QueryingOnDefaultIndex.cs b/Raven.Tests/Indexes/QueryingOnDefaultIndex.cs
@@ -8,7 +8,6 @@
 using Raven.Client.Indexes;
 using Raven.Database;
 using Raven.Database.Config;
-using Raven.Database.Data;
 using Raven.Tests.Storage;
 using Xunit;
 
@@ -20,21 +19,17 @@ public class QueryingOnDefaultIndex: AbstractDocumentStorageTest
 
 		public QueryingOnDefaultIndex()
 		{
-			db = new DocumentDatabase(new RavenConfiguration {DataDirectory = "raven.db.test.esent", RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true});
+			db = new DocumentDatabase(new RavenConfiguration {DataDirectory = DataDir, RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true});
 			db.PutIndex(new RavenDocumentsByEntityName().IndexName, new RavenDocumentsByEntityName().CreateIndexDefinition());
 			db.SpinBackgroundWorkers();
 		}
 
-		#region IDisposable Members
-
 		public override void Dispose()
 		{
 			db.Dispose();
 			base.Dispose();
 		}
 
-		#endregion
-
 		[Fact]
 		public void CanQueryOverDefaultIndex()
 		{

diff --git a/Raven.Tests/Indexes/QueryingOnStaleIndexes.cs b/Raven.Tests/Indexes/QueryingOnStaleIndexes.cs
@@ -3,15 +3,13 @@
 //     Copyright (c) Hibernating Rhinos LTD. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
 using System.Threading;
 using Raven.Abstractions;
 using Raven.Abstractions.Data;
 using Raven.Json.Linq;
 using Raven.Client.Indexes;
 using Raven.Database;
 using Raven.Database.Config;
-using Raven.Database.Data;
 using Raven.Tests.Storage;
 using Xunit;
 
@@ -23,22 +21,18 @@ public class QueryingOnStaleIndexes: AbstractDocumentStorageTest
 
 		public QueryingOnStaleIndexes()
 		{
-			db = new DocumentDatabase(new RavenConfiguration { DataDirectory = "raven.db.test.esent", RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true });
+			db = new DocumentDatabase(new RavenConfiguration { DataDirectory = DataDir, RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true });
 			db.PutIndex(new RavenDocumentsByEntityName().IndexName, new RavenDocumentsByEntityName().CreateIndexDefinition());
 
 
 		}
 
-		#region IDisposable Members
-
 		public override void Dispose()
 		{
 			db.Dispose();
 			base.Dispose();
 		}
 
-		#endregion
-
 		[Fact]
 		public void WillGetStaleResultWhenThereArePendingTasks()
 		{

diff --git a/Raven.Tests/Indexes/Statistics.cs b/Raven.Tests/Indexes/Statistics.cs
@@ -10,8 +10,6 @@
 using Raven.Json.Linq;
 using Raven.Database;
 using Raven.Database.Config;
-using Raven.Database.Data;
-using Raven.Database.Indexing;
 using Raven.Tests.Storage;
 using Xunit;
 using System.Linq;
@@ -24,7 +22,7 @@ public class Statistics : AbstractDocumentStorageTest
 
 		public Statistics()
 		{
-			db = new DocumentDatabase(new RavenConfiguration {DataDirectory = "raven.db.test.esent", RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true});
+			db = new DocumentDatabase(new RavenConfiguration {DataDirectory = DataDir, RunInUnreliableYetFastModeThatIsNotSuitableForProduction = true});
 			db.SpinBackgroundWorkers();
 
 			db.PutIndex("pagesByTitle2",
@@ -38,16 +36,12 @@ public Statistics()
 			            });
 		}
 
-		#region IDisposable Members
-
 		public override void Dispose()
 		{
 			db.Dispose();
 			base.Dispose();
 		}
 
-		#endregion
-
 		[Fact]
 		public void Can_get_stats_for_indexing_without_any_indexing()
 		{

diff --git a/Raven.Tests/Queries/ParameterisedDynamicQuery.cs b/Raven.Tests/Queries/ParameterisedDynamicQuery.cs
@@ -3,10 +3,7 @@
 //     Copyright (c) Hibernating Rhinos LTD. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Raven.Abstractions;
 using Raven.Abstractions.Data;
 using Raven.Database.Config;
@@ -15,7 +12,6 @@
 using Xunit;
 using Raven.Database;
 using Raven.Json.Linq;
-using Raven.Database.Data;
 
 namespace Raven.Tests.Queries
 {
@@ -27,7 +23,7 @@ public ParameterisedDynamicQuery()
 		{
 			db = new DocumentDatabase(new RavenConfiguration
 				{
-					DataDirectory = "raven.db.test.esent",
+					DataDirectory = DataDir,
 				});
 			db.SpinBackgroundWorkers();
 		}

diff --git a/Raven.Tests/Storage/AbstractDocumentStorageTest.cs b/Raven.Tests/Storage/AbstractDocumentStorageTest.cs
@@ -4,21 +4,22 @@
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
-using System.IO;
 using Raven.Database.Extensions;
 
 namespace Raven.Tests.Storage
 {
-	public class AbstractDocumentStorageTest : IDisposable
+	public abstract class AbstractDocumentStorageTest : IDisposable
 	{
-		public AbstractDocumentStorageTest()
+		protected const string DataDir = "raven.db.test.esent";
+
+		protected AbstractDocumentStorageTest()
 		{
-			IOExtensions.DeleteDirectory("raven.db.test.esent");
+			IOExtensions.DeleteDirectory(DataDir);
 		}
 
 		public virtual void Dispose()
 		{
-			IOExtensions.DeleteDirectory("raven.db.test.esent");
+			IOExtensions.DeleteDirectory(DataDir);
 		}
 	}
-}
+}