.Net: Refactor vector store integration tests

dotnet/samples/GettingStartedWithAgents/Step04_KernelFunctionStrategies.cs

@@ -70,11 +70,11 @@ public async Task UseKernelFunctionStrategiesWithAgentGroupChatAsync()
                 Determine which participant takes the next turn in a conversation based on the the most recent participant.
                 State only the name of the participant to take the next turn.
                 No participant should take more than one turn in a row.
-                
+
                 Choose only from these participants:
                 - {{{ReviewerName}}}
                 - {{{CopyWriterName}}}
-                
+
                 Always follow these rules when selecting the next participant:
                 - After {{{CopyWriterName}}}, it is {{{ReviewerName}}}'s turn.
                 - After {{{ReviewerName}}}, it is {{{CopyWriterName}}}'s turn.
@@ -133,9 +133,9 @@ No participant should take more than one turn in a row.
         chat.AddChatMessage(message);
         this.WriteAgentChatMessage(message);
 
-        await foreach (ChatMessageContent responese in chat.InvokeAsync())
+        await foreach (ChatMessageContent response in chat.InvokeAsync())
         {
-            this.WriteAgentChatMessage(responese);
+            this.WriteAgentChatMessage(response);
         }
 
         Console.WriteLine($"\n[IS COMPLETED: {chat.IsComplete}]");

dotnet/src/VectorDataIntegrationTests/AzureAISearchIntegrationTests/Filter/AzureAISearchBasicFilterTests.cs

@@ -1,13 +1,24 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using AzureAISearchIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using Xunit;
 
 namespace AzureAISearchIntegrationTests.Filter;
 
-public class AzureAISearchBasicFilterTests(AzureAISearchFilterFixture fixture) : BasicFilterTestsBase<string>(fixture), IClassFixture<AzureAISearchFilterFixture>
+public class AzureAISearchBasicFilterTests(AzureAISearchBasicFilterTests.Fixture fixture)
+    : BasicFilterTests<string>(fixture), IClassFixture<AzureAISearchBasicFilterTests.Fixture>
 {
     // Azure AI Search only supports search.in() over strings
     public override Task Contains_over_inline_int_array()
         => Assert.ThrowsAsync<NotSupportedException>(() => base.Contains_over_inline_int_array());
+
+    public new class Fixture : BasicFilterTests<string>.Fixture
+    {
+        public override TestStore TestStore => AzureAISearchTestStore.Instance;
+
+        // Azure AI search only supports lowercase letters, digits or dashes.
+        protected override string CollectionName => "filter-tests";
+    }
 }

dotnet/src/VectorDataIntegrationTests/CosmosMongoDBIntegrationTests/Filter/CosmosMongoBasicFilterTests.cs

@@ -1,12 +1,15 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using MongoDBIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using VectorDataSpecificationTests.Xunit;
 using Xunit;
 
 namespace MongoDBIntegrationTests.Filter;
 
-public class CosmosMongoBasicFilterTests(CosmosMongoFilterFixture fixture) : BasicFilterTestsBase<string>(fixture), IClassFixture<CosmosMongoFilterFixture>
+public class CosmosMongoBasicFilterTests(CosmosMongoBasicFilterTests.Fixture fixture)
+    : BasicFilterTests<string>(fixture), IClassFixture<CosmosMongoBasicFilterTests.Fixture>
 {
     // Specialized MongoDB syntax for NOT over Contains ($nin)
     [ConditionalFact]
@@ -56,4 +59,12 @@ public override Task Legacy_AnyTagEqualTo_array()
     [Obsolete("Legacy filter support")]
     public override Task Legacy_AnyTagEqualTo_List()
         => Assert.ThrowsAsync<NotSupportedException>(() => base.Legacy_AnyTagEqualTo_List());
+
+    public new class Fixture : BasicFilterTests<string>.Fixture
+    {
+        public override TestStore TestStore => CosmosMongoDBTestStore.Instance;
+
+        protected override string IndexKind => Microsoft.Extensions.VectorData.IndexKind.IvfFlat;
+        protected override string DistanceFunction => Microsoft.Extensions.VectorData.DistanceFunction.CosineDistance;
+    }
 }

dotnet/src/VectorDataIntegrationTests/CosmosNoSQLIntegrationTests/Filter/CosmosNoSQLBasicFilterTests.cs

@@ -1,8 +1,17 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using CosmosNoSQLIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using Xunit;
 
 namespace CosmosNoSQLIntegrationTests.Filter;
 
