From c25255ac1dc9f6434708d01bb9c2c90c6b689889 Mon Sep 17 00:00:00 2001
From: Steve Gordon <sgordon@hotmail.co.uk>
Date: Thu, 25 Mar 2021 06:18:41 +0000
Subject: [PATCH] Less flaky test assertions (#5462)

(cherry picked from commit 26ccb7fb305bbc41688fa39f215760b751b7a0ad)
---
 tests/Tests/Search/Search/SearchApiTests.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/Tests/Search/Search/SearchApiTests.cs b/tests/Tests/Search/Search/SearchApiTests.cs
index 40cdee59a9e..cabe1f82a47 100644
--- a/tests/Tests/Search/Search/SearchApiTests.cs
+++ b/tests/Tests/Search/Search/SearchApiTests.cs
@@ -721,10 +721,22 @@ public SearchApiRuntimeFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage)
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			response.Hits.Count.Should().BeGreaterThan(0);
-			response.Hits.First().Should().NotBeNull();
-			response.Hits.First().Fields.ValueOf<ProjectRuntimeFields, string>(p => p.StartedOnDayOfWeek).Should().NotBeNullOrEmpty();
-			response.Hits.First().Fields.ValueOf<ProjectRuntimeFields, string>(p => p.ThirtyDaysFromStarted).Should().NotBeNullOrEmpty();
-			response.Hits.First().Fields[RuntimeFieldName].As<string[]>().FirstOrDefault().Should().NotBeNullOrEmpty();
+
+			foreach (var hit in response.Hits)
+			{
+				hit.Should().NotBeNull();
+
+				if (hit.Source.StartedOn != default)
+				{
+					hit.Fields.ValueOf<ProjectRuntimeFields, string>(p => p.StartedOnDayOfWeek).Should().NotBeNullOrEmpty();
+					hit.Fields.ValueOf<ProjectRuntimeFields, string>(p => p.ThirtyDaysFromStarted).Should().NotBeNullOrEmpty();
+				}
+
+				if (!string.IsNullOrEmpty(hit.Source.Type))
+				{
+					hit.Fields[RuntimeFieldName].As<string[]>().FirstOrDefault().Should().NotBeNullOrEmpty();
+				}
+			}
 		}
 	}
 }