Fix ReindexTests by removing unnecessary search parameter cleanup (#5543)

* Refactor ReindexTests by removing unnecessary search parameter cleanup logic to improve test performance

Author: jestradaMS

test/Microsoft.Health.Fhir.Shared.Tests.E2E/Rest/Reindex/ReindexTests.cs

@@ -39,9 +39,6 @@ public class ReindexTests : IClassFixture<HttpIntegrationTestFixture>
         // multi-replica search-parameter cache convergence in CI (poll interval up to 30s, conformance refresh
         // up to 60s, plus reindex worker queue scheduling and retry backoffs).
         private static readonly TimeSpan ReindexJobCompletionTimeout = TimeSpan.FromMinutes(20);
-        private static readonly TimeSpan SearchParameterCleanupTimeout = TimeSpan.FromMinutes(2);
-        private static readonly TimeSpan SearchParameterCleanupPollDelay = TimeSpan.FromSeconds(5);
-        private static readonly TimeSpan SearchParameterCleanupStableWindow = TimeSpan.FromSeconds(30);
         private const string TestSearchParameterUrlPrefix = "http://my.org/";
 
         private readonly HttpIntegrationTestFixture _fixture;
@@ -1229,12 +1226,6 @@ private async Task CleanupSearchParametersAsync(params SearchParameter[] searchP
                     _output.WriteLine($"Failed to delete SearchParameter/{param?.Id}: {ex.Message}");
                 }
             }
-
-            await WaitForSearchParameterCleanupAsync(searchParameters);
-
-            // Note: Final reindex is handled by ReindexTestFixture.OnDisposedAsync() which runs
-            // once at the very end after all tests complete. This eliminates the need to reindex
-            // after each individual test cleanup.
         }
 
         private static string CreateUniqueSearchParameterSuffix()
@@ -1247,82 +1238,6 @@ private static string BuildTestSearchParameterUrl(string suffix)
             return $"{TestSearchParameterUrlPrefix}{suffix}";
         }
 
-        private async Task WaitForSearchParameterCleanupAsync(params SearchParameter[] searchParameters)
-        {
-            SearchParameter[] cleanupTargets = searchParameters
-                .Where(param => param != null && !string.IsNullOrWhiteSpace(param.Id) && !string.IsNullOrWhiteSpace(param.Url))
-                .ToArray();
-
-            if (cleanupTargets.Length == 0)
-            {
-                return;
-            }
-
-            var stopwatch = Stopwatch.StartNew();
-            TimeSpan? stableSince = null;
-            string[] lastOutstanding = Array.Empty<string>();
-
-            while (stopwatch.Elapsed < SearchParameterCleanupTimeout)
-            {
-                var outstanding = new List<string>();
-
-                foreach (var searchParameter in cleanupTargets)
-                {
-                    bool resourceDeleted = await IsSearchParameterDeletedAsync(searchParameter.Id);
-                    bool metadataCleared = await IsSearchParameterMissingFromMetadataAsync(searchParameter.Url);
-
-                    if (!resourceDeleted || !metadataCleared)
-                    {
-                        outstanding.Add($"{searchParameter.Id} (deleted={resourceDeleted}, metadataCleared={metadataCleared})");
-                    }
-                }
-
-                if (outstanding.Count == 0)
-                {
-                    stableSince ??= stopwatch.Elapsed;
-                    if (stopwatch.Elapsed - stableSince.Value >= SearchParameterCleanupStableWindow)
-                    {
-                        return;
-                    }
-                }
-                else
-                {
-                    stableSince = null;
-                    lastOutstanding = outstanding.ToArray();
-                    _output.WriteLine($"Waiting for SearchParameter cleanup to converge: {string.Join(", ", lastOutstanding)}");
-                }
-
-                await Task.Delay(SearchParameterCleanupPollDelay);
-            }
-
-            Assert.Fail($"Timed out waiting for SearchParameter cleanup to converge. Remaining: {string.Join(", ", lastOutstanding)}");
-        }
-
-        private async Task<bool> IsSearchParameterDeletedAsync(string id)
-        {
-            try
-            {
-                await _fixture.TestFhirClient.ReadAsync<SearchParameter>($"SearchParameter/{id}");
-                return false;
-            }
-            catch (FhirClientException ex) when (ex.StatusCode == HttpStatusCode.NotFound || ex.StatusCode == HttpStatusCode.Gone)
-            {
-                return true;
-            }
-        }
-
-        private async Task<bool> IsSearchParameterMissingFromMetadataAsync(string url)
-        {
-            using FhirResponse<CapabilityStatement> response = await _fixture.TestFhirClient.ReadAsync<CapabilityStatement>("metadata");
-
-            return response.Resource.Rest
-                .Where(rest => rest?.Resource != null)
-                .SelectMany(rest => rest.Resource)
-                .Where(resource => resource?.SearchParam != null)
-                .SelectMany(resource => resource.SearchParam)
-                .All(searchParam => !string.Equals(searchParam?.Definition, url, StringComparison.Ordinal));
-        }
-
         private async Task<OperationStatus> WaitForJobCompletionAsync(Uri jobUri, TimeSpan timeout)
         {
             var stopwatch = Stopwatch.StartNew();