Add more integration tests with better validation

Author: neildsh

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Documents/text-3properties-1536dimensions-100documents.json

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -343,6 +343,10 @@
       <Link>Documents\MillionSong1KDocuments.json</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Documents\text-3properties-1536dimensions-100documents.json">
+      <Link>Documents\text-3properties-1536dimensions-100documents.json</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Azure.Cosmos.csproj" />

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj

@@ -18,85 +18,110 @@ namespace Microsoft.Azure.Cosmos.EmulatorTests.Query
     [TestCategory("Query")]
     public sealed class HybridSearchQueryTests : QueryTestsBase
     {
-        private const string CollectionDataPath = "D:\\cosmosdb\\Product\\Backend\\native\\Test\\resources\\TestInput\\FullText\\text-3properties-1536dimensions-100documents.json";
+        private const string CollectionDataPath = "Documents\\text-3properties-1536dimensions-100documents.json";
 
         private static readonly IndexingPolicy CompositeIndexPolicy = CreateIndexingPolicy();
 
         [TestMethod]
-        public async Task AllTests()
+        public async Task SanityTests()
         {
-            Trace.WriteLine("Started HybridSearchQueryTests.AllTests...");
+            Trace.WriteLine("Started HybridSearchQueryTests.SanityTests...");
             Trace.AutoFlush = true;
 
-            IReadOnlyList<string> documents = await LoadDocuments();
+            CosmosArray documentsArray = await LoadDocuments();
+            IEnumerable<string> documents = documentsArray.Select(document => document.ToString());
 
             await this.CreateIngestQueryDeleteAsync(
                 connectionModes: ConnectionModes.Direct, // | ConnectionModes.Gateway,
                 collectionTypes: CollectionTypes.MultiPartition, // | CollectionTypes.SinglePartition,
                 documents: documents,
-                query: RunTests,
+                query: RunSanityTests,
                 indexingPolicy: CompositeIndexPolicy);
         }
 
-        private static async Task RunTests(Container container, IReadOnlyList<CosmosObject> _)
+        private static async Task RunSanityTests(Container container, IReadOnlyList<CosmosObject> _)
         {
-            List<string> queryText = new List<string>
+            List<SanityTest> testCases = new List<SanityTest>
             {
-                //@"
-                //SELECT c.title AS Title, c.text AS Text
-                //FROM c
-                //WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John')
-                //ORDER BY RANK FullTextScore(c.title, ['John'])",
-                @"
-                SELECT c.title AS Title, c.text AS Text
-                FROM c
-                WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John') OR FullTextContains(c.text, 'United States')
-                ORDER BY RANK RRF(FullTextScore(c.title, ['John']), FullTextScore(c.text, ['United States']))",
+                MakeSanityTest(@"
+                    SELECT c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John')
+                    ORDER BY RANK FullTextScore(c.title, ['John'])",
+                    new List<int>{ 2, 57, 85 }),
+                MakeSanityTest(@"
+                    SELECT TOP 10 c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John')
+                    ORDER BY RANK FullTextScore(c.title, ['John'])",
+                    new List<int>{ 2, 57, 85 }),
+                MakeSanityTest(@"
+                    SELECT c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John')
+                    ORDER BY RANK FullTextScore(c.title, ['John'])
+                    OFFSET 1 LIMIT 5",
+                    new List<int>{ 57, 85 }),
+                MakeSanityTest(@"
+                    SELECT c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John') OR FullTextContains(c.text, 'United States')
+                    ORDER BY RANK RRF(FullTextScore(c.title, ['John']), FullTextScore(c.text, ['United States']))",
+                    new List<int>{ 61, 51, 49, 54, 75, 24, 77, 76, 80, 25, 22, 2, 66, 57, 85 }),
+                MakeSanityTest(@"
+                    SELECT TOP 10 c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John') OR FullTextContains(c.text, 'United States')
+                    ORDER BY RANK RRF(FullTextScore(c.title, ['John']), FullTextScore(c.text, ['United States']))",
+                    new List<int>{ 61, 51, 49, 54, 75, 24, 77, 76, 80, 25 }),
+                MakeSanityTest(@"
+                    SELECT c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    WHERE FullTextContains(c.title, 'John') OR FullTextContains(c.text, 'John') OR FullTextContains(c.text, 'United States')
+                    ORDER BY RANK RRF(FullTextScore(c.title, ['John']), FullTextScore(c.text, ['United States']))
+                    OFFSET 5 LIMIT 10",
+                    new List<int>{ 24, 77, 76, 80, 25, 22, 2, 66, 57, 85 }),
+                MakeSanityTest(@"
+                    SELECT TOP 10 c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    ORDER BY RANK RRF(FullTextScore(c.title, ['John']), FullTextScore(c.text, ['United States']))",
+                    new List<int>{ 61, 51, 49, 54, 75, 24, 77, 76, 80, 25 }),
+                MakeSanityTest(@"
+                    SELECT c.index AS Index, c.title AS Title, c.text AS Text
+                    FROM c
+                    ORDER BY RANK RRF(FullTextScore(c.title, ['John']), FullTextScore(c.text, ['United States']))
+                    OFFSET 0 LIMIT 13",
+                    new List<int>{ 61, 51, 49, 54, 75, 24, 77, 76, 80, 25, 22, 2, 66 }),
             };
 
-            foreach (string query in queryText)
+            foreach (SanityTest testCase in testCases)
             {
-                await RunTestAsync(container, query);
-            }
-        }
+                List<TextDocument> result = await RunQueryCombinationsAsync<TextDocument>(
+                    container,
+                    testCase.Query,
+                    queryRequestOptions: null,
+                    queryDrainingMode: QueryDrainingMode.HoldState);
 
-        private static async Task RunTestAsync(Container container, string queryText)
-        {
-            List<TextDocument> result = await RunQueryCombinationsAsync<TextDocument>(
-                container,
-                queryText,
-                queryRequestOptions: null,
-                queryDrainingMode: QueryDrainingMode.HoldState);
-            Assert.IsTrue(result.Count > 0);
+                IEnumerable<int> actual = result.Select(document => document.Index);
+                if (!testCase.ExpectedIndices.SequenceEqual(actual))
+                {
+                    Trace.WriteLine($"Query: {testCase.Query}");
+                    Trace.WriteLine($"Expected: {string.Join(", ", testCase.ExpectedIndices)}");
+                    Trace.WriteLine($"Actual: {string.Join(", ", actual)}");
+                    Assert.Fail("The query results did not match the expected results.");
+                }
+            }
         }
 
