Fix namespaces of the shield related API tests

Mpdreamz · Mpdreamz · commit 8fde029007dd · 2016-04-25T11:08:05.000+02:00
diff --git a/src/Tests/Framework/Integration/Process/ElasticsearchNode.cs b/src/Tests/Framework/Integration/Process/ElasticsearchNode.cs
@@ -14,6 +14,7 @@
 using Nest;
 using Tests.Framework;
 using System.Xml.Linq;
+using Tests.XPack.Security;
 
 namespace Tests.Framework.Integration
 {
diff --git a/src/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs b/src/Tests/XPack/Security/Authenticate/AuthenticateApiTests.cs
@@ -6,7 +6,7 @@
 using Tests.Framework.Integration;
 using Xunit;
 
-namespace Tests.XPack.Shield.Authenticate
+namespace Tests.XPack.Security.Authenticate
 {
 	[Collection(IntegrationContext.Shield)]
 	public class AuthenticateApiTests : ApiIntegrationTestBase<IAuthenticateResponse, IAuthenticateRequest, AuthenticateDescriptor, AuthenticateRequest>
diff --git a/src/Tests/XPack/Security/Authenticate/AuthenticateUrlTests.cs b/src/Tests/XPack/Security/Authenticate/AuthenticateUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.Authenticate
+namespace Tests.XPack.Security.Authenticate
 {
 	public class AuthenticateUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs b/src/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs
@@ -1,16 +1,13 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.MockData;
 using Xunit;
-using static Nest.Infer;
 
-namespace Tests.XPack.Shield.Role.ClearCachedRealms
+namespace Tests.XPack.Security.ClearCachedRealms
 {
 	[Collection(IntegrationContext.Shield)]
 	public class ClearCachedRealmsApiTests : ApiIntegrationTestBase<IClearCachedRealmsResponse, IClearCachedRealmsRequest, ClearCachedRealmsDescriptor, ClearCachedRealmsRequest>
diff --git a/src/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsUrlTests.cs b/src/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.ClearCachedRealms
+namespace Tests.XPack.Security.ClearCachedRealms
 {
 	public class ClearCachedRealmsUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesApiTests.cs b/src/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesApiTests.cs
@@ -1,16 +1,13 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Framework;
 using Tests.Framework.Integration;
-using Tests.Framework.MockData;
 using Xunit;
-using static Nest.Infer;
 
-namespace Tests.XPack.Shield.Role.ClearCachedRoles
+namespace Tests.XPack.Security.Role.ClearCachedRoles
 {
 	[Collection(IntegrationContext.Shield)]
 	public class ClearCachedRolesApiTests : ApiIntegrationTestBase<IClearCachedRolesResponse, IClearCachedRolesRequest, ClearCachedRolesDescriptor, ClearCachedRolesRequest>
diff --git a/src/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesUrlTests.cs b/src/Tests/XPack/Security/Role/ClearCachedRoles/ClearCachedRolesUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.Role.ClearCachedRoles
+namespace Tests.XPack.Security.Role.ClearCachedRoles
 {
 	public class ClearCachedRolesUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/Role/DeleteRole/DeleteRoleUrlTests.cs b/src/Tests/XPack/Security/Role/DeleteRole/DeleteRoleUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.Role.DeleteRole
+namespace Tests.XPack.Security.Role.DeleteRole
 {
 	public class DeleteRoleUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/Role/GetRole/GetRoleUrlTests.cs b/src/Tests/XPack/Security/Role/GetRole/GetRoleUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.Role.GetRole
+namespace Tests.XPack.Security.Role.GetRole
 {
 	public class GetRoleUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs b/src/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
@@ -10,7 +9,7 @@
 using Xunit;
 using static Nest.Infer;
 
-namespace Tests.XPack.Shield.Role.PutRole
+namespace Tests.XPack.Security.Role.PutRole
 {
 	[Collection(IntegrationContext.Shield)]
 	public class PutRoleApiTests : ApiIntegrationTestBase<IPutRoleResponse, IPutRoleRequest, PutRoleDescriptor, PutRoleRequest>
diff --git a/src/Tests/XPack/Security/Role/PutRole/PutRoleUrlTests.cs b/src/Tests/XPack/Security/Role/PutRole/PutRoleUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.Role.PutRole
+namespace Tests.XPack.Security.Role.PutRole
 {
 	public class PutRoleUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/Role/RoleCrudTests.cs b/src/Tests/XPack/Security/Role/RoleCrudTests.cs
@@ -6,9 +6,8 @@
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 using Xunit;
-using static Nest.Infer;
 
-namespace Tests.XPack.Shield.Role
+namespace Tests.XPack.Security.Role
 {
 	[Collection(IntegrationContext.Shield)]
 	public class RoleCrudTests
@@ -37,8 +36,8 @@ protected override LazyResponses Create() => Calls<PutRoleDescriptor, PutRoleReq
 			{
 				new IndicesPrivileges
 				{
-					Fields = Fields<Project>(p=>p.Name).And<Project>(p=>p.Description),
-					Names = Indices<Project>(),
+					Fields = Infer.Fields<Project>(p=>p.Name).And<Project>(p=>p.Description),
+					Names = Infer.Indices<Project>(),
 					Privileges = new [] { "all" },
 					Query = new MatchAllQuery()
 				}
@@ -52,7 +51,7 @@ protected IPutRoleRequest CreateFluent(string role, PutRoleDescriptor d) => d
 						.Field(p => p.Name)
 						.Field(p => p.Description)
 					)
-					.Names(Indices<Project>())
+					.Names(Infer.Indices<Project>())
 					.Privileges("all")
 					.Query(q => q.MatchAll())
 				)
@@ -87,8 +86,8 @@ protected override LazyResponses Update() => Calls<PutRoleDescriptor, PutRoleReq
 			{
 				new IndicesPrivileges
 				{
-					Fields = Fields<Project>(p=>p.Name).And<Project>(p=>p.Description),
-					Names = Indices<Project>(),
+					Fields = Infer.Fields<Project>(p=>p.Name).And<Project>(p=>p.Description),
+					Names = Infer.Indices<Project>(),
 					Privileges = new [] { "all" },
 					Query = new MatchAllQuery()
 				}
@@ -103,7 +102,7 @@ protected IPutRoleRequest UpdateFluent(string role, PutRoleDescriptor d) => d
 						.Field(p => p.Name)
 						.Field(p => p.Description)
 					)
-					.Names(Indices<Project>())
+					.Names(Infer.Indices<Project>())
 					.Privileges("all")
 					.Query(q => q.MatchAll())
 				)
diff --git a/src/Tests/XPack/Security/ShieldCluster.cs b/src/Tests/XPack/Security/ShieldCluster.cs
@@ -1,23 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Tests.Framework.Integration;
+﻿using Tests.Framework.Integration;
 using Xunit;
 
-namespace Tests.XPack.Shield
+namespace Tests.XPack.Security
 {
 
 	[CollectionDefinition(IntegrationContext.Shield)]
 	public class ShieldCluster : ClusterBase, ICollectionFixture<ShieldCluster>, IClassFixture<EndpointUsage>
 	{
 		protected override bool EnableShield => true;
-
-		public override void Boostrap()
-		{
-		}
 	}
 }
diff --git a/src/Tests/XPack/Security/ShieldInformation.cs b/src/Tests/XPack/Security/ShieldInformation.cs
@@ -1,4 +1,4 @@
-namespace Tests.Framework.Integration
+namespace Tests.XPack.Security
 {
 	public class ShieldInformation
 	{
diff --git a/src/Tests/XPack/Security/User/DeleteUser/DeleteUserUrlTests.cs b/src/Tests/XPack/Security/User/DeleteUser/DeleteUserUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.User.DeleteUser
+namespace Tests.XPack.Security.User.DeleteUser
 {
 	public class DeleteUserUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/User/GetUser/GetUserUrlTests.cs b/src/Tests/XPack/Security/User/GetUser/GetUserUrlTests.cs
@@ -3,7 +3,7 @@
 using Tests.Framework;
 using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.User.GetUser
+namespace Tests.XPack.Security.User.GetUser
 {
 	public class GetUserUrlTests : IUrlTests
 	{
diff --git a/src/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs b/src/Tests/XPack/Security/User/PutUser/PutUserApiTests.cs
@@ -1,14 +1,13 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elasticsearch.Net;
 using FluentAssertions;
 using Nest;
 using Tests.Framework;
 using Tests.Framework.Integration;
 using Xunit;
 
-namespace Tests.XPack.Shield.User.PutUser
+namespace Tests.XPack.Security.User.PutUser
 {
 	[Collection(IntegrationContext.Shield)]
 	public class PutUserApiTests : ApiIntegrationTestBase<IPutUserResponse, IPutUserRequest, PutUserDescriptor, PutUserRequest>
diff --git a/src/Tests/XPack/Security/User/PutUser/PutUserUrlTests.cs b/src/Tests/XPack/Security/User/PutUser/PutUserUrlTests.cs
@@ -1,15 +1,14 @@
 ﻿using System.Threading.Tasks;
 using Nest;
 using Tests.Framework;
-using static Tests.Framework.UrlTester;
 
-namespace Tests.XPack.Shield.User.PutUser
+namespace Tests.XPack.Security.User.PutUser
 {
 	public class PutUserUrlTests : IUrlTests
 	{
 		[U] public async Task Urls()
 		{
-			await PUT("/_shield/user/mpdreamz")
+			await UrlTester.PUT("/_shield/user/mpdreamz")
 				.Fluent(c => c.PutUser("mpdreamz"))
 				.Request(c => c.PutUser(new PutUserRequest("mpdreamz")))
 				.FluentAsync(c => c.PutUserAsync("mpdreamz"))
diff --git a/src/Tests/XPack/Security/User/UserCrudTests.cs b/src/Tests/XPack/Security/User/UserCrudTests.cs
@@ -5,7 +5,7 @@
 using Tests.Framework.Integration;
 using Xunit;
 
-namespace Tests.XPack.Shield.User
+namespace Tests.XPack.Security.User
 {
 	[Collection(IntegrationContext.Shield)]
 	public class UserCrudTests

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using Nest;`
`15`	`15`	`using Tests.Framework;`
`16`	`16`	`using System.Xml.Linq;`
	`17`	`+using Tests.XPack.Security;`
`17`	`18`
`18`	`19`	`namespace Tests.Framework.Integration`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Tests.Framework.Integration;`
`7`	`7`	`using Xunit;`
`8`	`8`
`9`		`-namespace Tests.XPack.Shield.Authenticate`
	`9`	`+namespace Tests.XPack.Security.Authenticate`
`10`	`10`	`{`
`11`	`11`	`[Collection(IntegrationContext.Shield)]`
`12`	`12`	`public class AuthenticateApiTests : ApiIntegrationTestBase<IAuthenticateResponse, IAuthenticateRequest, AuthenticateDescriptor, AuthenticateRequest>`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Tests.Framework;`
`4`	`4`	`using static Tests.Framework.UrlTester;`
`5`	`5`
`6`		`-namespace Tests.XPack.Shield.Authenticate`
	`6`	`+namespace Tests.XPack.Security.Authenticate`
`7`	`7`	`{`
`8`	`8`	`public class AuthenticateUrlTests : IUrlTests`
`9`	`9`	`{`