Appending small changes to #2021

- moved tests into their own namespace so they can be easily ran as a
  single unit
- Rebased against 2.x and removed newly introduces InvokeQuery()'s
- Renamed fluent Assign of the QueryCotainerDescriptor to
  WrapInContainer, since thats what it is doing and to mimic the OIS
  equivalent.

Author: Mpdreamz

src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Dsl.cs

@@ -16,7 +16,7 @@ public partial class QueryContainer : IQueryContainer, IDescriptor
 		bool IQueryContainer.IsStrict { get; set; }
 		internal bool IsStrict => Self.IsStrict;
 
-		bool IQueryContainer.IsWritable { get { return Self.IsVerbatim || !Self.IsConditionless; } }
+		bool IQueryContainer.IsWritable => Self.IsVerbatim || !Self.IsConditionless;
 		internal bool IsWritable => Self.IsWritable;
 
 		bool IQueryContainer.IsVerbatim { get; set; }

src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs

@@ -42,7 +42,7 @@ public partial class GraphExploreDescriptor<T> : IGraphExploreRequest<T>
 		public GraphExploreDescriptor() : this(typeof(T)){}
 
 		public GraphExploreDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) =>
-			Assign(a => a.Query = querySelector?.InvokeQuery(new QueryContainerDescriptor<T>()));
+			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 
 		public GraphExploreDescriptor<T> Vertices(Func<GraphVerticesDescriptor<T>, IPromise<IList<IGraphVertexDefinition>>> selector) =>
 			Assign(a => a.Vertices = selector?.Invoke(new GraphVerticesDescriptor<T>())?.Value);

src/Nest/XPack/Graph/Explore/GraphExploreRequest.cs

@@ -32,7 +32,7 @@ public class HopDescriptor<T> : DescriptorBase<HopDescriptor<T>, IHop>, IHop
 		IHop IHop.Connections { get; set; }
 
 		public HopDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> querySelector) =>
-			Assign(a => a.Query = querySelector?.InvokeQuery(new QueryContainerDescriptor<T>()));
+			Assign(a => a.Query = querySelector?.Invoke(new QueryContainerDescriptor<T>()));
 
 		public HopDescriptor<T> Vertices(Func<GraphVerticesDescriptor<T>, IPromise<IList<IGraphVertexDefinition>>> selector) =>
 			Assign(a => a.Vertices = selector?.Invoke(new GraphVerticesDescriptor<T>())?.Value);

src/Nest/XPack/Graph/Explore/Request/Hop.cs

@@ -61,7 +61,7 @@ public IndicesPrivilegesDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<
 		public IndicesPrivilegesDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
 
 		public IndicesPrivilegesDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> query) =>
-			Assign(a => a.Query = query?.InvokeQuery(new QueryContainerDescriptor<T>()));
+			Assign(a => a.Query = query?.Invoke(new QueryContainerDescriptor<T>()));
 
 	}
 }

src/Nest/XPack/Shield/Role/PutRole/IndicesPrivileges.cs

@@ -10,9 +10,75 @@
 using Tests.Framework.MockData;
 using Xunit;
 
-namespace Tests.QueryDsl
+namespace Tests.QueryDsl.Verbatim
 {
-	/** Setting `IsStrict` on the outer query container is a noop */
+	/** `IsVerbatim` should be set on individual queries to take effect */
+	public class CompoundVerbatimQueryUsageTests : QueryDslUsageTestsBase
+	{
+		protected override bool SupportsDeserialization => false;
+
+		public CompoundVerbatimQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override object QueryJson => new
+		{
+			@bool = new
+			{
+				must = new object[]
+				{
+					new
+					{
+						term = new
+						{
+							description = new
+							{
+								value = ""
+							}
+						}
+					},
+					new
+					{
+						term = new
+						{
+							name = new
+							{
+								value = "foo"
+							}
+						}
+					}
+				}
+			}
+		};
+
+		protected override QueryContainer QueryInitializer =>
+			new TermQuery
+			{
+				IsVerbatim = true,
+				Field = "description",
+				Value = ""
+			}
+			&& new TermQuery
+			{
+				Field = "name",
+				Value = "foo"
+			};
+
+		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
+			.Bool(b => b
+				.Must(qt => qt
+					.Term(t => t
+						.Verbatim()
+						.Field(p => p.Description)
+						.Value("")
+					), qt => qt
+					.Term(t => t
+						.Field(p => p.Name)
+						.Value("foo")
+					)
+				)
+			);
+	}
+
+	/** Setting `IsStrict` on the outer query container does not cascade */
 	public class QueryContainerStrictQueryUsageTests : QueryDslUsageTestsBase
 	{
 		protected override bool SupportsDeserialization => false;
@@ -83,7 +149,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 #pragma warning restore 618
 	}
 
-	/** Setting `IsVerbatim` on the outer query container is a noop */
+	/** Setting `IsVerbatim` on the outer query container does not cascase */
 	public class QueryContainerVerbatimQueryUsageTests : QueryDslUsageTestsBase
 	{
 		protected override bool SupportsDeserialization => false;
@@ -154,69 +220,28 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 #pragma warning restore 618
 	}
 
-	/** `IsVerbatim` should be set on individual queries to take effect */
-	public class CompoundVerbatimQueryUsageTests : QueryDslUsageTestsBase
+	/** Setting `IsVerbatim` on a compound query is still supported though */
+	public class QueryContainerVerbatimSupportedUsageTests : QueryDslUsageTestsBase
 	{
 		protected override bool SupportsDeserialization => false;
 
-		public CompoundVerbatimQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public QueryContainerVerbatimSupportedUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override object QueryJson => new
 		{
 			@bool = new
 			{
-				must = new object[]
-				{
-					new
-					{
-						term = new
-						{
-							description = new
-							{
-								value = ""
-							}
-						}
-					},
-					new
-					{
-						term = new
-						{
-							name = new
-							{
-								value = "foo"
-							}
-						}
-					}
-				}
 			}
 		};
 
-		protected override QueryContainer QueryInitializer =>
-			new TermQuery
-			{
-				IsVerbatim = true,
-				Field = "description",
-				Value = ""
-			}
-			&& new TermQuery
-			{
-				Field = "name",
-				Value = "foo"
-			};
+		protected override QueryContainer QueryInitializer => new BoolQuery
+		{
+			IsVerbatim = true,
+		};
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.Bool(b => b
-				.Must(qt => qt
-					.Term(t => t
-						.Verbatim()
-						.Field(p => p.Description)
-						.Value("")
-					), qt => qt
-					.Term(t => t
-						.Field(p => p.Name)
-						.Value("foo")
-					)
-				)
+				.Verbatim()
 			);
 	}