-public class CosmosNoSQLBasicFilterTests(CosmosNoSQLFilterFixture fixture) : BasicFilterTestsBase<string>(fixture), IClassFixture<CosmosNoSQLFilterFixture>;
+public class CosmosNoSQLBasicFilterTests(CosmosNoSQLBasicFilterTests.Fixture fixture)
+    : BasicFilterTests<string>(fixture), IClassFixture<CosmosNoSQLBasicFilterTests.Fixture>
+{
+    public new class Fixture : BasicFilterTests<string>.Fixture
+    {
+        public override TestStore TestStore => CosmosNoSqlTestStore.Instance;
+    }
+}

dotnet/src/VectorDataIntegrationTests/InMemoryIntegrationTests/Filter/InMemoryBasicFilterTests.cs

@@ -1,8 +1,17 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using InMemoryIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using Xunit;
 
 namespace PostgresIntegrationTests.Filter;
 
-public class InMemoryBasicFilterTests(InMemoryFilterFixture fixture) : BasicFilterTestsBase<int>(fixture), IClassFixture<InMemoryFilterFixture>;
+public class InMemoryBasicFilterTests(InMemoryBasicFilterTests.Fixture fixture)
+    : BasicFilterTests<int>(fixture), IClassFixture<InMemoryBasicFilterTests.Fixture>
+{
+    public new class Fixture : BasicFilterTests<int>.Fixture
+    {
+        public override TestStore TestStore => InMemoryTestStore.Instance;
+    }
+}

dotnet/src/VectorDataIntegrationTests/MongoDBIntegrationTests/Filter/MongoDBBasicFilterTests.cs

@@ -1,12 +1,15 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using MongoDBIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using VectorDataSpecificationTests.Xunit;
 using Xunit;
 
 namespace MongoDBIntegrationTests.Filter;
 
-public class MongoDBBasicFilterTests(MongoDBFilterFixture fixture) : BasicFilterTestsBase<string>(fixture), IClassFixture<MongoDBFilterFixture>
+public class MongoDBBasicFilterTests(MongoDBBasicFilterTests.Fixture fixture)
+    : BasicFilterTests<string>(fixture), IClassFixture<MongoDBBasicFilterTests.Fixture>
 {
     // Specialized MongoDB syntax for NOT over Contains ($nin)
     [ConditionalFact]
@@ -56,4 +59,9 @@ public override Task Legacy_AnyTagEqualTo_array()
     [Obsolete("Legacy filter support")]
     public override Task Legacy_AnyTagEqualTo_List()
         => Assert.ThrowsAsync<NotSupportedException>(() => base.Legacy_AnyTagEqualTo_List());
+
+    public new class Fixture : BasicFilterTests<string>.Fixture
+    {
+        public override TestStore TestStore => MongoDBTestStore.Instance;
+    }
 }

dotnet/src/VectorDataIntegrationTests/PostgresIntegrationTests/Filter/PostgresBasicFilterTests.cs

@@ -1,12 +1,15 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using PostgresIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using Xunit;
 using Xunit.Sdk;
 
 namespace PostgresIntegrationTests.Filter;
 
