mirror of
https://github.com/bitwarden/mobile
synced 2026-01-08 19:43:56 +00:00
fixed Send tests
This commit is contained in:
@@ -28,8 +28,6 @@ namespace Bit.Core.Test.Services
|
||||
{
|
||||
public class SendServiceTests
|
||||
{
|
||||
private string GetSendKey(string userId) => Constants.SendsKey(userId);
|
||||
|
||||
[Theory]
|
||||
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
||||
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
||||
@@ -40,8 +38,7 @@ namespace Bit.Core.Test.Services
|
||||
|
||||
await sutProvider.Sut.ReplaceAsync(actualSendDataDict);
|
||||
|
||||
await sutProvider.GetDependency<IStateService>()
|
||||
.Received(1).SetEncryptedSendsAsync(actualSendDataDict, GetSendKey(userId));
|
||||
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(actualSendDataDict);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
@@ -54,8 +51,7 @@ namespace Bit.Core.Test.Services
|
||||
{
|
||||
var actualSendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
||||
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
||||
sutProvider.GetDependency<IStateService>()
|
||||
.GetEncryptedSendsAsync(GetSendKey(userId)).Returns(actualSendDataDict);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(actualSendDataDict);
|
||||
|
||||
var idsToDelete = actualSendDataDict.Take(numberToDelete).Select(kvp => kvp.Key).ToArray();
|
||||
var expectedSends = actualSendDataDict.Skip(numberToDelete).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
|
||||
@@ -63,10 +59,8 @@ namespace Bit.Core.Test.Services
|
||||
await sutProvider.Sut.DeleteAsync(idsToDelete);
|
||||
|
||||
|
||||
await sutProvider.GetDependency<IStateService>().Received(1)
|
||||
.SetEncryptedSendsAsync(
|
||||
Arg.Is<Dictionary<string, SendData>>(s => TestHelper.AssertEqualExpectedPredicate(expectedSends)(s)),
|
||||
GetSendKey(userId));
|
||||
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
||||
Arg.Is<Dictionary<string, SendData>>(s => TestHelper.AssertEqualExpectedPredicate(expectedSends)(s)));
|
||||
}
|
||||
|
||||
[Theory, SutAutoData]
|
||||
@@ -74,7 +68,7 @@ namespace Bit.Core.Test.Services
|
||||
{
|
||||
await sutProvider.Sut.ClearAsync(userId);
|
||||
|
||||
await sutProvider.GetDependency<IStateService>().Received(1).SetEncryptedSendsAsync(null, GetSendKey(userId));
|
||||
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(null, userId);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
@@ -92,10 +86,8 @@ namespace Bit.Core.Test.Services
|
||||
await sutProvider.Sut.DeleteWithServerAsync(idToDelete);
|
||||
|
||||
await sutProvider.GetDependency<IApiService>().Received(1).DeleteSendAsync(idToDelete);
|
||||
await sutProvider.GetDependency<IStateService>().Received(1)
|
||||
.SetEncryptedSendsAsync(
|
||||
Arg.Is<Dictionary<string, SendData>>(s => TestHelper.AssertEqualExpectedPredicate(expectedSends)(s)),
|
||||
GetSendKey(userId));
|
||||
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
||||
Arg.Is<Dictionary<string, SendData>>(s => TestHelper.AssertEqualExpectedPredicate(expectedSends)(s)));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
@@ -105,7 +97,7 @@ namespace Bit.Core.Test.Services
|
||||
{
|
||||
var sendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
||||
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync(GetSendKey(userId)).Returns(sendDataDict);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
||||
|
||||
foreach (var dataKvp in sendDataDict)
|
||||
{
|
||||
@@ -116,11 +108,11 @@ namespace Bit.Core.Test.Services
|
||||
}
|
||||
|
||||
[Theory, SutAutoData]
|
||||
public async Task GetAsync_NonExistringId_ReturnsNull(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
||||
public async Task GetAsync_NonExistingId_ReturnsNull(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
||||
{
|
||||
var sendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
||||
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync(GetSendKey(userId)).Returns(sendDataDict);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
||||
|
||||
var actual = await sutProvider.Sut.GetAsync(Guid.NewGuid().ToString());
|
||||
|
||||
@@ -134,7 +126,7 @@ namespace Bit.Core.Test.Services
|
||||
{
|
||||
var sendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
||||
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync(GetSendKey(userId)).Returns(sendDataDict);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
||||
|
||||
var allExpected = sendDataDict.Select(kvp => new Send(kvp.Value));
|
||||
var allActual = await sutProvider.Sut.GetAllAsync();
|
||||
@@ -157,7 +149,7 @@ namespace Bit.Core.Test.Services
|
||||
ServiceContainer.Register("cryptoService", sutProvider.GetDependency<ICryptoService>());
|
||||
sutProvider.GetDependency<II18nService>().StringComparer.Returns(StringComparer.CurrentCulture);
|
||||
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync(GetSendKey(userId)).Returns(sendDataDict);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
||||
|
||||
var actual = await sutProvider.Sut.GetAllDecryptedAsync();
|
||||
|
||||
@@ -274,7 +266,7 @@ namespace Bit.Core.Test.Services
|
||||
await sutProvider.Sut.RemovePasswordWithServerAsync(sendId);
|
||||
|
||||
await sutProvider.GetDependency<IApiService>().Received(1).PutSendRemovePasswordAsync(sendId);
|
||||
await sutProvider.GetDependency<IStateService>().ReceivedWithAnyArgs(1).SetEncryptedSendsAsync(default, default);
|
||||
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(default, default);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
@@ -284,7 +276,7 @@ namespace Bit.Core.Test.Services
|
||||
{
|
||||
var initialSendDict = initialSends.ToDictionary(s => s.Id, s => s);
|
||||
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync(GetSendKey(userId)).Returns(initialSendDict);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(initialSendDict);
|
||||
|
||||
var updatedSends = CoreHelpers.Clone(initialSendDict);
|
||||
foreach (var kvp in updatedSends)
|
||||
@@ -304,9 +296,8 @@ namespace Bit.Core.Test.Services
|
||||
}
|
||||
return true;
|
||||
};
|
||||
await sutProvider.GetDependency<IStateService>().Received(1).SetEncryptedSendsAsync(
|
||||
Arg.Is<Dictionary<string, SendData>>(d => matchSendsPredicate(d)),
|
||||
GetSendKey(userId));
|
||||
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
||||
Arg.Is<Dictionary<string, SendData>>(d => matchSendsPredicate(d)));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
@@ -316,7 +307,7 @@ namespace Bit.Core.Test.Services
|
||||
{
|
||||
var initialSendDict = initialSends.ToDictionary(s => s.Id, s => s);
|
||||
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync(GetSendKey(userId)).Returns(initialSendDict);
|
||||
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(initialSendDict);
|
||||
|
||||
var expectedDict = CoreHelpers.Clone(initialSendDict).Concat(newSends.Select(s => new KeyValuePair<string, SendData>(s.Id, s)));
|
||||
|
||||
@@ -332,7 +323,8 @@ namespace Bit.Core.Test.Services
|
||||
}
|
||||
return true;
|
||||
};
|
||||
await sutProvider.GetDependency<IStateService>().Received(1).SetEncryptedSendsAsync(Arg.Is<Dictionary<string, SendData>>(d => matchSendsPredicate(d)), GetSendKey(userId));
|
||||
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
||||
Arg.Is<Dictionary<string, SendData>>(d => matchSendsPredicate(d)));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
|
||||
Reference in New Issue
Block a user