OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add request drip rate to assertions for token bucket regression tests

ghosts
Justin Clark-Casey (justincc) 2014-10-25 00:36:50 +01:00
parent 67007c7d21
commit bda36ad2e0
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/ClientStack/Linden/UDP/Tests/ThrottleTests.cs
View File

@ -58,29 +58,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
public void TestSetRequestDripRate() public void TestSetRequestDripRate()
{ {
TokenBucket tb = new TokenBucket("tb", null, 5000, 0); TokenBucket tb = new TokenBucket("tb", null, 5000, 0);
AssertRates(tb, 5000, 5000, 0); AssertRates(tb, 5000, 5000, 5000, 0);
tb.RequestedDripRate = 4000; tb.RequestedDripRate = 4000;
AssertRates(tb, 4000, 4000, 0); AssertRates(tb, 4000, 4000, 4000, 0);
tb.RequestedDripRate = 6000; tb.RequestedDripRate = 6000;
AssertRates(tb, 6000, 6000, 0); AssertRates(tb, 6000, 6000, 6000, 0);
} }
[Test] [Test]
public void TestSetRequestDripRateWithMax() public void TestSetRequestDripRateWithMax()
{ {
TokenBucket tb = new TokenBucket("tb", null, 5000, 10000); TokenBucket tb = new TokenBucket("tb", null, 5000, 10000);
AssertRates(tb, 5000, 5000, 10000); AssertRates(tb, 5000, 5000, 5000, 10000);
tb.RequestedDripRate = 4000; tb.RequestedDripRate = 4000;
AssertRates(tb, 4000, 4000, 10000); AssertRates(tb, 4000, 4000, 4000, 10000);
tb.RequestedDripRate = 6000; tb.RequestedDripRate = 6000;
AssertRates(tb, 6000, 6000, 10000); AssertRates(tb, 6000, 6000, 6000, 10000);
tb.RequestedDripRate = 12000; tb.RequestedDripRate = 12000;
AssertRates(tb, 10000, 10000, 10000); AssertRates(tb, 10000, 10000, 10000, 10000);
} }
[Test] [Test]
@ -90,15 +90,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
TokenBucket tbChild1 = new TokenBucket("tbChild1", tbParent, 3000, 0); TokenBucket tbChild1 = new TokenBucket("tbChild1", tbParent, 3000, 0);
TokenBucket tbChild2 = new TokenBucket("tbChild2", tbParent, 5000, 0); TokenBucket tbChild2 = new TokenBucket("tbChild2", tbParent, 5000, 0);
AssertRates(tbParent, 8000, 8000, 0); AssertRates(tbParent, 8000, 8000, 8000, 0);
AssertRates(tbChild1, 3000, 3000, 0); AssertRates(tbChild1, 3000, 3000, 3000, 0);
AssertRates(tbChild2, 5000, 5000, 0); AssertRates(tbChild2, 5000, 5000, 5000, 0);
} }
private void AssertRates(TokenBucket tb, double dripRate, double totalDripRequest, double maxDripRate) private void AssertRates(
TokenBucket tb, double requestedDripRate, double totalDripRequest, double dripRate, double maxDripRate)
{ {
Assert.AreEqual((int)dripRate, tb.DripRate); Assert.AreEqual((int)requestedDripRate, tb.RequestedDripRate);
Assert.AreEqual((int)totalDripRequest, tb.TotalDripRequest); Assert.AreEqual((int)totalDripRequest, tb.TotalDripRequest);
Assert.AreEqual((int)dripRate, tb.DripRate);
Assert.AreEqual((int)maxDripRate, tb.MaxDripRate); Assert.AreEqual((int)maxDripRate, tb.MaxDripRate);
} }