CSHARP-5592: Separate unit tests into dedicated variants

Author: sanych-sun

build.cake

@@ -128,7 +128,7 @@ Task("Test")
             Console.WriteLine($"MONGO_X509_CLIENT_CERTIFICATE_PASSWORD={mongoX509ClientCertificatePassword}");
         }
 
-        RunTests(buildConfig, testProject);
+        RunTests(buildConfig, testProject, filter: "Category=\"Integration\"");
     })
     .DeferOnError();
 

evergreen/evergreen.yml

@@ -98,9 +98,13 @@ functions:
   install-dotnet:
     - command: shell.exec
       params:
+        include_expansions_in_env:
+          - "OS"
+          - "DOTNET_SDK_VERSION"
+          - "FRAMEWORK"
         script: |
           ${PREPARE_SHELL}
-          OS=${OS} DOTNET_SDK_VERSION=${DOTNET_SDK_VERSION} bash ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh
+          bash ${PROJECT_DIRECTORY}/evergreen/install-dotnet.sh
 
   prepare-resources:
     - command: shell.exec
@@ -352,6 +356,18 @@ functions:
           cd ${DRIVERS_TOOLS}/.evergreen
           DRIVERS_TOOLS=${DRIVERS_TOOLS} MONGODB_URI=${MONGODB_URI} bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop
 
+  run-unit-tests:
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: mongo-csharp-driver
+        shell: "bash"
+        include_expansions_in_env:
+          - "FRAMEWORK"
+        script: |
+          ${PREPARE_SHELL}
+          bash evergreen/run-unit-tests.sh
+
   run-tests:
     - command: shell.exec
       type: test
@@ -508,7 +524,7 @@ functions:
 
           echo "Response Body: $response_body"
           echo "HTTP Status: $http_status"
-          
+
   assume-ec2-role:
     - command: ec2.assume_role
       params:
@@ -1031,6 +1047,36 @@ post:
   - func: cleanup
 
 tasks:
+    - name: unit-tests-net472
+      commands:
+        - command: expansions.update
+          params:
+            updates:
+              - key: 'FRAMEWORK'
+                value: 'net472'
+        - func: install-dotnet
+        - func: run-unit-tests
+
+    - name: unit-tests-netstandard21
+      commands:
+        - command: expansions.update
+          params:
+            updates:
+              - key: 'FRAMEWORK'
+                value: 'netstandard2.1'
+        - func: install-dotnet
+        - func: run-unit-tests
+
+    - name: unit-tests-net60
+      commands:
+        - command: expansions.update
+          params:
+            updates:
+              - key: 'FRAMEWORK'
+                value: 'net6.0'
+        - func: install-dotnet
+        - func: run-unit-tests
+
     - name: test-net472
       commands:
         - func: setup-csfle-secrets
@@ -2179,6 +2225,25 @@ task_groups:
       - validate-apicompat
 
 buildvariants:
+- name: unit-tests-windows
+  display_name: Unit Tests on Windows
+  run_on: windows-64-vs2017-test
+  expansions:
+    OS: "windows-64"
+  tasks:
+    - name: unit-tests-net472
+    - name: unit-tests-netstandard21
+    - name: unit-tests-net60
+
+- name: unit-tests-ubuntu
+  display_name: Unit Tests on Ubuntu
+  run_on: ubuntu2004-small
+  expansions:
+    OS: "ubuntu-2004"
+  tasks:
+    - name: unit-tests-netstandard21
+    - name: unit-tests-net60
+
 - matrix_name: stable-api-tests
   matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
   display_name: "Stable API ${version} ${topology} ${auth} ${ssl} ${os}"

evergreen/install-dotnet.sh

@@ -4,14 +4,32 @@ set -o errexit  # Exit the script with error if any of the commands fail
 DOTNET_SDK_PATH="${DOTNET_SDK_PATH:-./.dotnet}"
 DOTNET_SDK_VERSION="${DOTNET_SDK_VERSION:-8.0}"
 
+echo "runtime: $FRAMEWORK"
+
+if [ -n "$FRAMEWORK" ]; then
+  if [ "$FRAMEWORK" = "net6.0" ]; then
+    RUNTIME_VERSION="6.0"
+  elif [ "$FRAMEWORK" = "netstandard2.1" ]; then
+    RUNTIME_VERSION="3.1"
+  fi
+fi
+
 if [[ $OS =~ [Ww]indows.* ]]; then
   echo "Downloading Windows .NET SDK installer into $DOTNET_SDK_PATH folder..."
   curl -Lfo ./dotnet-install.ps1 https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
