added reprocude tests for #346 to demonstrate that spawning subqueries of a parent lambda leads to wrong queries fix #346

Author: Mpdreamz

src/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -110,6 +110,7 @@
     <Compile Include="Integration\HighlightTests.cs" />
     <Compile Include="Integration\Query\TermQueryDynamic.cs" />
     <Compile Include="Mapping\NotAnalyzedTest.cs" />
+    <Compile Include="Reproduce\Reproduce346Tests.cs" />
     <Compile Include="Reproduce\Reproduce325Tests.cs" />
     <Compile Include="Reproduce\Reproduce308Tests.cs" />
     <Compile Include="Reproduce\Reproduce319Tests.cs" />

src/Nest.Tests.Integration/Reproduce/Reproduce346Tests.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Nest.Tests.MockData;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System.Diagnostics;
+using FluentAssertions;
+
+namespace Nest.Tests.Integration.Reproduce
+{
+	/// <summary>
+	/// tests to reproduce reported errors
+	/// </summary>
+	[TestFixture]
+	public class Reproduce346Tests : IntegrationTests
+	{
+		public class MediaStreamEntry
+		{
+			public int Id { get; set; }
+			public Guid StreamId { get; set; }
+			public ApprovalSettings ApprovalSettings { get; set; }
+		}
+		public class ApprovalSettings
+		{
+			public bool Approved { get; set; }
+		}
+
+
+		/// <summary>
+		/// https://github.com/Mpdreamz/NEST/issues/346
+		/// </summary>
+		[Test]
+		public void NoSearchResults()
+		{
+			//test teardown will delete defaultindex_* indices
+			//process id makes it so we can run these tests concurrently using NCrunch
+			var index = ElasticsearchConfiguration.DefaultIndex + "_posts_" + Process.GetCurrentProcess().Id.ToString();
+
+			var client =  new ElasticClient(this._settings, new InMemoryConnection(this._settings));
+
+			var streamId = new Guid("8d00cf65-bf84-4035-9adb-695b1366304c");
+			var approved = true;
+
+			var response = client.Count<MediaStreamEntry>(
+				new[] { "StreamEntry" },
+				x => x.Bool(
+					b => b.Must
+						(
+							x.Term(f => f.StreamId, streamId.ToString())
+							, x.Term(f => f.ApprovalSettings.Approved, approved)
+						)
+					)
+				);
+
+			//Approval settings appears twice because we are spawing the nested queries of x
+			Assert.AreEqual(2, Regex.Matches(response.ConnectionStatus.Request, @"approvalSettings\.approved").Count);
+			
+			//either use the lambda overload
+			response = client.Count<MediaStreamEntry>(
+				new[] { "StreamEntry" },
+				x => x.Bool(
+					b => b.Must
+						(
+							m=> m.Term(f => f.StreamId, streamId.ToString())
+							, m => m.Term(f => f.ApprovalSettings.Approved, approved)
+						)
+					)
+				);
+
+			//now we only see the query once
+			Assert.AreEqual(1, Regex.Matches(response.ConnectionStatus.Request, @"approvalSettings\.approved").Count);
+
+
+			//or use the static Query<MediaStreamEntry>
+			response = client.Count<MediaStreamEntry>(
+				new[] { "StreamEntry" },
+				x => x.Bool(
+					b => b.Must
+						(
+							Query<MediaStreamEntry>.Term(f => f.StreamId, streamId.ToString())
+							, Query<MediaStreamEntry>.Term(f => f.ApprovalSettings.Approved, approved.ToString())
+						)
+					)
+				);
+
+			//now we still only see the query once
+			Assert.AreEqual(1, Regex.Matches(response.ConnectionStatus.Request, @"approvalSettings\.approved").Count);
+		}
+
+	}
+}