update usings inside Tests

Mpdreamz · Mpdreamz · commit c24d7e268700 · 2020-05-25T17:41:12.000+02:00
(cherry picked from commit 61f6444) (cherry picked from commit 4aff9e5)
diff --git a/tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs b/tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs
@@ -1,6 +1,6 @@
 ﻿using System;
-using Elastic.Managed.Ephemeral;
-using Elasticsearch.Net;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
diff --git a/tests/Tests/ClientConcepts/ConnectionPooling/Sniffing/RoleDetection.doc.cs b/tests/Tests/ClientConcepts/ConnectionPooling/Sniffing/RoleDetection.doc.cs
@@ -4,9 +4,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Threading;
-using Elastic.Managed.Configuration;
-using Elastic.Xunit.Sdk;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Xunit.Sdk;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Elasticsearch.Net.VirtualizedCluster;
 using Elasticsearch.Net.VirtualizedCluster.Audit;
diff --git a/tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs b/tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.Extensions;
diff --git a/tests/Tests/Framework/EndpointTests/ApiIntegrationTestBase.cs b/tests/Tests/Framework/EndpointTests/ApiIntegrationTestBase.cs
@@ -1,9 +1,13 @@
-﻿using System;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+ using System;
 using System.Diagnostics;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -48,11 +52,8 @@ [I] public virtual async Task ReturnsExpectedIsValid() =>
 
 		[I] public virtual async Task ReturnsExpectedResponse() => await AssertOnAllResponses(ExpectResponse);
 
-		protected override Task AssertOnAllResponses(Action<TResponse> assert)
-		{
-			if (!ExpectIsValid) return base.AssertOnAllResponses(assert);
-
-			return base.AssertOnAllResponses((r) =>
+		protected override Task AssertOnAllResponses(Action<TResponse> assert) =>
+			base.AssertOnAllResponses((r) =>
 			{
 				if (TestClient.Configuration.RunIntegrationTests && !r.IsValid && r.ApiCall.OriginalException != null
 					&& !(r.ApiCall.OriginalException is ElasticsearchClientException))
@@ -71,7 +72,6 @@ protected override Task AssertOnAllResponses(Action<TResponse> assert)
 					throw new ResponseAssertionException(ex.SourceException, r).Demystify();
 				}
 			});
-		}
 	}
 
 	public class ResponseAssertionException : Exception
diff --git a/tests/Tests/Framework/EndpointTests/ApiTestBase.cs b/tests/Tests/Framework/EndpointTests/ApiTestBase.cs
@@ -1,7 +1,11 @@
-﻿using System;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+ using System;
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+ using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
diff --git a/tests/Tests/Framework/EndpointTests/CanConnectTestBase.cs b/tests/Tests/Framework/EndpointTests/CanConnectTestBase.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
diff --git a/tests/Tests/Framework/EndpointTests/ConnectionErrorTestBase.cs b/tests/Tests/Framework/EndpointTests/ConnectionErrorTestBase.cs
@@ -2,8 +2,8 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
diff --git a/tests/Tests/Framework/EndpointTests/CoordinatedIntegrationTestBase.cs b/tests/Tests/Framework/EndpointTests/CoordinatedIntegrationTestBase.cs
@@ -2,8 +2,8 @@
 using System.Diagnostics;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.Client;
diff --git a/tests/Tests/Framework/EndpointTests/CrudTestBase.cs b/tests/Tests/Framework/EndpointTests/CrudTestBase.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Client;
diff --git a/tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs b/tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs
@@ -1,9 +1,13 @@
-﻿using System;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Configuration;
 using Tests.Core.Client;
diff --git a/tests/Tests/XPack/MachineLearning/MachineLearningCluster.cs b/tests/Tests/XPack/MachineLearning/MachineLearningCluster.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.IO;
 using System.Linq;
-using Elastic.Managed.ConsoleWriters;
-using Elastic.Managed.Ephemeral;
-using Elastic.Managed.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Ephemeral.Tasks;
+using Elastic.Elasticsearch.Managed.ConsoleWriters;
 using ICSharpCode.SharpZipLib.GZip;
 using ICSharpCode.SharpZipLib.Tar;
 using Tests.Core.ManagedElasticsearch.Clusters;
diff --git a/tests/Tests/XPack/MachineLearning/MachineLearningSeeder.cs b/tests/Tests/XPack/MachineLearning/MachineLearningSeeder.cs
@@ -1,9 +1,13 @@
-﻿using System;
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Elastic.Managed.FileSystem;
+using Elastic.Elasticsearch.Managed.FileSystem;
 using Elasticsearch.Net;
 using Nest;
 using Tests.Core.Client;
diff --git a/tests/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs b/tests/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs
@@ -1,13 +1,13 @@
 ﻿using System;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
-using static Elastic.Managed.Ephemeral.ClusterAuthentication;
+using static Elastic.Elasticsearch.Ephemeral.ClusterAuthentication;
 
 namespace Tests.XPack.Security.Authenticate
 {
diff --git a/tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs b/tests/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Linq;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
diff --git a/tests/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs b/tests/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
diff --git a/tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenApiTests.cs b/tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenApiTests.cs
@@ -6,7 +6,7 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
-using static Elastic.Managed.Ephemeral.ClusterAuthentication;
+using static Elastic.Elasticsearch.Ephemeral.ClusterAuthentication;
 
 namespace Tests.XPack.Security.User.GetUserAccessToken
 {
diff --git a/tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenUrlTests.cs b/tests/Tests/XPack/Security/User/GetUserAccessToken/GetUserAccessTokenUrlTests.cs
@@ -1,6 +1,6 @@
 ﻿using System.Threading.Tasks;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Nest;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenApiTests.cs b/tests/Tests/XPack/Security/User/InvalidateUserAccessToken/InvalidateUserAccessTokenApiTests.cs
@@ -7,7 +7,7 @@
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
-using static Elastic.Managed.Ephemeral.ClusterAuthentication;
+using static Elastic.Elasticsearch.Ephemeral.ClusterAuthentication;
 
 namespace Tests.XPack.Security.User.InvalidateUserAccessToken
 {
diff --git a/tests/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs b/tests/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
-using Elastic.Managed.Ephemeral;
-using Elastic.Xunit.XunitPlumbing;
+ using Elastic.Elasticsearch.Ephemeral;
+ using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
