FieldsUsageTests is flakey because it does not filter for only Project objects

Author: Mpdreamz

src/Tests/Tests.Domain/CommitActivity.cs

@@ -11,6 +11,9 @@ namespace Tests.Domain
 {
 	public class CommitActivity
 	{
+		public static string TypeName = "commit";
+		public string Type => TypeName;
+
 		private string _projectName;
 		public JoinField Join { get; set; }
 		public string Id { get; set; }

src/Tests/Tests.Domain/Project.cs

@@ -13,6 +13,8 @@ namespace Tests.Domain
 {
 	public class Project
 	{
+		public static string TypeName = "project";
+		public string Type => TypeName;
 		public JoinField Join => JoinField.Root<Project>();
 		public string Name { get; set; }
 		public string Description { get; set; }
@@ -116,6 +118,7 @@ public class Project
 			location = new { lat = Instance.Location.Lat, lon = Instance.Location.Lon },
 			sourceOnly = new { notWrittenByDefaultSerializer = "written" }
 		};
+
 	}
 
 	//the first applies when using internal source serializer the latter when using JsonNetSourceSerializer

src/Tests/Tests/Search/Request/FieldsUsageTests.cs

@@ -27,10 +27,12 @@ public FieldsUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clu
 
 		protected override object ExpectJson => new
 		{
+			query = ProjectFilterExpectedJson,
 			stored_fields = new[] { "name", "startedOn", "numberOfCommits", "numberOfContributors", "dateString" }
 		};
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.Query(q => ProjectFilter)
 			.StoredFields(fs => fs
 				.Field(p => p.Name)
 				.Field(p => p.StartedOn)
@@ -42,6 +44,7 @@ public FieldsUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clu
 		protected override SearchRequest<Project> Initializer =>
 			new SearchRequest<Project>
 			{
+				Query = ProjectFilter,
 				StoredFields = Fields<Project>(
 					p => p.Name,
 					p => p.StartedOn,
@@ -56,6 +59,7 @@ [I] protected Task FieldsAreReturned() => this.AssertOnAllResponses(r =>
 			r.Fields.Count().Should().BeGreaterThan(0);
 			foreach (var fieldValues in r.Fields)
 			{
+				fieldValues.Should().NotBeNull("FieldValues on hits is null");
 				fieldValues.Count().Should().Be(5);
 				var name = fieldValues.Value<string>(Field<Project>(p => p.Name));
 				name.Should().NotBeNullOrWhiteSpace();

src/Tests/Tests/Search/Request/SuggestUsageTests.cs

@@ -26,6 +26,7 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 		protected override object ExpectJson =>
 			new
 			{
+				query = ProjectFilterExpectedJson,
 				suggest = new Dictionary<string, object>{
 					{  "my-completion-suggest", new {
 					  completion = new {
@@ -91,6 +92,7 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 			};
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.Query(q => ProjectFilter)
 			.Suggest(ss => ss
 				.Term("my-term-suggest", t => t
 					.MaxEdits(1)
@@ -148,6 +150,7 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 		protected override SearchRequest<Project> Initializer =>
 			new SearchRequest<Project>
 			{
+				Query = ProjectFilter,
 				Suggest = new SuggestContainer
 				{
 					{ "my-term-suggest", new SuggestBucket

src/Tests/Tests/Search/SearchUsageTestBase.cs

@@ -24,5 +24,13 @@ protected override LazyResponses ClientUsage() => Calls(
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override string UrlPath => "/project/doc/_search";
 
+		protected TermQuery ProjectFilter = new TermQuery
+		{
+			Field = Infer.Field<Project>(p => p.Name),
+			Value = Project.TypeName
+		};
+
+		protected object ProjectFilterExpectedJson = new {term = new {field = "name", value = Project.TypeName}};
+
 	}
 }