V10: fix build warnings in test projects (#12509)
* Run code cleanup * Dotnet format benchmarks project * Fix up Test.Common * Run dotnet format + manual cleanup * Run code cleanup for unit tests * Run dotnet format * Fix up errors * Manual cleanup of Unit test project * Update tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Fix according to review * Fix after merge * Fix errors Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> Co-authored-by: Zeegaan <nge@umbraco.dk>
This commit is contained in:
Nikolaj Geisle
@@ -8,175 +8,186 @@ using NUnit.Framework;
|
||||
using Umbraco.Cms.Core.Cache;
|
||||
using Umbraco.Cms.Core.Sync;
|
||||
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache.DistributedCache
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache.DistributedCache;
|
||||
|
||||
/// <summary>
|
||||
/// Ensures that calls to DistributedCache methods carry through to the IServerMessenger correctly
|
||||
/// </summary>
|
||||
[TestFixture]
|
||||
public class DistributedCacheTests
|
||||
{
|
||||
/// <summary>
|
||||
/// Ensures that calls to DistributedCache methods carry through to the IServerMessenger correctly
|
||||
/// </summary>
|
||||
[TestFixture]
|
||||
public class DistributedCacheTests
|
||||
[SetUp]
|
||||
public void Setup()
|
||||
{
|
||||
private global::Umbraco.Cms.Core.Cache.DistributedCache _distributedCache;
|
||||
ServerRegistrar = new TestServerRegistrar();
|
||||
ServerMessenger = new TestServerMessenger();
|
||||
|
||||
private IServerRoleAccessor ServerRegistrar { get; set; }
|
||||
var cacheRefresherCollection = new CacheRefresherCollection(() => new[] { new TestCacheRefresher() });
|
||||
|
||||
private TestServerMessenger ServerMessenger { get; set; }
|
||||
_distributedCache = new Cms.Core.Cache.DistributedCache(ServerMessenger, cacheRefresherCollection);
|
||||
}
|
||||
|
||||
[SetUp]
|
||||
public void Setup()
|
||||
private Cms.Core.Cache.DistributedCache _distributedCache;
|
||||
|
||||
private IServerRoleAccessor ServerRegistrar { get; set; }
|
||||
|
||||
private TestServerMessenger ServerMessenger { get; set; }
|
||||
|
||||
[Test]
|
||||
public void RefreshIntId()
|
||||
{
|
||||
for (var i = 1; i < 11; i++)
|
||||
{
|
||||
ServerRegistrar = new TestServerRegistrar();
|
||||
ServerMessenger = new TestServerMessenger();
|
||||
|
||||
var cacheRefresherCollection = new CacheRefresherCollection(() => new[]
|
||||
{
|
||||
new TestCacheRefresher()
|
||||
});
|
||||
|
||||
_distributedCache = new global::Umbraco.Cms.Core.Cache.DistributedCache(ServerMessenger, cacheRefresherCollection);
|
||||
_distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void RefreshIntId()
|
||||
{
|
||||
for (var i = 1; i < 11; i++)
|
||||
{
|
||||
_distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
|
||||
}
|
||||
Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
|
||||
}
|
||||
|
||||
Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
|
||||
[Test]
|
||||
public void RefreshIntIdFromObject()
|
||||
{
|
||||
for (var i = 0; i < 10; i++)
|
||||
{
|
||||
_distributedCache.Refresh(
|
||||
Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"),
|
||||
x => x.Id,
|
||||
new TestObjectWithId { Id = i });
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void RefreshIntIdFromObject()
|
||||
{
|
||||
for (var i = 0; i < 10; i++)
|
||||
{
|
||||
_distributedCache.Refresh(
|
||||
Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"),
|
||||
x => x.Id,
|
||||
new TestObjectWithId { Id = i });
|
||||
}
|
||||
Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
|
||||
}
|
||||
|
||||
Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
|
||||
[Test]
|
||||
public void RefreshGuidId()
|
||||
{
|
||||
for (var i = 0; i < 11; i++)
|
||||
{
|
||||
_distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), Guid.NewGuid());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void RefreshGuidId()
|
||||
{
|
||||
for (var i = 0; i < 11; i++)
|
||||
{
|
||||
_distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), Guid.NewGuid());
|
||||
}
|
||||
Assert.AreEqual(11, ServerMessenger.GuidIdsRefreshed.Count);
|
||||
}
|
||||
|
||||
Assert.AreEqual(11, ServerMessenger.GuidIdsRefreshed.Count);
|
||||
[Test]
|
||||
public void RemoveIds()
|
||||
{
|
||||
for (var i = 1; i < 13; i++)
|
||||
{
|
||||
_distributedCache.Remove(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void RemoveIds()
|
||||
{
|
||||
for (var i = 1; i < 13; i++)
|
||||
{
|
||||
_distributedCache.Remove(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
|
||||
}
|
||||
Assert.AreEqual(12, ServerMessenger.IntIdsRemoved.Count);
|
||||
}
|
||||
|
||||
Assert.AreEqual(12, ServerMessenger.IntIdsRemoved.Count);
|
||||
[Test]
|
||||
public void FullRefreshes()
|
||||
{
|
||||
for (var i = 0; i < 13; i++)
|
||||
{
|
||||
_distributedCache.RefreshAll(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void FullRefreshes()
|
||||
{
|
||||
for (var i = 0; i < 13; i++)
|
||||
{
|
||||
_distributedCache.RefreshAll(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"));
|
||||
}
|
||||
Assert.AreEqual(13, ServerMessenger.CountOfFullRefreshes);
|
||||
}
|
||||
|
||||
Assert.AreEqual(13, ServerMessenger.CountOfFullRefreshes);
|
||||
internal class TestObjectWithId
|
||||
{
|
||||
public int Id { get; set; }
|
||||
}
|
||||
|
||||
internal class TestCacheRefresher : ICacheRefresher
|
||||
{
|
||||
public static readonly Guid UniqueId = Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73");
|
||||
|
||||
public Guid RefresherUniqueId => UniqueId;
|
||||
|
||||
public string Name => "Test Cache Refresher";
|
||||
|
||||
public void RefreshAll()
|
||||
{
|
||||
}
|
||||
|
||||
internal class TestObjectWithId
|
||||
public void Refresh(int id)
|
||||
{
|
||||
public int Id { get; set; }
|
||||
}
|
||||
|
||||
internal class TestCacheRefresher : ICacheRefresher
|
||||
public void Remove(int id)
|
||||
{
|
||||
public static readonly Guid UniqueId = Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73");
|
||||
|
||||
public Guid RefresherUniqueId => UniqueId;
|
||||
|
||||
public string Name => "Test Cache Refresher";
|
||||
|
||||
public void RefreshAll()
|
||||
{
|
||||
}
|
||||
|
||||
public void Refresh(int id)
|
||||
{
|
||||
}
|
||||
|
||||
public void Remove(int id)
|
||||
{
|
||||
}
|
||||
|
||||
public void Refresh(Guid id)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
internal class TestServerMessenger : IServerMessenger
|
||||
public void Refresh(Guid id)
|
||||
{
|
||||
// Used for tests
|
||||
public List<int> IntIdsRefreshed { get; } = new List<int>();
|
||||
public List<Guid> GuidIdsRefreshed { get; } = new List<Guid>();
|
||||
public List<int> IntIdsRemoved { get; } = new List<int>();
|
||||
public List<string> PayloadsRemoved { get; } = new List<string>();
|
||||
public List<string> PayloadsRefreshed { get; } = new List<string>();
|
||||
public int CountOfFullRefreshes { get; private set; } = 0;
|
||||
|
||||
public void QueueRefresh<TPayload>(ICacheRefresher refresher, TPayload[] payload)
|
||||
{
|
||||
// doing nothing
|
||||
}
|
||||
|
||||
public void PerformRefresh(ICacheRefresher refresher, string jsonPayload) => PayloadsRefreshed.Add(jsonPayload);
|
||||
|
||||
public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) => IntIdsRefreshed.AddRange(instances.Select(getNumericId));
|
||||
|
||||
public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, Guid> getGuidId, params T[] instances) => GuidIdsRefreshed.AddRange(instances.Select(getGuidId));
|
||||
|
||||
public void PerformRemove(ICacheRefresher refresher, string jsonPayload) => PayloadsRemoved.Add(jsonPayload);
|
||||
|
||||
public void QueueRemove<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) => IntIdsRemoved.AddRange(instances.Select(getNumericId));
|
||||
|
||||
public void QueueRemove(ICacheRefresher refresher, params int[] numericIds) => IntIdsRemoved.AddRange(numericIds);
|
||||
|
||||
public void QueueRefresh(ICacheRefresher refresher, params int[] numericIds) => IntIdsRefreshed.AddRange(numericIds);
|
||||
|
||||
public void QueueRefresh(ICacheRefresher refresher, params Guid[] guidIds) => GuidIdsRefreshed.AddRange(guidIds);
|
||||
|
||||
public void QueueRefreshAll(ICacheRefresher refresher) => CountOfFullRefreshes++;
|
||||
|
||||
public void Sync() { }
|
||||
|
||||
public void SendMessages() { }
|
||||
}
|
||||
|
||||
internal class TestServerRegistrar : IServerRoleAccessor
|
||||
{
|
||||
public IEnumerable<IServerAddress> Registrations => new List<IServerAddress>
|
||||
{
|
||||
new TestServerAddress("localhost")
|
||||
};
|
||||
|
||||
public ServerRole CurrentServerRole => throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public class TestServerAddress : IServerAddress
|
||||
{
|
||||
public TestServerAddress(string address) => ServerAddress = address;
|
||||
|
||||
public string ServerAddress { get; private set; }
|
||||
}
|
||||
}
|
||||
|
||||
internal class TestServerMessenger : IServerMessenger
|
||||
{
|
||||
// Used for tests
|
||||
public List<int> IntIdsRefreshed { get; } = new();
|
||||
|
||||
public List<Guid> GuidIdsRefreshed { get; } = new();
|
||||
|
||||
public List<int> IntIdsRemoved { get; } = new();
|
||||
|
||||
public List<string> PayloadsRemoved { get; } = new();
|
||||
|
||||
public List<string> PayloadsRefreshed { get; } = new();
|
||||
|
||||
public int CountOfFullRefreshes { get; private set; }
|
||||
|
||||
public void QueueRefresh<TPayload>(ICacheRefresher refresher, TPayload[] payload)
|
||||
{
|
||||
// doing nothing
|
||||
}
|
||||
|
||||
public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) =>
|
||||
IntIdsRefreshed.AddRange(instances.Select(getNumericId));
|
||||
|
||||
public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, Guid> getGuidId, params T[] instances) =>
|
||||
GuidIdsRefreshed.AddRange(instances.Select(getGuidId));
|
||||
|
||||
public void QueueRemove<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) =>
|
||||
IntIdsRemoved.AddRange(instances.Select(getNumericId));
|
||||
|
||||
public void QueueRemove(ICacheRefresher refresher, params int[] numericIds) =>
|
||||
IntIdsRemoved.AddRange(numericIds);
|
||||
|
||||
public void QueueRefresh(ICacheRefresher refresher, params int[] numericIds) =>
|
||||
IntIdsRefreshed.AddRange(numericIds);
|
||||
|
||||
public void QueueRefresh(ICacheRefresher refresher, params Guid[] guidIds) =>
|
||||
GuidIdsRefreshed.AddRange(guidIds);
|
||||
|
||||
public void QueueRefreshAll(ICacheRefresher refresher) => CountOfFullRefreshes++;
|
||||
|
||||
public void Sync()
|
||||
{
|
||||
}
|
||||
|
||||
public void SendMessages()
|
||||
{
|
||||
}
|
||||
|
||||
public void PerformRefresh(ICacheRefresher refresher, string jsonPayload) => PayloadsRefreshed.Add(jsonPayload);
|
||||
|
||||
public void PerformRemove(ICacheRefresher refresher, string jsonPayload) => PayloadsRemoved.Add(jsonPayload);
|
||||
}
|
||||
|
||||
internal class TestServerRegistrar : IServerRoleAccessor
|
||||
{
|
||||
public IEnumerable<IServerAddress> Registrations => new List<IServerAddress>
|
||||
{
|
||||
new TestServerAddress("localhost"),
|
||||
};
|
||||
|
||||
public ServerRole CurrentServerRole => throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public class TestServerAddress : IServerAddress
|
||||
{
|
||||
public TestServerAddress(string address) => ServerAddress = address;
|
||||
|
||||
public string ServerAddress { get; }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user