Skip to content

CSHARP-4255: Fix bug and some tests. #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 17, 2023
Merged

CSHARP-4255: Fix bug and some tests. #993

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca108c1
CSHARP-4255: Fix bug and some tests.
DmitryLukyanov Dec 15, 2022
28cf23d
Code review.
DmitryLukyanov Jan 16, 2023
4029fd3
Add test.
DmitryLukyanov Jan 16, 2023
308349b
Code review.
DmitryLukyanov Jan 16, 2023
e7b9fc1
Code review.
DmitryLukyanov Jan 16, 2023
1e78cdb
Fixing tests.
DmitryLukyanov Jan 16, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Code review.
  • Loading branch information
@DmitryLukyanov
DmitryLukyanov committed Jan 16, 2023
commit 308349b19a58712a28e43534bc264991c61a8a79
2 changes: 1 addition & 1 deletion src/MongoDB.Driver/Encryption/CreateEncryptedCollectionResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace MongoDB.Driver.Encryption
/// <summary>
/// Represents the result of a create encrypted collection.
/// </summary>
public class CreateEncryptedCollectionResult
public sealed class CreateEncryptedCollectionResult
{
private readonly BsonDocument _encryptedFields;

Expand Down
4 changes: 2 additions & 2 deletions src/MongoDB.Driver/Encryption/MongoEncryptionCreateCollectionException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public MongoEncryptionCreateCollectionException(Exception innerException, BsonDo
protected MongoEncryptionCreateCollectionException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
_encryptedFields = (BsonDocument)info.GetValue("_encryptedFields", typeof(BsonDocument));
_encryptedFields = (BsonDocument)info.GetValue(nameof(_encryptedFields), typeof(BsonDocument));
}

/// <summary>
Expand All @@ -63,7 +63,7 @@ protected MongoEncryptionCreateCollectionException(SerializationInfo info, Strea
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
base.GetObjectData(info, context);
info.AddValue("_encryptedFields", _encryptedFields);
info.AddValue(nameof(_encryptedFields), _encryptedFields);
}
}
}
15 changes: 6 additions & 9 deletions tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,22 +172,19 @@ public async Task CreateEncryptedCollection_should_handle_various_encryptedField

using (var subject = CreateSubject())
{
var createCollectionOptions = new CreateCollectionOptions() { EncryptedFields = encryptedFieldsStr != null ? BsonDocument.Parse(encryptedFieldsStr) : null };

if (BsonDocument.TryParse(expectedResult, out var encryptedFields))
{
var createCollectionOptions = new CreateCollectionOptions() { EncryptedFields = encryptedFieldsStr != null ? BsonDocument.Parse(encryptedFieldsStr) : null };
var effectiveEncryptedFields = subject.CreateEncryptedCollection(database, collectionName, createCollectionOptions, kmsProvider, dataKeyOptions);
effectiveEncryptedFields.EncryptedFields.WithComparer(new EncryptedFieldsComparer()).Should().Be(encryptedFields.DeepClone());
var createCollectionResult = subject.CreateEncryptedCollection(database, collectionName, createCollectionOptions, kmsProvider, dataKeyOptions);
createCollectionResult.EncryptedFields.WithComparer(new EncryptedFieldsComparer()).Should().Be(encryptedFields.DeepClone());

createCollectionOptions = new CreateCollectionOptions() { EncryptedFields = encryptedFieldsStr != null ? BsonDocument.Parse(encryptedFieldsStr) : null };
effectiveEncryptedFields = await subject.CreateEncryptedCollectionAsync(database, collectionName, createCollectionOptions, kmsProvider, dataKeyOptions);
effectiveEncryptedFields.EncryptedFields.WithComparer(new EncryptedFieldsComparer()).Should().Be(encryptedFields.DeepClone());
createCollectionResult = await subject.CreateEncryptedCollectionAsync(database, collectionName, createCollectionOptions, kmsProvider, dataKeyOptions);
createCollectionResult.EncryptedFields.WithComparer(new EncryptedFieldsComparer()).Should().Be(encryptedFields.DeepClone());
}
else
{
var createCollectionOptions = new CreateCollectionOptions() { EncryptedFields = encryptedFieldsStr != null ? BsonDocument.Parse(encryptedFieldsStr) : null };
AssertInvalidOperationException(Record.Exception(() => subject.CreateEncryptedCollection(database, collectionName, createCollectionOptions, kmsProvider, dataKeyOptions)), expectedResult);

createCollectionOptions = new CreateCollectionOptions() { EncryptedFields = encryptedFieldsStr != null ? BsonDocument.Parse(encryptedFieldsStr) : null };
AssertInvalidOperationException(await Record.ExceptionAsync(() => subject.CreateEncryptedCollectionAsync(database, collectionName, createCollectionOptions, kmsProvider, dataKeyOptions)), expectedResult);
}
}
Expand Down