Skip to content

Fixes integration tests against latest 7.7.0-SNAPSHOT #4545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codebrain merged 3 commits into from
Apr 3, 2020
Merged

Fixes integration tests against latest 7.7.0-SNAPSHOT #4545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0990c4
This commit adds some missing roles to NodeRole and some additional p…
codebrain Apr 2, 2020
c2d2c34
Fixes integration tests against latest 7.7.0-SNAPSHOT
codebrain Apr 3, 2020
e18a541
Merge branch '7.7' into fix/7.7/fix-7.7.0-snapshot-tests
codebrain Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/Tests/Aggregations/Pipeline/Derivative/DerivativeAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public DerivativeAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage us
{
field = "startedOn",
interval = "month",
min_doc_count = 1
min_doc_count = 0
},
aggs = new
{
Expand All @@ -48,7 +48,7 @@ public DerivativeAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage us
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(1)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm
.Field(p => p.NumberOfCommits)
Expand All @@ -64,7 +64,7 @@ public DerivativeAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage us
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 1,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits") &&
new DerivativeAggregation("commits_derivative", "commits")
Expand Down
6 changes: 3 additions & 3 deletions tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageEwmaAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public MovingAverageEwmaAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
{
field = "startedOn",
interval = "month",
min_doc_count = 1
min_doc_count = 0
},
aggs = new
{
Expand Down Expand Up @@ -55,7 +55,7 @@ public MovingAverageEwmaAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(1)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm
.Field(p => p.NumberOfCommits)
Expand All @@ -76,7 +76,7 @@ public MovingAverageEwmaAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 1,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits")
&& new MovingAverageAggregation("commits_moving_avg", "commits")
Expand Down
6 changes: 3 additions & 3 deletions ...Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltLinearAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public MovingAverageHoltLinearAggregationUsageTests(ReadOnlyCluster cluster, End
{
field = "startedOn",
interval = "month",
min_doc_count = 1
min_doc_count = 0
},
aggs = new
{
Expand Down Expand Up @@ -56,7 +56,7 @@ public MovingAverageHoltLinearAggregationUsageTests(ReadOnlyCluster cluster, End
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(1)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm.Field(p => p.NumberOfCommits))
.MovingAverage("commits_moving_avg", mv => mv
Expand All @@ -76,7 +76,7 @@ public MovingAverageHoltLinearAggregationUsageTests(ReadOnlyCluster cluster, End
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 1,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits")
&& new MovingAverageAggregation("commits_moving_avg", "commits")
Expand Down
6 changes: 3 additions & 3 deletions ...ests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltWintersAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public MovingAverageHoltWintersUsageTests(ReadOnlyCluster cluster, EndpointUsage
{
field = "startedOn",
interval = "month",
min_doc_count = 1
min_doc_count = 0
},
aggs = new
{
Expand Down Expand Up @@ -60,7 +60,7 @@ public MovingAverageHoltWintersUsageTests(ReadOnlyCluster cluster, EndpointUsage
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(1)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm
.Field(p => p.NumberOfCommits)
Expand All @@ -87,7 +87,7 @@ public MovingAverageHoltWintersUsageTests(ReadOnlyCluster cluster, EndpointUsage
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 1,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits")
&& new MovingAverageAggregation("commits_moving_avg", "commits")
Expand Down
3 changes: 3 additions & 0 deletions tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageLinearAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public MovingAverageLinearAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
{
field = "startedOn",
interval = "month",
min_doc_count = 0
},
aggs = new
{
Expand Down Expand Up @@ -52,6 +53,7 @@ public MovingAverageLinearAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm
.Field(p => p.NumberOfCommits)
Expand All @@ -71,6 +73,7 @@ public MovingAverageLinearAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits") &&
new MovingAverageAggregation("commits_moving_avg", "commits")
Expand Down
5 changes: 4 additions & 1 deletion tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageSimpleAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
date_histogram = new
{
field = "startedOn",
interval = "month"
interval = "month",
min_doc_count = 0
},
aggs = new
{
Expand Down Expand Up @@ -54,6 +55,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm
.Field(p => p.NumberOfCommits)
Expand All @@ -75,6 +77,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits")
&& new MovingAverageAggregation("commits_moving_avg", "commits")
Expand Down
3 changes: 3 additions & 0 deletions tests/Tests/Aggregations/Pipeline/MovingFunction/MovingFunctionAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public MovingFunctionAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsag
{
field = "startedOn",
interval = "month",
min_doc_count = 0
},
aggs = new
{
Expand Down Expand Up @@ -63,6 +64,7 @@ public MovingFunctionAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsag
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm
.Field(p => p.NumberOfCommits)
Expand All @@ -81,6 +83,7 @@ public MovingFunctionAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsag
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits")
&& new MovingFunctionAggregation("commits_moving_avg", "commits")
Expand Down
6 changes: 3 additions & 3 deletions ...Tests/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregationUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public SerialDifferencingAggregationUsageTests(ReadOnlyCluster cluster, Endpoint
{
field = "startedOn",
interval = "month",
min_doc_count = 1
min_doc_count = 0
},
aggs = new
{
Expand Down Expand Up @@ -48,7 +48,7 @@ public SerialDifferencingAggregationUsageTests(ReadOnlyCluster cluster, Endpoint
.DateHistogram("projects_started_per_month", dh => dh
.Field(p => p.StartedOn)
.Interval(DateInterval.Month)
.MinimumDocumentCount(1)
.MinimumDocumentCount(0)
.Aggregations(aa => aa
.Sum("commits", sm => sm
.Field(p => p.NumberOfCommits)
Expand All @@ -65,7 +65,7 @@ public SerialDifferencingAggregationUsageTests(ReadOnlyCluster cluster, Endpoint
{
Field = "startedOn",
Interval = DateInterval.Month,
MinimumDocumentCount = 1,
MinimumDocumentCount = 0,
Aggregations =
new SumAggregation("commits", "numberOfCommits")
&& new SerialDifferencingAggregation("second_difference", "commits")
Expand Down
6 changes: 3 additions & 3 deletions tests/Tests/QueryDsl/TermLevel/Terms/TermsLookupQueryUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public TermsLookupQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage)
Field = "description",
TermsLookup = new FieldLookup
{
Id = 12,
Id = "12",
Index = Index<Developer>(),
Path = Field<Developer>(p => p.LastName),
Routing = "myroutingvalue"
Expand All @@ -41,7 +41,7 @@ public TermsLookupQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage)
boost = 1.1,
description = new
{
id = 12,
id = "12",
index = "devs",
path = "lastName",
routing = "myroutingvalue"
Expand All @@ -56,7 +56,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
.Field(p => p.Description)
.TermsLookup<Developer>(e => e
.Path(p => p.LastName)
.Id(12)
.Id("12")
.Routing("myroutingvalue")
)
);
Expand Down
9 changes: 1 addition & 8 deletions tests/Tests/Search/SearchTemplate/SearchTemplateApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,6 @@ protected override LazyResponses ClientUsage() => Calls(
(c, r) => c.SearchTemplateAsync<Project>(r)
);

protected override void ExpectResponse(ISearchResponse<Project> response)
{
response.ServerError.Should().NotBeNull();
if (TestConfiguration.Instance.ElasticsearchVersion < "7.7.0")
response.ServerError.Error.Reason.Should().Contain("no [query]");
else
response.ServerError.Error.Reason.Should().Contain("unknown query [atch]");
}
protected override void ExpectResponse(ISearchResponse<Project> response) => response.ServerError.Should().NotBeNull();
Copy link
Contributor

@russcam russcam Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe

response.ServerError.Error.Reason.Should().Contain("query");

for both? It would provide a slightly stronger assertion for why there is an error

Copy link
Contributor Author

@codebrain codebrain Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was just conscious that binding the test to the error message probably isn't a good idea as the error message can change.

Copy link
Contributor

@russcam russcam Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a fair point, historically verifiable! Is there some other way we can assert that the error is related to what we expect it to be?

}
}