CSHARP-5402: Add missing reference for MongoDB.Driver.Encryption.Test…

… project (mongodb#1537)
obligaron · Nov 7, 2024 · 5a7da05 · 5a7da05
1 parent 4a669d3
commit 5a7da05
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/build.cake b/build.cake
@@ -222,7 +222,7 @@ Task("TestServerlessNet60").IsDependentOn("TestServerless");
 Task("TestLibMongoCrypt")
     .IsDependentOn("Build")
     .DoesForEach(
-        items: GetFiles("./**/MongoDB.Libmongocrypt.Tests.csproj"),
+        items: GetFiles("./**/MongoDB.Driver.Encryption.Tests.csproj"),
         action: (BuildConfig buildConfig, Path testProject) => RunTests(buildConfig, testProject));
 
 Task("TestLoadBalanced")

diff --git a/tests/MongoDB.Driver.Encryption.Tests/BasicTests.cs b/tests/MongoDB.Driver.Encryption.Tests/BasicTests.cs
@@ -563,7 +563,7 @@ private static KmsKeyId CreateKmsKeyId(string kmsName, string endPoint = null, I
             return new KmsKeyId(datakeyOptionsDocument.ToBson(), keyAltNameBuffers);
         }
 
-        private CryptOptions CreateOptions()
+        private static CryptOptions CreateOptions()
         {
             return new CryptOptions(
                 new[]
@@ -573,7 +573,7 @@ private CryptOptions CreateOptions()
                 });
         }
 
-        private (Binary binarySent, BsonDocument document) ProcessContextToCompletion(CryptContext context, bool isKmsDecrypt = true)
+        private static (Binary binarySent, BsonDocument document) ProcessContextToCompletion(CryptContext context, bool isKmsDecrypt = true)
         {
             BsonDocument document = null;
             Binary binary = null;
@@ -591,7 +591,7 @@ private CryptOptions CreateOptions()
         /// Returns (stateProcessed, binaryOperationProduced, bsonOperationProduced)
         /// </summary>
         /// <exception cref="NotImplementedException"></exception>
-        private (CryptContext.StateCode stateProcessed, Binary binaryProduced, BsonDocument bsonOperationProduced) ProcessState(CryptContext context, bool isKmsDecrypt = true)
+        private static (CryptContext.StateCode stateProcessed, Binary binaryProduced, BsonDocument bsonOperationProduced) ProcessState(CryptContext context, bool isKmsDecrypt = true)
         {
             _output.WriteLine("\n----------------------------------\nState:" + context.State);
             switch (context.State)
@@ -678,7 +678,7 @@ private CryptOptions CreateOptions()
             throw new NotImplementedException();
         }
 
-        private CryptContext StartExplicitEncryptionContextWithKeyId(CryptClient client, byte[] keyId, string encryptionAlgorithm, byte[] message)
+        private static CryptContext StartExplicitEncryptionContextWithKeyId(CryptClient client, byte[] keyId, string encryptionAlgorithm, byte[] message)
         {
             return client.StartExplicitEncryptionContext(keyId, keyAltName: null, queryType: null, contentionFactor: null, encryptionAlgorithm, message, rangeOptions: null);
         }
@@ -732,7 +732,9 @@ static BsonDocument ReadJsonTestFile(string file)
             }
 
             // Work around C# drivers and C driver have different extended json support
+#pragma warning disable CA1307
             text = text.Replace("\"$numberLong\"", "$numberLong");
+#pragma warning restore CA1307
 
             return BsonUtil.FromJSON(text);
         }

diff --git a/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj b/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\BuildProps\Tests.Build.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
@@ -11,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>