-  echo "Installing .NET 8.0 SDK..."
+  echo "Installing .NET ${DOTNET_SDK_VERSION} SDK..."
   powershell.exe ./dotnet-install.ps1 -Channel "$DOTNET_SDK_VERSION" -InstallDir "$DOTNET_SDK_PATH" -NoPath
+  if [ -n  "$RUNTIME_VERSION" ]; then
+    echo "Installing .NET ${RUNTIME_VERSION} runtime..."
+    powershell.exe ./dotnet-install.ps1 -Channel "$RUNTIME_VERSION" -Runtime dotnet -InstallDir "$DOTNET_SDK_PATH" -NoPath
+  fi
 else
   echo "Downloading .NET SDK installer into $DOTNET_SDK_PATH folder..."
   curl -Lfo ./dotnet-install.sh https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
-  echo "Installing .NET 8.0 SDK..."
+  echo "Installing .NET ${DOTNET_SDK_VERSION} SDK..."
   bash ./dotnet-install.sh --channel "$DOTNET_SDK_VERSION" --install-dir "$DOTNET_SDK_PATH" --no-path
+  if [ -n  "$RUNTIME_VERSION" ]; then
+    echo "Installing .NET ${RUNTIME_VERSION} runtime..."
+    bash ./dotnet-install.sh --channel "$RUNTIME_VERSION" --runtime dotnet --install-dir "$DOTNET_SDK_PATH" --no-path
+  fi
 fi

evergreen/run-unit-tests.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -o errexit  # Exit the script with error if any of the commands fail
+
+FRAMEWORK=${FRAMEWORK:-net6.0}
+
+if [ "$FRAMEWORK" = "netstandard2.1" ]; then
+  FRAMEWORK="netcoreapp3.1"
+fi
+
+dotnet build
+dotnet test --no-build --filter "Category!=Integration"  -f "$FRAMEWORK" --results-directory ./build/test-results --logger  "junit;verbosity=detailed;LogFileName=TEST-{assembly}.xml;FailureBodyFormat=Verbose" --logger "console;verbosity=detailed"

tests/AtlasConnectivity.Tests/ConnectivityTests.cs

@@ -23,6 +23,7 @@
 
 namespace AtlasConnectivity.Tests
 {
+    [Trait("Category", "Integration")]
     public class ConnectivityTests : LoggableTestClass
     {
         // public constructors

tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj

@@ -2,6 +2,7 @@
   <Import Project="..\BuildProps\Tests.Build.props" />
 
   <PropertyGroup>
+    <IsTestProject>false</IsTestProject>
     <CodeAnalysisRuleSet>..\..\MongoDBLegacyTest.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 

tests/MongoDB.Driver.Examples/Aws/AwsAuthenticationExamples.cs

@@ -53,6 +53,7 @@ namespace MongoDB.Driver.Examples.Aws
     /// 4. To work with EC2 container credentials from EC2 instance metadata make sure a test is launched on EC2 env and AWS_CONTAINER_CREDENTIALS_* is not set
     /// 5. To work with Aws WebIdentityToken make sure that AWS_WEB_IDENTITY_TOKEN_FILE, AWS_ROLE_ARN and AWS_ROLE_SESSION_NAME are configured
     /// </summary>
+    [Trait("Category", "Integration")]
     public class AwsAuthenticationExamples
     {
         private static readonly string __connectionStringHosts = "<host_address>";

tests/MongoDB.Driver.Examples/CausalConsistencyExamples.cs

@@ -22,6 +22,7 @@
 
 namespace MongoDB.Driver.Examples
 {
+    [Trait("Category", "Integration")]
     public class CausalConsistencyExamples
     {
         [Fact]

tests/MongoDB.Driver.Examples/ChangeStreamExamples.cs

@@ -25,6 +25,7 @@
 
 namespace MongoDB.Driver.Examples
 {
+    [Trait("Category", "Integration")]
     public class ChangeStreamExamples
     {
         [Fact]

tests/MongoDB.Driver.Examples/ClientEncryptionExamples.cs

@@ -25,6 +25,7 @@
 
 namespace MongoDB.Driver.Examples
 {
+    [Trait("Category", "Integration")]
     public class ClientEncryptionExamples
     {
         private const string LocalMasterKey = "Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk";