.Net: Final test cleanup (#13328)

I think this completes the cleanup work I had planned on the tests.

Author: roji

dotnet/Directory.Packages.props

@@ -155,6 +155,7 @@
     <PackageVersion Include="xretry" Version="1.9.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="Docker.DotNet" Version="3.125.15" />
+    <PackageVersion Include="Humanizer" Version="2.14.1" />
     <!-- Plugins -->
     <PackageVersion Include="DocumentFormat.OpenXml" Version="3.3.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />

dotnet/test/VectorData/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj

@@ -23,6 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json"/>
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets"/>
     <PackageReference Include="System.Linq.AsyncEnumerable" />
+    <PackageReference Include="Humanizer" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/test/VectorData/AzureAISearch.ConformanceTests/AzureAISearchCollectionManagementTests.cs

@@ -7,8 +7,4 @@
 namespace AzureAISearch.ConformanceTests;
 
 public class AzureAISearchCollectionManagementTests(AzureAISearchFixture fixture)
-    : CollectionManagementTests<string>(fixture), IClassFixture<AzureAISearchFixture>
-{
-    // Azure AI search only supports lowercase letters, digits or dashes.
-    public override string CollectionName => "collection-tests";
-}
+    : CollectionManagementTests<string>(fixture), IClassFixture<AzureAISearchFixture>;

dotnet/test/VectorData/AzureAISearch.ConformanceTests/AzureAISearchDistanceFunctionTests.cs

@@ -18,8 +18,6 @@ public class AzureAISearchDistanceFunctionTests(AzureAISearchDistanceFunctionTes
 
     public new class Fixture() : DistanceFunctionTests<string>.Fixture
     {
-        public override string CollectionName => "distance-functions-" + AzureAISearchTestEnvironment.TestIndexPostfix;
-
         public override TestStore TestStore => AzureAISearchTestStore.Instance;
 
         // AzureAISearch does not return the expected standard mathematical result for each distance function

dotnet/test/VectorData/AzureAISearch.ConformanceTests/AzureAISearchEmbeddingGenerationTests.cs

@@ -21,9 +21,6 @@ public override Task SearchAsync_string_without_generator_throws()
     {
         public override TestStore TestStore => AzureAISearchTestStore.Instance;
 
-        // Azure AI search only supports lowercase letters, digits or dashes.
-        public override string CollectionName => "embedding-gen-tests" + AzureAISearchTestEnvironment.TestIndexPostfix;
-
         public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator)
             => AzureAISearchTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator });
 
@@ -46,9 +43,6 @@ public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGene
     {
         public override TestStore TestStore => AzureAISearchTestStore.Instance;
 
-        // Azure AI search only supports lowercase letters, digits or dashes.
-        public override string CollectionName => "search-only-embedding-gen-tests" + AzureAISearchTestEnvironment.TestIndexPostfix;
-
         public override VectorStore CreateVectorStore(IEmbeddingGenerator? embeddingGenerator)
             => AzureAISearchTestStore.Instance.GetVectorStore(new() { EmbeddingGenerator = embeddingGenerator });
 

dotnet/test/VectorData/AzureAISearch.ConformanceTests/AzureAISearchFilterTests.cs

@@ -17,8 +17,5 @@ public override Task Contains_over_inline_int_array()
     public new class Fixture : FilterTests<string>.Fixture
     {
         public override TestStore TestStore => AzureAISearchTestStore.Instance;
-
-        // Azure AI search only supports lowercase letters, digits or dashes.
-        public override string CollectionName => "filter-tests" + AzureAISearchTestEnvironment.TestIndexPostfix;
     }
 }

dotnet/test/VectorData/AzureAISearch.ConformanceTests/AzureAISearchHybridSearchTests.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using AzureAISearch.ConformanceTests.Support;
+using VectorData.ConformanceTests;
+using VectorData.ConformanceTests.Support;
+using Xunit;
+
+namespace AzureAISearch.ConformanceTests;
+
+public class AzureAISearchHybridSearchTests(
+    AzureAISearchHybridSearchTests.VectorAndStringFixture vectorAndStringFixture,
+    AzureAISearchHybridSearchTests.MultiTextFixture multiTextFixture)
+    : HybridSearchTests<string>(vectorAndStringFixture, multiTextFixture),
+        IClassFixture<AzureAISearchHybridSearchTests.VectorAndStringFixture>,
+        IClassFixture<AzureAISearchHybridSearchTests.MultiTextFixture>
+{
+    public new class VectorAndStringFixture : HybridSearchTests<string>.VectorAndStringFixture
+    {
+        public override TestStore TestStore => AzureAISearchTestStore.Instance;
+    }
+
+    public new class MultiTextFixture : HybridSearchTests<string>.MultiTextFixture
+    {
+        public override TestStore TestStore => AzureAISearchTestStore.Instance;
+    }
+}

dotnet/test/VectorData/AzureAISearch.ConformanceTests/AzureAISearchIndexKindTests.cs

@@ -18,8 +18,6 @@ public virtual Task Hnsw()
 
     public new class Fixture() : IndexKindTests<string>.Fixture
     {
-        public override string CollectionName => "index-kind-" + AzureAISearchTestEnvironment.TestIndexPostfix;
-
         public override TestStore TestStore => AzureAISearchTestStore.Instance;
     }
 }

dotnet/test/VectorData/AzureAISearch.ConformanceTests/HybridSearch/AzureAISearchKeywordVectorizedHybridSearchTests.cs

@@ -12,8 +12,6 @@ public class AzureAISearchBasicModelTests(AzureAISearchBasicModelTests.Fixture f
 {
     public new class Fixture : BasicModelTests<string>.Fixture
     {
-        public override string CollectionName => "basic-" + AzureAISearchTestEnvironment.TestIndexPostfix;
-
         public override TestStore TestStore => AzureAISearchTestStore.Instance;
     }
 }