-        private static async Task<IReadOnlyList<string>> LoadDocuments()
+        private static async Task<CosmosArray> LoadDocuments()
         {
             // read the json file
             string json = await File.ReadAllTextAsync(CollectionDataPath);
             byte[] jsonBuffer = Encoding.UTF8.GetBytes(json);
             ReadOnlyMemory<byte> readOnlyMemory = new ReadOnlyMemory<byte>(jsonBuffer);
             CosmosObject rootObject = CosmosObject.CreateFromBuffer(readOnlyMemory);
-            if (!rootObject.TryGetValue(FieldNames.Items, out CosmosArray items))
-            {
-                throw new InvalidOperationException("Failed to find items in the json file.");
-            }
-
-            int index = 0;
-            List<string> documents = new List<string>();
-            foreach (CosmosElement item in items)
-            {
-                CosmosObject itemObject = item as CosmosObject;
-                Dictionary<string, CosmosElement> itemDictionary = new(itemObject)
-                {
-                    { "index", CosmosNumber.Parse(index.ToString()) }
-                };
-
-                CosmosObject rewrittenItem = CosmosObject.Create(itemDictionary);
-                documents.Add(rewrittenItem.ToString());
-            }
-
-            return documents;
+            Assert.IsTrue(rootObject.TryGetValue(FieldNames.Items, out CosmosArray items), "Failed to find items in the json file.");
+            return items;
         }
 
         private static IndexingPolicy CreateIndexingPolicy()
@@ -113,8 +138,26 @@ private static IndexingPolicy CreateIndexingPolicy()
             return policy;
         }
 
+        private static SanityTest MakeSanityTest(string query, IReadOnlyList<int> expectedIndices)
+        {
+            return new SanityTest
+            {
+                Query = query,
+                ExpectedIndices = expectedIndices,
+            };
+        }
+
+        private sealed class SanityTest
+        {
+            public string Query { get; init; }
+
+            public IReadOnlyList<int> ExpectedIndices { get; init; }
+        }
+
         private sealed class TextDocument
         {
+            public int Index { get; set; }
+
             public string Title { get; set; }
 
             public string Text { get; set; }
@@ -123,6 +166,8 @@ private sealed class TextDocument
         private static class FieldNames
         {
             public const string Items = "items";
+            public const string Title = "title";
+            public const string Text = "text";
         }
     }
-}
+}