Skip to content

Commit

Permalink
moving tests to xunit
Browse files Browse the repository at this point in the history
  • Loading branch information
@damienbod
damienbod committed Nov 21, 2015
1 parent 4fc7fce commit 40b3b5f
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 54 deletions.
13 changes: 8 additions & 5 deletions ...egration.Test/AggregationTests/FilterBucketAggregationAndMissingBucketAggregationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
using ElasticsearchCRUD.Model.SearchModel.Aggregations;
using ElasticsearchCRUD.Model.SearchModel.Filters;
using ElasticsearchCRUD.Model.Units;
using System;
using Xunit;

namespace ElasticsearchCRUD.Integration.Test.AggregationTests
{
using System;

using Xunit;

public class FilterBucketAggregationAndMissingBucketAggregationTests : SetupSearchAgg, IDisposable
{
public FilterBucketAggregationAndMissingBucketAggregationTests()
{
Setup();
}

[Fact]
public void SearchAggFilterBucketAggregationWithNoHits()
{
Expand Down Expand Up @@ -234,7 +237,7 @@ public void SearchAggFiltersNamedBucketAggregationWithTopHitsWithNoHits()

public void Dispose()
{
throw new NotImplementedException();
TearDown();
}
}
}
13 changes: 8 additions & 5 deletions .../ElasticsearchCRUD.Integration.Test/AggregationTests/GeohashGridBucketAggregationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
using ElasticsearchCRUD.ContextSearch.SearchModel.AggModel;
using ElasticsearchCRUD.Model.SearchModel;
using ElasticsearchCRUD.Model.SearchModel.Aggregations;
using System;
using Xunit;

namespace ElasticsearchCRUD.Integration.Test.AggregationTests
{
using System;

using Xunit;

public class GeohashGridBucketAggregationTests : SetupSearchAgg, IDisposable
{
public GeohashGridBucketAggregationTests()
{
Setup();
}

[Fact]
public void SearchAggGeohashGridBucketAggregationWithNoHits()
{
Expand Down Expand Up @@ -115,7 +118,7 @@ public void SearchAggTermsBucketAggregationScriptWithNoHits()

public void Dispose()
{
throw new NotImplementedException();
TearDown();
}
}
}
13 changes: 8 additions & 5 deletions ...5/src/ElasticsearchCRUD.Integration.Test/AggregationTests/GlobalBucketAggregationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@
using ElasticsearchCRUD.Model.SearchModel;
using ElasticsearchCRUD.Model.SearchModel.Aggregations;
using ElasticsearchCRUD.Model.SearchModel.Sorting;
using System;
using Xunit;

namespace ElasticsearchCRUD.Integration.Test.AggregationTests
{
using System;

using Xunit;

public class GlobalBucketAggregationTests : SetupSearchAgg, IDisposable
{
public GlobalBucketAggregationTests()
{
Setup();
}

[Fact]
public void SearchAggGlobalBucketAggregationWithNoHits()
{
Expand Down Expand Up @@ -98,7 +101,7 @@ public void SearchAggTermsBucketAggregationWithOrderSumSubSumAggNoHits()

public void Dispose()
{
throw new NotImplementedException();
TearDown();
}
}
}
10 changes: 7 additions & 3 deletions ...rc/ElasticsearchCRUD.Integration.Test/AggregationTests/HistogramBucketAggregationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@
using ElasticsearchCRUD.Model.SearchModel.Aggregations;
using ElasticsearchCRUD.Model.SearchModel.Sorting;
using ElasticsearchCRUD.Model.Units;
using Xunit;

namespace ElasticsearchCRUD.Integration.Test.AggregationTests
{
using Xunit;

public class HistogramBucketAggregationTests : SetupSearchAgg, IDisposable
{
public HistogramBucketAggregationTests()
{
Setup();
}

[Fact]
public void SearchAggHistogramBucketAggregationWithNoHits()
{
Expand Down Expand Up @@ -310,7 +314,7 @@ public void SearchAggDateHistogramBucketAggregationWithPropertiesWithTopHitsAggW

public void Dispose()
{
throw new NotImplementedException();
TearDown();
}
}
}
76 changes: 43 additions & 33 deletions ...AspNet5/src/ElasticsearchCRUD.Integration.Test/AggregationTests/RangesAggregationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@
using ElasticsearchCRUD.Model.SearchModel;
using ElasticsearchCRUD.Model.SearchModel.Aggregations;
using ElasticsearchCRUD.Model.SearchModel.Aggregations.RangeParam;
using NUnit.Framework;
using System;
using Xunit;

namespace ElasticsearchCRUD.Integration.Test.AggregationTests
{
[TestFixture]
public class RangessAggregationTests : SetupSearchAgg
{
public class RangessAggregationTests : SetupSearchAgg, IDisposable
{
public RangessAggregationTests()
{
Setup();
}

[Fact]
public void SearchAggRangesBucketAggregationWithNoHits()
{
Expand All @@ -31,11 +36,11 @@ public void SearchAggRangesBucketAggregationWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<RangesBucketAggregationsResult>("testRangesBucketAggregation");
Assert.AreEqual(6, aggResult.Buckets[2].DocCount);
Assert.AreEqual("2.0", aggResult.Buckets[2].FromAsString);
Assert.Equal(6, aggResult.Buckets[2].DocCount);
Assert.Equal("2.0", aggResult.Buckets[2].FromAsString);
}
}

Expand All @@ -60,12 +65,12 @@ public void SearchAggRangesBucketAggregationKeyedWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<RangesNamedBucketAggregationsResult>("testRangesBucketAggregation");
var test = aggResult.Buckets.GetSubAggregationsFromJTokenName<RangeBucket>("2.0-*");

Assert.AreEqual("2.0", test.FromAsString);
Assert.Equal("2.0", test.FromAsString);
}
}

Expand Down Expand Up @@ -96,11 +101,11 @@ public void SearchAggRangesBucketAggregationWithRangeKeysWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<RangesBucketAggregationsResult>("testRangesBucketAggregation");
Assert.AreEqual(6, aggResult.Buckets[2].DocCount);
Assert.AreEqual("three", aggResult.Buckets[2].Key);
Assert.Equal(6, aggResult.Buckets[2].DocCount);
Assert.Equal("three", aggResult.Buckets[2].Key);
}
}

Expand Down Expand Up @@ -134,12 +139,12 @@ public void SearchAggRangesBucketAggregationKeyedWithRangeKeysWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<RangesNamedBucketAggregationsResult>("testRangesBucketAggregation");
var test = aggResult.Buckets.GetSubAggregationsFromJTokenName<RangeBucket>("three");

Assert.AreEqual("2.0", test.FromAsString);
Assert.Equal("2.0", test.FromAsString);
}
}

