Skip to content

Ensure filters created are deleted #4047

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
russcam merged 1 commit into from
Aug 26, 2019
Merged

Ensure filters created are deleted #4047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/Tests/Tests/XPack/MachineLearning/GetFilters/GetFiltersApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
PutFilter(client, callUniqueValue.Value);
}

protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
{
foreach (var callUniqueValue in values)
DeleteFilter(client, callUniqueValue.Value);
}

protected override bool ExpectIsValid => true;

protected override object ExpectJson => null;
Expand Down Expand Up @@ -71,6 +77,13 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
PutFilter(client, callUniqueValue.Value + "_" + (i + 1));
}

protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
{
foreach (var callUniqueValue in values)
for (var i = 0; i < 3; i++)
DeleteFilter(client, callUniqueValue.Value + "_" + (i + 1));
}

protected override bool ExpectIsValid => true;

protected override object ExpectJson => null;
Expand Down
10 changes: 10 additions & 0 deletions src/Tests/Tests/XPack/MachineLearning/MachineLearningIntegrationTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ protected PutFilterResponse PutFilter(IElasticClient client, string filterId)
return putFilterResponse;
}

protected DeleteFilterResponse DeleteFilter(IElasticClient client, string filterId)
{
var deleteFilterResponse = client.MachineLearning.DeleteFilter(filterId);

if (!deleteFilterResponse.IsValid)
throw new Exception($"Problem deleting filter {filterId} for integration test: {deleteFilterResponse.DebugInformation}");

return deleteFilterResponse;
}

protected PutCalendarResponse PutCalendar(IElasticClient client, string calendarId)
{
var putCalendarResponse = client.MachineLearning.PutCalendar(calendarId, f => f
Expand Down
6 changes: 6 additions & 0 deletions src/Tests/Tests/XPack/MachineLearning/PutFilter/PutFilterApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ public class PutFilterApiTests : MachineLearningIntegrationTestBase<PutFilterRes
{
public PutFilterApiTests(MachineLearningCluster cluster, EndpointUsage usage) : base(cluster, usage) { }

protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
{
foreach (var callUniqueValue in values)
DeleteFilter(client, callUniqueValue.Value);
}

protected override bool ExpectIsValid => true;

protected override object ExpectJson => new
Expand Down
6 changes: 6 additions & 0 deletions src/Tests/Tests/XPack/MachineLearning/UpdateFilter/UpdateFilterApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
PutFilter(client, callUniqueValue.Value);
}

protected override void IntegrationTeardown(IElasticClient client, CallUniqueValues values)
{
foreach (var callUniqueValue in values)
DeleteFilter(client, callUniqueValue.Value);
}

protected override bool ExpectIsValid => true;

protected override object ExpectJson => new
Expand Down