-public class PostgresBasicFilterTests(PostgresFilterFixture fixture) : BasicFilterTestsBase<int>(fixture), IClassFixture<PostgresFilterFixture>
+public class PostgresBasicFilterTests(PostgresBasicFilterTests.Fixture fixture)
+    : BasicFilterTests<int>(fixture), IClassFixture<PostgresBasicFilterTests.Fixture>
 {
     public override async Task Not_over_Or()
     {
@@ -29,4 +32,9 @@ public override async Task NotEqual_with_string()
     [Obsolete("Legacy filter support")]
     public override Task Legacy_AnyTagEqualTo_array()
         => Assert.ThrowsAsync<ArgumentException>(() => base.Legacy_AnyTagEqualTo_array());
+
+    public new class Fixture : BasicFilterTests<int>.Fixture
+    {
+        public override TestStore TestStore => PostgresTestStore.Instance;
+    }
 }

dotnet/src/VectorDataIntegrationTests/QdrantIntegrationTests/Filter/QdrantBasicFilterTests.cs

@@ -1,8 +1,20 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using QdrantIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using Xunit;
 
 namespace QdrantIntegrationTests.Filter;
 
-public class QdrantBasicFilterTests(QdrantFilterFixture fixture) : BasicFilterTestsBase<ulong>(fixture), IClassFixture<QdrantFilterFixture>;
+public class QdrantBasicFilterTests(QdrantBasicFilterTests.Fixture fixture)
+    : BasicFilterTests<ulong>(fixture), IClassFixture<QdrantBasicFilterTests.Fixture>
+{
+    public new class Fixture : BasicFilterTests<ulong>.Fixture
+    {
+        public override TestStore TestStore => QdrantTestStore.Instance;
+
+        // Qdrant doesn't support the default Flat index kind
+        protected override string IndexKind => Microsoft.Extensions.VectorData.IndexKind.Hnsw;
+    }
+}

dotnet/src/VectorDataIntegrationTests/RedisIntegrationTests/Filter/RedisBasicFilterTests.cs

@@ -1,12 +1,17 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using Microsoft.Extensions.VectorData;
+using Microsoft.SemanticKernel.Connectors.Redis;
+using RedisIntegrationTests.Support;
 using VectorDataSpecificationTests.Filter;
+using VectorDataSpecificationTests.Support;
 using Xunit;
 using Xunit.Sdk;
 
 namespace RedisIntegrationTests.Filter;
 
-public abstract class RedisBasicFilterTests(FilterFixtureBase<string> fixture) : BasicFilterTestsBase<string>(fixture)
+public abstract class RedisBasicFilterTests(BasicFilterTests<string>.Fixture fixture)
+    : BasicFilterTests<string>(fixture)
 {
     #region Equality with null
 
@@ -51,9 +56,32 @@ public override Task Contains_over_captured_string_array()
     #endregion
 }
 
-public class RedisJsonCollectionBasicFilterTests(RedisJsonCollectionFilterFixture fixture) : RedisBasicFilterTests(fixture), IClassFixture<RedisJsonCollectionFilterFixture>;
+public class RedisJsonCollectionBasicFilterTests(RedisJsonCollectionBasicFilterTests.Fixture fixture)
+    : RedisBasicFilterTests(fixture), IClassFixture<RedisJsonCollectionBasicFilterTests.Fixture>
+{
+    public new class Fixture : BasicFilterTests<string>.Fixture
+    {
+        public override TestStore TestStore => RedisTestStore.Instance;
+
+        protected override string CollectionName => "JsonCollectionFilterTests";
+
+        // Override to remove the bool property, which isn't (currently) supported on Redis/JSON
+        protected override VectorStoreRecordDefinition GetRecordDefinition()
+            => new()
+            {
+                Properties = base.GetRecordDefinition().Properties.Where(p => p.PropertyType != typeof(bool)).ToList()
+            };
+
+        protected override IVectorStoreRecordCollection<string, FilterRecord> CreateCollection()
+            => new RedisJsonVectorStoreRecordCollection<FilterRecord>(
+                RedisTestStore.Instance.Database,
+                this.CollectionName,
+                new() { VectorStoreRecordDefinition = this.GetRecordDefinition() });
+    }
+}
 
-public class RedisHashSetCollectionBasicFilterTests(RedisHashSetCollectionFilterFixture fixture) : RedisBasicFilterTests(fixture), IClassFixture<RedisHashSetCollectionFilterFixture>
+public class RedisHashSetCollectionBasicFilterTests(RedisHashSetCollectionBasicFilterTests.Fixture fixture)
+    : RedisBasicFilterTests(fixture), IClassFixture<RedisHashSetCollectionBasicFilterTests.Fixture>
 {
     // Null values are not supported in Redis HashSet
     public override Task Equal_with_null_reference_type()
@@ -82,4 +110,40 @@ public override Task Legacy_AnyTagEqualTo_array()
     [Obsolete("Legacy filter support")]
     public override Task Legacy_AnyTagEqualTo_List()
         => Assert.ThrowsAsync<InvalidOperationException>(() => base.Legacy_AnyTagEqualTo_List());
+
+    public new class Fixture : BasicFilterTests<string>.Fixture
+    {
+        public override TestStore TestStore => RedisTestStore.Instance;
+
+        protected override string CollectionName => "HashSetCollectionFilterTests";
+
+        // Override to remove the bool property, which isn't (currently) supported on Redis
+        protected override VectorStoreRecordDefinition GetRecordDefinition()
+            => new()
+            {
+                Properties = base.GetRecordDefinition().Properties.Where(p =>
+                    p.PropertyType != typeof(bool) &&
+                    p.PropertyType != typeof(string[]) &&
+                    p.PropertyType != typeof(List<string>)).ToList()
+            };
+
+        protected override IVectorStoreRecordCollection<string, FilterRecord> CreateCollection()
+            => new RedisHashSetVectorStoreRecordCollection<FilterRecord>(
+                RedisTestStore.Instance.Database,
+                this.CollectionName,
+                new() { VectorStoreRecordDefinition = this.GetRecordDefinition() });
+
+        protected override List<FilterRecord> BuildTestData()
+        {
+            var testData = base.BuildTestData();
+
+            foreach (var record in testData)
+            {
+                // Null values are not supported in Redis hashsets
+                record.String ??= string.Empty;
+            }
+
+            return testData;
+        }
+    }
 }