Expand Down Expand Up @@ -176,13 +181,13 @@ public void SearchAggRangesBucketAggregationWithRangeKeysWithMaxMetricSubAggWith

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<RangesBucketAggregationsResult>("testRangesBucketAggregation");
var max = aggResult.Buckets[2].GetSingleMetricSubAggregationValue<double>("maxi");
Assert.AreEqual(6, aggResult.Buckets[2].DocCount);
Assert.AreEqual("three", aggResult.Buckets[2].Key);
Assert.AreEqual(2.9, max);
Assert.Equal(6, aggResult.Buckets[2].DocCount);
Assert.Equal("three", aggResult.Buckets[2].Key);
Assert.Equal(2.9, max);
}
}

Expand All @@ -204,10 +209,10 @@ public void SearchAggDateRangesBucketAggregationWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<RangesBucketAggregationsResult>("testRangesBucketAggregation");
Assert.AreEqual(7, aggResult.Buckets[2].DocCount);
Assert.Equal(7, aggResult.Buckets[2].DocCount);
}
}

Expand Down Expand Up @@ -235,12 +240,12 @@ public void SearchAggDateRangesBucketAggregationKeyedWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<RangesNamedBucketAggregationsResult>("testRangesBucketAggregation");
var test = aggResult.Buckets.GetSubAggregationsFromJTokenName<RangeBucket>("keyName");

Assert.AreEqual(7, test.DocCount);
Assert.Equal(7, test.DocCount);
}
}

Expand All @@ -263,11 +268,11 @@ public void SearchAggGeoDistanceBucketAggregationWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<GeoDistanceBucketAggregationsResult>("testGeoDistanceBucketAggregation");
Assert.AreEqual(7, aggResult.Buckets[2].DocCount);
Assert.AreEqual(500, aggResult.Buckets[2].From);
Assert.Equal(7, aggResult.Buckets[2].DocCount);
Assert.Equal<uint>(500, aggResult.Buckets[2].From);
}
}

Expand All @@ -294,11 +299,11 @@ public void SearchAggGeoDistanceBucketAggregationWithDistanceTypeWithNoHits()

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<GeoDistanceBucketAggregationsResult>("testGeoDistanceBucketAggregation");
Assert.AreEqual(7, aggResult.Buckets[2].DocCount);
Assert.AreEqual(500, aggResult.Buckets[2].From);
Assert.Equal(7, aggResult.Buckets[2].DocCount);
Assert.Equal<uint>(500, aggResult.Buckets[2].From);
}
}

Expand Down Expand Up @@ -329,14 +334,19 @@ public void SearchAggGeoDistanceBucketAggregationWithDistanceTypeWithTopHitsWith

using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
{
Assert.IsTrue(context.IndexTypeExists<SearchAggTest>());
Assert.True(context.IndexTypeExists<SearchAggTest>());
var items = context.Search<SearchAggTest>(search, new SearchUrlParameters { SeachType = SeachType.count });
var aggResult = items.PayloadResult.Aggregations.GetComplexValue<GeoDistanceBucketAggregationsResult>("testGeoDistanceBucketAggregation");
var hits = aggResult.Buckets[2].GetSubAggregationsFromJTokenName<TopHitsMetricAggregationsResult<SearchAggTest>>("tops");
Assert.AreEqual(7, aggResult.Buckets[2].DocCount);
Assert.AreEqual(500, aggResult.Buckets[2].From);
Assert.AreEqual(7, hits.Hits.Total);
Assert.Equal(7, aggResult.Buckets[2].DocCount);
Assert.Equal<uint>(500, aggResult.Buckets[2].From);
Assert.Equal(7, hits.Hits.Total);
}
}
}

public void Dispose()
{
TearDown();
}
}
}
3 changes: 0 additions & 3 deletions ...archCrudAspNet5/src/ElasticsearchCRUD.Integration.Test/AggregationTests/SetupSearchAgg.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Threading;
using ElasticsearchCRUD.Model.GeoModel;
using NUnit.Framework;

namespace ElasticsearchCRUD.Integration.Test.AggregationTests
{
Expand All @@ -10,7 +9,6 @@ public class SetupSearchAgg
protected readonly IElasticsearchMappingResolver ElasticsearchMappingResolver = new ElasticsearchMappingResolver();
protected const string ConnectionString = "http://localhost:9200";

[TestFixtureSetUp]
public void Setup()
{
var doc1 = new SearchAggTest
Expand Down Expand Up @@ -111,7 +109,6 @@ public void Setup()
}
}

[TestFixtureTearDown]
public void TearDown()
{
using (var context = new ElasticsearchContext(ConnectionString, ElasticsearchMappingResolver))
Expand Down

0 comments on commit 40b3b5f

Please sign in to comment.