Start Trial and Basic integration tests now run against isolated cluster, StartTrialResponse needs to be subclass of AcknowledgedResponse

Author: Mpdreamz

src/Nest/XPack/License/StartTrialLicense/StartTrialLicenseResponse.cs

@@ -2,7 +2,7 @@
 
 namespace Nest
 {
-	public interface IStartTrialLicenseResponse : IResponse
+	public interface IStartTrialLicenseResponse : IAcknowledgedResponse
 	{
 		[JsonProperty("error_message")]
 		string ErrorMessage { get; }
@@ -11,7 +11,7 @@ public interface IStartTrialLicenseResponse : IResponse
 		bool TrialWasStarted { get; }
 	}
 
-	public class StartTrialLicenseResponse : ResponseBase, IStartTrialLicenseResponse
+	public class StartTrialLicenseResponse : AcknowledgedResponseBase, IStartTrialLicenseResponse
 	{
 		public string ErrorMessage { get; internal set; }
 		public bool TrialWasStarted { get; internal set; }

src/Tests/Tests/XPack/License/StartBasicLicense/StartBasicLicenseApiTests.cs

@@ -1,5 +1,4 @@
-using System;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -10,11 +9,13 @@
 
 namespace Tests.XPack.License.StartBasicLicense
 {
+	public class BasicLicenseCluster : ClientTestClusterBase { }
+
 	[SkipVersion("<6.5.0", "")]
 	public class StartBasicLicenseApiTests
-		: ApiIntegrationTestBase<XPackCluster, IStartBasicLicenseResponse, IStartBasicLicenseRequest, StartBasicLicenseDescriptor, StartBasicLicenseRequest>
+		: ApiIntegrationTestBase<BasicLicenseCluster, IStartBasicLicenseResponse, IStartBasicLicenseRequest, StartBasicLicenseDescriptor, StartBasicLicenseRequest>
 	{
-		public StartBasicLicenseApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public StartBasicLicenseApiTests(BasicLicenseCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override bool ExpectIsValid => false;
 		protected override int ExpectStatusCode => 200;

src/Tests/Tests/XPack/License/StartTrialLicense/StartTrialLicenseApiTests.cs

@@ -1,4 +1,6 @@
-using Elastic.Xunit.XunitPlumbing;
+using System;
+using System.Threading.Tasks;
+using Elastic.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -9,20 +11,28 @@
 
 namespace Tests.XPack.License.StartTrialLicense
 {
-	[SkipVersion("<6.1.0", "Only exists in Elasticsearch 6.1.0+")]
+	public class TrialLicenseCluster : ClientTestClusterBase { }
+
+	[SkipVersion("<6.4.0", "Only exists in Elasticsearch 6.1.0+, expect x-pack to ship in default distribution")]
 	public class StartTrialLicenseApiTests
-		: ApiIntegrationTestBase<XPackCluster, IStartTrialLicenseResponse, IStartTrialLicenseRequest, StartTrialLicenseDescriptor,
+		: ApiIntegrationTestBase<TrialLicenseCluster, IStartTrialLicenseResponse, IStartTrialLicenseRequest, StartTrialLicenseDescriptor,
 			StartTrialLicenseRequest>
 	{
-		public StartTrialLicenseApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public StartTrialLicenseApiTests(TrialLicenseCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected bool BootstrappedWithLicense => !string.IsNullOrEmpty(Cluster.ClusterConfiguration.XPackLicenseJson);
 
-		protected override bool ExpectIsValid => BootstrappedWithLicense;
-		protected override int ExpectStatusCode => BootstrappedWithLicense ? 200 : 403;
+		protected override bool ExpectIsValid => true;
+		[I] public override async Task ReturnsExpectedIsValid() =>
+			await AssertOnAllResponses(r => r.ShouldHaveExpectedIsValid(r.TrialWasStarted));
+
+		protected override int ExpectStatusCode => 200;
+		[I] public override async Task ReturnsExpectedStatusCode() =>
+			await AssertOnAllResponses(r => r.ApiCall.HttpStatusCode.Should().Be(r.TrialWasStarted ? 200 : 403));
+
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsDeserialization => false;
-		protected override string UrlPath => $"/_xpack/license/start_trial";
+		protected override string UrlPath => $"/_xpack/license/start_trial?acknowledge=true";
 
 		protected override LazyResponses ClientUsage() => Calls(
 			(client, f) => client.StartTrialLicense(f),
@@ -31,20 +41,14 @@ protected override LazyResponses ClientUsage() => Calls(
 			(client, r) => client.StartTrialLicenseAsync(r)
 		);
 
+		protected override StartTrialLicenseRequest Initializer => new StartTrialLicenseRequest { Acknowledge = true };
+		protected override Func<StartTrialLicenseDescriptor, IStartTrialLicenseRequest> Fluent => s => s.Acknowledge();
+
 		protected override void ExpectResponse(IStartTrialLicenseResponse response)
 		{
-            response.TrialWasStarted.Should().BeFalse();
-			if (!BootstrappedWithLicense)
-			{
-                // license already applied
-                response.ErrorMessage.Should().Be("Operation failed: Trial was already activated.");
-			}
-			else
-			{
-				// running with a license means you have to pass the acknowledge flag to forcefully go
-				// into trial mode
-				response.ErrorMessage.Should().Contain(" Needs acknowledgement");
-			}
+			response.Acknowledged.Should().BeTrue();
+			if (!response.TrialWasStarted)
+				response.ErrorMessage.Should().NotBeNullOrWhiteSpace().And.Contain("Trial was already activated");
 		}
 	}
 }