fix: Cleans up LINQ calls. (#965)
- [X] Removes several `ToList()` uses with `PooledRefQueue` - [X] Adds a `PeekRandom` to PooledRefQueue - [X] Updates EV/BS so they dispel each other in a more efficient manner. - [X] Fixes Firebomb so it works like a normal firefield. - [X] Fixes field spells so they aren't unnecessarily using a Point3D ref more than necessary. - [X] Removes extra allocation in campfire by using reverse loop. - [X] Removes other LINQ calls that aren't needed.
This commit is contained in:
parent
daf89686d1
commit
23532db603
40 changed files with 585 additions and 447 deletions
102
Projects/Server.Tests/Tests/Collections/PooledRefQueueTests.cs
Normal file
102
Projects/Server.Tests/Tests/Collections/PooledRefQueueTests.cs
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
using System;
|
||||
using Moq;
|
||||
using Server.Collections;
|
||||
using Server.Random;
|
||||
using Xunit;
|
||||
|
||||
namespace Server.Tests;
|
||||
|
||||
public sealed class PooledRefQueueTests : IDisposable
|
||||
{
|
||||
public void Dispose() => RandomSources.SetRng(null);
|
||||
|
||||
private static void PrepareRng(int queueCount, int rngValue)
|
||||
{
|
||||
Mock<IRandomSource> mockRng = new Mock<IRandomSource>();
|
||||
mockRng
|
||||
.Setup(rng => rng.Next(It.IsAny<int>()))
|
||||
.Returns(
|
||||
(int size) =>
|
||||
{
|
||||
Assert.Equal(queueCount, size);
|
||||
return rngValue;
|
||||
}
|
||||
);
|
||||
|
||||
RandomSources.SetRng(mockRng.Object);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestPeekRandom1()
|
||||
{
|
||||
// Random value for _head = 0, _tail = 5, _size = 5,
|
||||
using var queue = PooledRefQueue<int>.Create(10);
|
||||
queue.Enqueue(0);
|
||||
queue.Enqueue(1);
|
||||
queue.Enqueue(2);
|
||||
queue.Enqueue(3); // <-----
|
||||
queue.Enqueue(4);
|
||||
queue.Enqueue(5);
|
||||
|
||||
PrepareRng(6, 3);
|
||||
Assert.Equal(3, queue.PeekRandom());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestPeekRandom2()
|
||||
{
|
||||
// Random value for _head = 3, _tail = 10, _size = 7,
|
||||
using var queue = PooledRefQueue<int>.Create(10);
|
||||
queue.Enqueue(0);
|
||||
queue.Enqueue(1);
|
||||
queue.Enqueue(2);
|
||||
|
||||
queue.Enqueue(3);
|
||||
queue.Enqueue(4);
|
||||
queue.Enqueue(5);
|
||||
queue.Enqueue(6); // <---
|
||||
queue.Enqueue(7);
|
||||
queue.Enqueue(8);
|
||||
queue.Enqueue(9);
|
||||
|
||||
queue.Dequeue();
|
||||
queue.Dequeue();
|
||||
queue.Dequeue();
|
||||
|
||||
PrepareRng(7, 3);
|
||||
Assert.Equal(6, queue.PeekRandom());
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(3, 6)]
|
||||
[InlineData(8, 11)]
|
||||
[InlineData(6, 9)]
|
||||
[InlineData(7, 10)]
|
||||
public void TestPeekRandom3(int rngValue, int expectedIndex)
|
||||
{
|
||||
// Random value for _head = 3, _tail = 2, _size = 10,
|
||||
using var queue = PooledRefQueue<int>.Create(10);
|
||||
queue.Enqueue(0);
|
||||
queue.Enqueue(1);
|
||||
queue.Enqueue(2);
|
||||
|
||||
queue.Enqueue(3);
|
||||
queue.Enqueue(4);
|
||||
queue.Enqueue(5);
|
||||
queue.Enqueue(6);
|
||||
queue.Enqueue(7);
|
||||
queue.Enqueue(8);
|
||||
queue.Enqueue(9);
|
||||
|
||||
queue.Dequeue();
|
||||
queue.Dequeue();
|
||||
queue.Dequeue();
|
||||
|
||||
queue.Enqueue(10);
|
||||
queue.Enqueue(11);
|
||||
queue.Enqueue(12);
|
||||
|
||||
PrepareRng(10, rngValue);
|
||||
Assert.Equal(expectedIndex, queue.PeekRandom());
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue