Fix more tests

Signed-off-by: Thomas Farr <[email protected]>
opensearch-project · Aug 12, 2024 · 1c3dafc · 1c3dafc
1 parent 567034b
commit 1c3dafc
Show file tree

Hide file tree

Showing 7 changed files with 373 additions and 362 deletions.
diff --git a/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs b/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs
@@ -219,10 +219,7 @@ private Task<CreateIndexResponse> CreateDeveloperIndexAsync() => Client.Indices.
 
 #pragma warning disable 618
 		private Task<CreateIndexResponse> CreateProjectIndexAsync() => Client.Indices.CreateAsync(typeof(Project), c => c
-			.Settings(settings => settings
-				.Analysis(ProjectAnalysisSettings)
-				.Setting("index.knn", true)
-				.Setting("index.knn.algo_param.ef_search", 100))
+			.Settings(ProjectIndexSettings)
 			.Mappings(ProjectMappings)
 			.Aliases(aliases => aliases
 				.Alias(ProjectsAliasName)
@@ -263,6 +260,12 @@ public static ITypeMapping ProjectTypeMappings(TypeMappingDescriptor<Project> ma
 			return mapping;
 		}
 
+        public static IndexSettingsDescriptor ProjectIndexSettings(IndexSettingsDescriptor settings) =>
+            settings
+                .Analysis(ProjectAnalysisSettings)
+                .Setting("index.knn", true)
+                .Setting("index.knn.algo_param.ef_search", 100);
+
 		public static IAnalysis ProjectAnalysisSettings(AnalysisDescriptor analysis)
 		{
 			analysis
@@ -286,14 +289,11 @@ public static IAnalysis ProjectAnalysisSettings(AnalysisDescriptor analysis)
 			return analysis;
 		}
 
+        public static IndexSettingsDescriptor PercolatorIndexSettings(IndexSettingsDescriptor settings) =>
+            ProjectIndexSettings(settings).AutoExpandReplicas("0-all");
 
 		private Task<CreateIndexResponse> CreatePercolatorIndexAsync() => Client.Indices.CreateAsync(typeof(ProjectPercolation), c => c
-			.Settings(s => s
-				.AutoExpandReplicas("0-all")
-				.Analysis(ProjectAnalysisSettings)
-                .Setting("index.knn", true)
-                .Setting("index.knn.algo_param.ef_search", 100)
-			)
+			.Settings(PercolatorIndexSettings)
 			.Map<ProjectPercolation>(m => m
 				.AutoMap()
 				.Properties(PercolatedQueryProperties)

diff --git a/tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs b/tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs
@@ -52,7 +52,7 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal
 			foreach (var (_, index) in values)
 			{
 				var createIndex = client.Indices.Create(index, i => i
-					.Settings(settings => settings.Analysis(DefaultSeeder.ProjectAnalysisSettings))
+					.Settings(DefaultSeeder.ProjectIndexSettings)
 					.Map<Project>(DefaultSeeder.ProjectTypeMappings)
 				);
 				createIndex.ShouldBeValid();

diff --git a/tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs b/tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs
@@ -89,7 +89,7 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal
 				throw new Exception("failure in setting up integration");
 
 			var createIndex = client.Indices.Create(targetIndex, i => i
-				.Settings(settings => settings.Analysis(DefaultSeeder.ProjectAnalysisSettings))
+				.Settings(DefaultSeeder.ProjectIndexSettings)
 				.Map<Project>(DefaultSeeder.ProjectTypeMappings)
 			);
 			createIndex.ShouldBeValid();
@@ -169,7 +169,7 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal
 				throw new Exception($"failure in setting up integration for {nameof(GetTaskApiCompletedTaskTests)}. {bulkResponse.DebugInformation}");
 
 			var createIndex = client.Indices.Create(targetIndex, i => i
-				.Settings(settings => settings.Analysis(DefaultSeeder.ProjectAnalysisSettings))
+				.Settings(DefaultSeeder.ProjectIndexSettings)
 				.Map<Project>(DefaultSeeder.ProjectTypeMappings)
 			);
 			createIndex.ShouldBeValid();

diff --git a/tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs b/tests/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs
@@ -135,7 +135,7 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal
 			client.Indices.Refresh(sourceIndex);
 
 			var createIndex = client.Indices.Create(targetIndex, i => i
-				.Settings(settings => settings.Analysis(DefaultSeeder.ProjectAnalysisSettings))
+				.Settings(DefaultSeeder.ProjectIndexSettings)
 				.Map<Project>(DefaultSeeder.ProjectTypeMappings)
 			);
 			createIndex.ShouldBeValid();

diff --git a/tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs b/tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs
@@ -98,10 +98,9 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal
 			foreach (var index in values.Values)
 			{
 				Client.Indices.Create(index, c => c
-					.Settings(s => s
+					.Settings(s => DefaultSeeder.ProjectIndexSettings(s)
 						.NumberOfShards(2)
 						.NumberOfReplicas(0)
-						.Analysis(DefaultSeeder.ProjectAnalysisSettings)
 					)
 					.Map<Project>(p => p
 						.AutoMap()