diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-12 15:46:04 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-12 15:46:04 +0200 |
commit | 751002293a4bb389c7db69a3af28b467c0f55478 (patch) | |
tree | ae2ef16f431495de3a577a1a7806dc98ca437d60 /container-messagebus/src/test/java/com/yahoo | |
parent | a9e3a26a04f795c20b4ed6ca3f8731b3fbcbe73f (diff) |
A collection of code cleanup in messagebus. And a bonus of catching missing shutdown of config subscription.
Diffstat (limited to 'container-messagebus/src/test/java/com/yahoo')
-rw-r--r-- | container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java | 93 |
1 files changed, 40 insertions, 53 deletions
diff --git a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java index 1b814208d26..89bc5b9cecd 100644 --- a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java +++ b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java @@ -25,22 +25,16 @@ public class MbusSessionKeyTestCase { public final void staticThrottlePolicySignature() { final StaticThrottlePolicy base = new StaticThrottlePolicy(); final StaticThrottlePolicy other = new StaticThrottlePolicy(); - other.setMaxPendingCount(500); - other.setMaxPendingSize(500 * 1000 * 1000); - base.setMaxPendingCount(1); - base.setMaxPendingSize(1000); - final StaticThrottlePolicySignature sigBase = new StaticThrottlePolicySignature( - base); - final StaticThrottlePolicySignature sigOther = new StaticThrottlePolicySignature( - other); - assertFalse("The policies are different, but signatures are equal.", - sigBase.equals(sigOther)); + other.setMaxPendingCount(500).setMaxPendingSize(500 * 1000 * 1000); + base.setMaxPendingCount(1).setMaxPendingSize(1000); + final StaticThrottlePolicySignature sigBase = new StaticThrottlePolicySignature(base); + final StaticThrottlePolicySignature sigOther = new StaticThrottlePolicySignature(other); + assertFalse("The policies are different, but signatures are equal.", sigBase.equals(sigOther)); assertTrue("Sigs created from same policy evaluated as different.", sigBase.equals(new StaticThrottlePolicySignature(base))); other.setMaxPendingCount(1); other.setMaxPendingSize(1000); - assertTrue( - "Sigs created from different policies with same settings evaluated as different.", + assertTrue("Sigs created from different policies with same settings evaluated as different.", sigBase.equals(new StaticThrottlePolicySignature(other))); } @@ -49,52 +43,46 @@ public class MbusSessionKeyTestCase { public final void dynamicThrottlePolicySignature() { final DynamicThrottlePolicy base = new DynamicThrottlePolicy(); final DynamicThrottlePolicy other = new DynamicThrottlePolicy(); - base.setEfficiencyThreshold(5); - base.setMaxPendingCount(3); - base.setMaxPendingSize(3 * 100); - base.setMaxThroughput(1e6); - base.setMaxWindowSize(1e9); - base.setMinWindowSize(1e5); - base.setWeight(1.0); - base.setWindowSizeBackOff(.6); - base.setWindowSizeIncrement(500); - other.setEfficiencyThreshold(5 + 1); - other.setMaxPendingCount(3 + 1); - other.setMaxPendingSize(3 * 100 + 1); - other.setMaxThroughput(1e6 + 1); - other.setMaxWindowSize(1e9 + 1); - other.setMinWindowSize(1e5 + 1); - other.setWeight(1.0 + 1); - other.setWindowSizeBackOff(.6 + 1); - other.setWindowSizeIncrement(500 + 1); - final DynamicThrottlePolicySignature sigBase = new DynamicThrottlePolicySignature( - base); - final DynamicThrottlePolicySignature sigOther = new DynamicThrottlePolicySignature( - other); - assertFalse("The policies are different, but signatures are equal.", - sigBase.equals(sigOther)); + base.setEfficiencyThreshold(5) + .setMaxPendingCount(3) + .setMaxWindowSize(1e9) + .setMinWindowSize(1e5) + .setWeight(1.0) + .setWindowSizeBackOff(.6) + .setWindowSizeIncrement(500) + .setMaxThroughput(1e6) + .setMaxPendingSize(3 * 100); + other.setEfficiencyThreshold(5 + 1) + .setMaxPendingCount(3 + 1) + .setMaxThroughput(1e6 + 1) + .setMaxWindowSize(1e9 + 1) + .setMinWindowSize(1e5 + 1) + .setWeight(1.0 + 1) + .setWindowSizeBackOff(.6 + 1) + .setWindowSizeIncrement(500 + 1) + .setMaxPendingSize(3 * 100 + 1); + final DynamicThrottlePolicySignature sigBase = new DynamicThrottlePolicySignature(base); + final DynamicThrottlePolicySignature sigOther = new DynamicThrottlePolicySignature(other); + assertFalse("The policies are different, but signatures are equal.", sigBase.equals(sigOther)); assertTrue("Sigs created from same policy evaluated as different.", sigBase.equals(new DynamicThrottlePolicySignature(base))); - other.setEfficiencyThreshold(5); - other.setMaxPendingCount(3); - other.setMaxPendingSize(3 * 100); - other.setMaxThroughput(1e6); - other.setMaxWindowSize(1e9); - other.setMinWindowSize(1e5); - other.setWeight(1.0); - other.setWindowSizeBackOff(.6); - other.setWindowSizeIncrement(500); - assertTrue( - "Sigs created from different policies with same settings evaluated as different.", + other.setEfficiencyThreshold(5) + .setMaxPendingCount(3) + .setMaxThroughput(1e6) + .setMaxWindowSize(1e9) + .setMinWindowSize(1e5) + .setWeight(1.0) + .setWindowSizeBackOff(.6) + .setWindowSizeIncrement(500) + .setMaxPendingSize(3 * 100); + assertTrue("Sigs created from different policies with same settings evaluated as different.", sigBase.equals(new DynamicThrottlePolicySignature(other))); } @Test public final void unknownThrottlePolicySignature() { - final UnknownThrottlePolicySignature baseSig = new UnknownThrottlePolicySignature( - new StaticThrottlePolicy()); - final UnknownThrottlePolicySignature otherSig = new UnknownThrottlePolicySignature( - new StaticThrottlePolicy()); + final UnknownThrottlePolicySignature baseSig = new UnknownThrottlePolicySignature(new StaticThrottlePolicy()); + final UnknownThrottlePolicySignature otherSig = new UnknownThrottlePolicySignature(new StaticThrottlePolicy()); assertEquals(baseSig, baseSig); assertFalse(otherSig.equals(baseSig)); } @@ -107,7 +95,6 @@ public class MbusSessionKeyTestCase { final SourceSessionParams other = new SourceSessionParams(); assertEquals(new SourceSessionKey(base), new SourceSessionKey(other)); other.setTimeout(other.getTimeout() + 1); - assertFalse(new SourceSessionKey(base).equals(new SourceSessionKey( - other))); + assertFalse(new SourceSessionKey(base).equals(new SourceSessionKey(other))); } } |