- EG Atlas search tests added

Author: BorisDog

build.cake

@@ -240,6 +240,13 @@ Task("TestAtlasDataLake")
         action: (BuildConfig buildConfig, Path testProject) =>
            RunTests(buildConfig, testProject, filter: "Category=\"AtlasDataLake\""));
 
+Task("TestAtlasSearch")
+    .IsDependentOn("Build")
+    .DoesForEach(
+        items: GetFiles("./**/MongoDB.Driver.Tests.csproj"),
+        action: (BuildConfig buildConfig, Path testProject) =>
+           RunTests(buildConfig, testProject, filter: "Category=\"AtlasSearch\""));
+
 Task("TestOcsp")
     .IsDependentOn("Build")
     .DoesForEach(

evergreen/evergreen.yml

@@ -679,6 +679,15 @@ functions:
           ${PREPARE_SHELL}
           evergreen/run-atlas-data-lake-test.sh
 
+  run-atlas-search-test:
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: mongo-csharp-driver
+        script: |
+          ${PREPARE_SHELL}
+          ATLAS_SEARCH="${ATLAS_SEARCH}" evergreen/run-atlas-search-test.sh
+
   run-ocsp-test:
     - command: shell.exec
       type: test
@@ -1179,6 +1188,10 @@ tasks:
         - func: bootstrap-mongohoused
         - func: run-atlas-data-lake-test
 
+    - name: atlas-search-test
+      commands:
+        - func: run-atlas-search-test
+
     - name: test-serverless-net472
       exec_timeout_secs: 2700 # 45 minutes: 15 for setup + 30 for tests
       commands:
@@ -2045,6 +2058,13 @@ buildvariants:
   tasks:
     - name: atlas-data-lake-test
 
+- name: atlas-search-test
+  display_name: "Atlas Search Tests"
+  run_on:
+    - windows-64-vs2017-test
+  tasks:
+    - name: atlas-search-test
+
 - name: gssapi-auth-tests-windows
   run_on:
     - windows-64-vs2017-test

evergreen/run-atlas-search-test.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -o xtrace
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Environment variables produced as output
+#       ATLAS_SEARCH_TESTS_ENABLED  Enable atlas search tests.
+
+############################################
+#            Main Program                  #
+############################################
+
+echo "Running Atlas Search driver tests"
+
+export ATLAS_SEARCH_TESTS_ENABLED=true
+
+powershell.exe .\\build.ps1 --target TestAtlasSearch

src/MongoDB.Driver/Search/SearchHighlightOptions.cs

@@ -13,6 +13,8 @@
 * limitations under the License.
 */
 
+using System;
+using System.Linq.Expressions;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
 using MongoDB.Driver.Core.Misc;
@@ -43,6 +45,27 @@ public SearchHighlightOptions(SearchPathDefinition<TDocument> path, int? maxChar
             _maxNumPassages = maxNumPassages;
         }
 
+        /// <summary>
+        /// Creates highlighting options.
+        /// </summary>
+        /// <param name="path">The document field to search.</param>
+        /// <param name="maxCharsToExamine">
+        /// The maximum number of characters to examine on a document when performing highlighting
+        /// for a field.
+        /// </param>
+        /// <param name="maxNumPassages">
+        /// The number of high-scoring passages to return per document in the highlighting results
+        /// for each field.
+        /// </param>
+        /// <returns>Highlighting options.</returns>
+        public SearchHighlightOptions(
+            Expression<Func<TDocument, object>> path,
+            int? maxCharsToExamine = null,
+            int? maxNumPassages = null) :
+            this(new ExpressionFieldDefinition<TDocument>(path), maxCharsToExamine, maxNumPassages)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the maximum number of characters to examine on a document when performing
         /// highlighting for a field.