moving tests to xunit

damienbod · Nov 21, 2015 · 70b1b6a · 70b1b6a
1 parent 3f7d5c7
commit 70b1b6a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/...searchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/DefaultElasticsearchCRUDTests.cs b/...searchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/DefaultElasticsearchCRUDTests.cs
@@ -13,6 +13,16 @@ namespace ElasticsearchCRUD.Integration.Test
 
     public class DefaultElasticsearchCrudTests : IDisposable
     {
+        public DefaultElasticsearchCrudTests()
+        {
+            SetUp();
+        }
+
+        public void Dispose()
+        {
+            TearDown();
+        }
+
         private List<SkillTestEntity> _entitiesForTests;
         private List<SkillTestEntityTwo> _entitiesForTestsTypeTwo;
         private readonly IElasticsearchMappingResolver _elasticsearchMappingResolver = new ElasticsearchMappingResolver();
@@ -27,7 +37,6 @@ private void WaitForDataOrFail()
             }
         }
 
-        [SetUp]
         public void SetUp()
         {
             _entitiesForTests = new List<SkillTestEntity>();
@@ -59,7 +68,6 @@ public void SetUp()
             }
         }
 
-        [TearDown]
         public void TearDown()
         {
             _entitiesForTests = null;
@@ -714,10 +722,5 @@ public void TestDefaultContextTestJsonIgnore()
                 Assert.Equal(ret.Id, 3);
             }
         }
-
-        public void Dispose()
-        {
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/...earchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/GlobalApiTestsSearchCountTests.cs b/...earchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/GlobalApiTestsSearchCountTests.cs
@@ -15,6 +15,11 @@ namespace ElasticsearchCRUD.Integration.Test
 
     public class GlobalApiTestsSearchCountTests : IDisposable
     {
+        public GlobalApiTestsSearchCountTests()
+        {
+            Setup();
+        }
+
         private readonly IElasticsearchMappingResolver _elasticsearchMappingResolver = new ElasticsearchMappingResolver();
         private const string ConnectionString = "http://localhost:9200";
 
@@ -209,7 +214,6 @@ public void GlobalElasticsearchMappingSearchAllAggTest()
             }
         }
 
-        [TestFixtureTearDown]
         public void FixtureTearDown()
         {
             using (var context = new ElasticsearchContext(ConnectionString, _elasticsearchMappingResolver))
@@ -227,7 +231,6 @@ public void FixtureTearDown()
             }
         }
 
-        [TestFixtureSetUp]
         public void Setup()
         {
             _elasticsearchMappingResolver.AddElasticSearchMappingForEntityType(typeof(object), new GlobalElasticsearchMapping());
@@ -262,7 +265,7 @@ public void Setup()
 
         public void Dispose()
         {
-            throw new NotImplementedException();
+            FixtureTearDown();
         }
     }
 

diff --git a/ElasticsearchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/MappingTypeTests.cs b/ElasticsearchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/MappingTypeTests.cs
@@ -14,10 +14,14 @@ namespace ElasticsearchCRUD.Integration.Test
 
     public class MappingTypeTests : IDisposable
     {
-		private readonly IElasticsearchMappingResolver _elasticsearchMappingResolver = new ElasticsearchMappingResolver();
+        public void Dispose()
+        {
+            FixtureTearDown();
+        }
+
+        private readonly IElasticsearchMappingResolver _elasticsearchMappingResolver = new ElasticsearchMappingResolver();
 		private const string ConnectionString = "http://localhost:9200";
 
-		[TestFixtureTearDown]
 		public void FixtureTearDown()
 		{
 			using (var context = new ElasticsearchContext(ConnectionString, _elasticsearchMappingResolver))
@@ -39,7 +43,7 @@ public void FixtureTearDown()
 
 		}
 
-		 [Fact]
+		[Fact]
 		public void CreateNewIndexAndMappingWithAllDisabled()
 		{
 			var indexDefinition = new IndexDefinition {IndexSettings = {NumberOfShards = 3, NumberOfReplicas = 1}};
@@ -149,11 +153,6 @@ public void CreateNewIndexAndMappingWithAnalyzer()
 				Assert.GreaterOrEqual(doc.PayloadResult.Hits.HitsResult.First().Id.ToString(), "1");
 			}
 		}
-
-        public void Dispose()
-        {
-            throw new NotImplementedException();
-        }
     }
 
 	public class MappingTypeAllTest

diff --git a/...earchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/SearchCreateScanAndScrollTests.cs b/...earchCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/SearchCreateScanAndScrollTests.cs
@@ -15,7 +15,17 @@ namespace ElasticsearchCRUD.Integration.Test
 
     public class SearchCreateScanAndScrollTests : IDisposable
     {
-		private List<ScanScrollTypeV1> _entitiesForTests;
+        public SearchCreateScanAndScrollTests()
+        {
+            SetUp();
+        }
+
+        public void Dispose()
+        {
+            TearDown();
+        }
+
+        private List<ScanScrollTypeV1> _entitiesForTests;
 		private readonly IElasticsearchMappingResolver _elasticsearchMappingResolver = new ElasticsearchMappingResolver();
 		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
 		private const string ConnectionString = "http://localhost:9200";
@@ -28,7 +38,6 @@ private void WaitForDataOrFail()
 			}
 		}
 
-		[SetUp]
 		public void SetUp()
 		{
 			_entitiesForTests = new List<ScanScrollTypeV1>();
@@ -48,7 +57,6 @@ public void SetUp()
 			}
 		}
 
-		[TearDown]
 		public void TearDown()
 		{
 			_entitiesForTests = null;
@@ -171,11 +179,6 @@ private string BuildSearchMatchAll()
 
 			return buildJson.ToString();
 		}
-
-        public void Dispose()
-        {
-            throw new NotImplementedException();
-        }
     }
 
 	public class ScanScrollTypeV1