add failing test for #1695, if only the rightContainer is locked we can not join onto it either

Author: Mpdreamz

src/Nest/QueryDsl/Abstractions/Query/BoolQueryExtensions.cs

@@ -31,7 +31,7 @@ internal static QueryContainer CombineAsMust(this QueryContainer leftContainer,
 
 		internal static QueryContainer CombineAsShould(this QueryContainer leftContainer, QueryContainer rightContainer)
 		{
-			if (!leftContainer.CanMergeShould() || !leftContainer.CanMergeShould())
+			if (!leftContainer.CanMergeShould() || !rightContainer.CanMergeShould())
 				return CreateShouldContainer(new List<QueryContainer> { leftContainer, rightContainer });
 
 			var lBoolQuery = leftContainer.Self().Bool;

src/Tests/QueryDsl/BoolDsl/BoolDsl.doc.cs

@@ -252,17 +252,35 @@ [U] public void MixAndMatchMinimumShouldMatch() =>
 
 		[U] public void DoNotCombineLockedBools() =>
 			Assert(
-				q => q.Bool(b=>b.Name("firstBool").Should(mq=>mq.Query())) 
-					|| q.Bool(b=>b.Name("secondBool").Should(mq=>mq.Query())),
-				new BoolQuery { Name = "firstBool", Should = new QueryContainer[] { Query } }
-				 || new BoolQuery { Name = "secondBool", Should = new QueryContainer[] { Query } },
-				c=>
-				{
-					c.Bool.Should.Should().HaveCount(2);
-					var nestedBool = c.Bool.Should.First() as IQueryContainer;
-					nestedBool.Bool.Should.Should().HaveCount(1);
-					nestedBool.Bool.Name.Should().Be("firstBool");
-				});
+				q => q.Bool(b=>b.Name("leftBool").Should(mq=>mq.Query())) 
+					|| q.Bool(b=>b.Name("rightBool").Should(mq=>mq.Query())),
+				new BoolQuery { Name = "leftBool", Should = new QueryContainer[] { Query } }
+				 || new BoolQuery { Name = "rightBool", Should = new QueryContainer[] { Query } },
+				c=>AssertDoesNotJoinOntoLockedBool(c, "leftBool"));
+
+		[U] public void DoNotCombineRightLockedBool() =>
+			Assert(
+				q => q.Bool(b=>b.Should(mq=>mq.Query())) 
+					|| q.Bool(b=>b.Name("rightBool").Should(mq=>mq.Query())),
+				new BoolQuery { Should = new QueryContainer[] { Query } }
+				 || new BoolQuery { Name = "rightBool", Should = new QueryContainer[] { Query } },
+				c=>AssertDoesNotJoinOntoLockedBool(c, "rightBool"));
+
+		[U] public void DoNotCombineLeftLockedBool() =>
+			Assert(
+				q => q.Bool(b=>b.Name("leftBool").Should(mq=>mq.Query())) 
+					|| q.Bool(b=>b.Should(mq=>mq.Query())),
+				new BoolQuery { Name = "leftBool", Should = new QueryContainer[] { Query } }
+				 || new BoolQuery { Should = new QueryContainer[] { Query } },
+				c=>AssertDoesNotJoinOntoLockedBool(c, "leftBool"));
+
+		private static void AssertDoesNotJoinOntoLockedBool(IQueryContainer c, string firstName)
+		{
+			c.Bool.Should.Should().HaveCount(2);
+			var nestedBool = c.Bool.Should.Cast<IQueryContainer>().First(b=>!string.IsNullOrEmpty(b.Bool?.Name));
+			nestedBool.Bool.Should.Should().HaveCount(1);
+			nestedBool.Bool.Name.Should().Be(firstName);
+		}
 
 
 		private void Assert(

src/Tests/QueryDsl/BoolDsl/Operators/OrOperatorUsageTests.cs

@@ -17,6 +17,14 @@ [U] public void Or()
 				b.Filter.Should().BeNull();
 			});
 
+			ReturnsBool(Query || Query || ConditionlessQuery, q => q.Query() || q.Query() || q.ConditionlessQuery(), b =>
+			{
+				b.Should.Should().NotBeEmpty().And.HaveCount(2);
+				b.Must.Should().BeNull();
+				b.MustNot.Should().BeNull();
+				b.Filter.Should().BeNull();
+			});
+			
 			ReturnsBool(Query || Query || ConditionlessQuery, q => q.Query() || q.Query() || q.ConditionlessQuery(), b =>
 			{
 				b.Should.Should().NotBeEmpty().And.HaveCount(2);
@@ -58,8 +66,8 @@ [U] public void Or()
 				NullQuery || ConditionlessQuery || ConditionlessQuery || ConditionlessQuery,
 				q=>q.NullQuery() || q.ConditionlessQuery() || q.ConditionlessQuery() || q.ConditionlessQuery()
 			);
-
 		}
+
 		[U] public void CombiningManyUsingAggregate()
 		{
 			var lotsOfOrs = Enumerable.Range(0, 100).Aggregate(new QueryContainer(), (q, c) => q || Query, q => q);