Conditionless works for && || ! overloads, still need to look at other calls taking QueryDescriptors, do the same for FilterDescriptor

Author: Mpdreamz

src/Nest.Tests.Unit/BaseJsonTests.cs

@@ -28,6 +28,11 @@ public BaseJsonTests()
 		}
 
 		protected void JsonEquals(object o, MethodBase method, string fileName = null)
+		{
+			var json = TestElasticClient.Serialize(o);
+			this.JsonEquals(json, method, fileName);
+		}
+		protected void JsonEquals(string json, MethodBase method, string fileName = null)
 		{
 			var type = method.DeclaringType;
 			var @namespace = method.DeclaringType.Namespace;
@@ -36,18 +41,27 @@ protected void JsonEquals(object o, MethodBase method, string fileName = null)
 			var file = Path.Combine(folder, (fileName ?? method.Name) + ".json");
 			file = Path.Combine(Environment.CurrentDirectory.Replace("bin\\Debug", "").Replace("bin\\Release", ""), file);
 
-			var json = TestElasticClient.Serialize(o);
+
 			var expected = File.ReadAllText(file);
 			Assert.True(json.JsonEquals(expected), json);
 		}
-		protected void JsonEquals(string json, MethodBase method)
+		protected void JsonNotEquals(object o, MethodBase method, string fileName = null)
+		{
+			var json = TestElasticClient.Serialize(o);
+			this.JsonNotEquals(json, method, fileName);
+		}
+		protected void JsonNotEquals(string json, MethodBase method, string fileName = null)
 		{
 			var type = method.DeclaringType;
 			var @namespace = method.DeclaringType.Namespace;
 			var folder = @namespace.Replace("Nest.Tests.Unit.", "").Replace(".", "\\");
-			var file = Path.Combine(folder, method.Name + ".json");
+
+			var file = Path.Combine(folder, (fileName ?? method.Name) + ".json");
+			file = Path.Combine(Environment.CurrentDirectory.Replace("bin\\Debug", "").Replace("bin\\Release", ""), file);
+
+
 			var expected = File.ReadAllText(file);
-			Assert.True(json.JsonEquals(expected), json);
+			Assert.False(json.JsonEquals(expected), json);
 		}
 	}
 }

src/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -115,6 +115,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyVisitorTests.cs" />
     <Compile Include="QueryJson\ConditionLess\ConditionLessTests.cs" />
+    <Compile Include="QueryJson\ConditionlessBool\ConditionLessBooleanTests.cs" />
+    <Compile Include="QueryJson\ConditionLess\SemiConditionLessTests.cs" />
     <Compile Include="QueryJson\QueriesInQueries\QueriesInQueriesTests.cs" />
     <Compile Include="QueryTests\BoolQueryJson.cs" />
     <Compile Include="QueryTests\BoostingQueryJson.cs" />
@@ -352,6 +354,15 @@
     <None Include="QueryJson\Bool\StaticBoolTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="QueryJson\ConditionlessBool\Combination1.json" />
+    <None Include="QueryJson\ConditionlessBool\Combination2.json" />
+    <None Include="QueryJson\ConditionlessBool\Combination3.json" />
+    <None Include="QueryJson\ConditionlessBool\MyTermsNot.json" />
+    <None Include="QueryJson\ConditionlessBool\MyTermsOr.json" />
+    <None Include="QueryJson\ConditionlessBool\MyTermsAnd.json" />
+    <None Include="QueryJson\ConditionlessBool\MyTermNot.json" />
+    <None Include="QueryJson\ConditionlessBool\MyTerm.json" />
+    <None Include="QueryJson\ConditionlessBool\MatchAll.json" />
     <None Include="QueryJson\ConditionLess\MatchAll.json" />
     <None Include="QueryJson\InsideBoolCalls\InsideMust.json" />
     <None Include="QueryJson\InsideBoolCalls\InsideMustNot.json" />