diff --git a/src/test/java/emissary/core/sentinel/protocols/ProtocolTest.java b/src/test/java/emissary/core/sentinel/protocols/ProtocolTest.java index 95fac679b1..c6a8042402 100644 --- a/src/test/java/emissary/core/sentinel/protocols/ProtocolTest.java +++ b/src/test/java/emissary/core/sentinel/protocols/ProtocolTest.java @@ -44,7 +44,7 @@ class ProtocolTest extends UnitTest { Rule rule1 = mock(Rule.class); Action action = mock(Action.class); Map trackers; - final String TO_UPPER_LOWER_PATTER = "To(?:Lower|Upper)Place"; + final String TO_UPPER_LOWER_PATTERN = "To(?:Lower|Upper)Place"; final String TO_LOWER_PLACE = "ToLowerPlace"; final String TO_UPPER_PLACE = "ToUpperPlace"; final int DEFAULT_POOL_SIZE = 5; @@ -150,8 +150,8 @@ void protocol1() { Protocol protocol = new Protocol(); protocol.action = action; - protocol.rules.put("TEST_RULE1", new AllMaxTime("rule1", TO_UPPER_LOWER_PATTER, 5, 1.0)); - protocol.rules.put("TEST_RULE2", new AnyMaxTime("rule2", TO_UPPER_LOWER_PATTER, 30, 0.2)); + protocol.rules.put("TEST_RULE1", new AllMaxTime("rule1", TO_UPPER_LOWER_PATTERN, 5, 1.0)); + protocol.rules.put("TEST_RULE2", new AnyMaxTime("rule2", TO_UPPER_LOWER_PATTERN, 30, 0.2)); testProtocol(protocol, action, trackers(), DEFAULT_POOL_SIZE, 1); testProtocol(protocol, action, trackers(), DEFAULT_POOL_SIZE + 1, 0); @@ -163,8 +163,8 @@ void protocol2() { Protocol protocol = new Protocol(); protocol.action = action; - protocol.rules.put("TEST_RULE1", new AllMaxTime("rule1", TO_UPPER_LOWER_PATTER, 5, 1.0)); - protocol.rules.put("TEST_RULE2", new AnyMaxTime("rule2", TO_UPPER_LOWER_PATTER, 40, 0.2)); + protocol.rules.put("TEST_RULE1", new AllMaxTime("rule1", TO_UPPER_LOWER_PATTERN, 5, 1.0)); + protocol.rules.put("TEST_RULE2", new AnyMaxTime("rule2", TO_UPPER_LOWER_PATTERN, 40, 0.2)); testProtocol(protocol, action, trackers(), DEFAULT_POOL_SIZE, 0); } @@ -175,7 +175,7 @@ void protocol3() { Protocol protocol = new Protocol(); protocol.action = action; - protocol.rules.put("TEST_RULE", new AnyMaxTime("LongRunning", TO_UPPER_LOWER_PATTER, 30, 0.01)); + protocol.rules.put("TEST_RULE", new AnyMaxTime("LongRunning", TO_UPPER_LOWER_PATTERN, 30, 0.01)); testProtocol(protocol, action, trackers(), DEFAULT_POOL_SIZE, 1); } diff --git a/src/test/java/emissary/core/sentinel/protocols/rules/AllMaxTimeTest.java b/src/test/java/emissary/core/sentinel/protocols/rules/AllMaxTimeTest.java index ea7bb6e38a..e2f3cba009 100644 --- a/src/test/java/emissary/core/sentinel/protocols/rules/AllMaxTimeTest.java +++ b/src/test/java/emissary/core/sentinel/protocols/rules/AllMaxTimeTest.java @@ -22,7 +22,7 @@ class AllMaxTimeTest extends UnitTest { Collection placeAgentStats; - final String TO_UPPER_LOWER_PATTER = "To(?:Lower|Upper)Place"; + final String TO_UPPER_LOWER_PATTERN = "To(?:Lower|Upper)Place"; final String TO_LOWER_PLACE = "ToLowerPlace"; final String TO_UPPER_PLACE = "ToUpperPlace"; final int DEFAULT_POOL_SIZE = 5; @@ -69,12 +69,12 @@ void notOverTimeLimit() { @Test void condition1() { - testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE, true); + testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE, true); } @Test void condition2() { - testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE + 1, false); + testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE + 1, false); } @Test @@ -89,17 +89,17 @@ void condition4() { @Test void condition5() { - testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT + 1, 1.0), stats(), DEFAULT_POOL_SIZE, false); + testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT + 1, 1.0), stats(), DEFAULT_POOL_SIZE, false); } @Test void condition6() { - testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT + 1, 0.75), stats(), DEFAULT_POOL_SIZE, false); + testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT + 1, 0.75), stats(), DEFAULT_POOL_SIZE, false); } @Test void condition7() { - testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT, 0.5), stats(), DEFAULT_POOL_SIZE, true); + testRule(new AllMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT, 0.5), stats(), DEFAULT_POOL_SIZE, true); } @Test diff --git a/src/test/java/emissary/core/sentinel/protocols/rules/AnyMaxTimeTest.java b/src/test/java/emissary/core/sentinel/protocols/rules/AnyMaxTimeTest.java index 7014e8bcfe..f907d2d32b 100644 --- a/src/test/java/emissary/core/sentinel/protocols/rules/AnyMaxTimeTest.java +++ b/src/test/java/emissary/core/sentinel/protocols/rules/AnyMaxTimeTest.java @@ -22,7 +22,7 @@ class AnyMaxTimeTest extends UnitTest { Collection placeAgentStats; - final String TO_UPPER_LOWER_PATTER = "To(?:Lower|Upper)Place"; + final String TO_UPPER_LOWER_PATTERN = "To(?:Lower|Upper)Place"; final String TO_LOWER_PLACE = "ToLowerPlace"; final String TO_UPPER_PLACE = "ToUpperPlace"; final int DEFAULT_POOL_SIZE = 5; @@ -69,22 +69,22 @@ void notOverTimeLimit() { @Test void condition1() { - testRule(new AnyMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE, true); + testRule(new AnyMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE, true); } @Test void condition2() { - testRule(new AnyMaxTime("rule1", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE + 1, false); + testRule(new AnyMaxTime("rule1", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT, 1.0), stats(), DEFAULT_POOL_SIZE + 1, false); } @Test void condition3() { - testRule(new AnyMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT + 1, 1.0), stats(), DEFAULT_POOL_SIZE, false); + testRule(new AnyMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT + 1, 1.0), stats(), DEFAULT_POOL_SIZE, false); } @Test void condition4() { - testRule(new AnyMaxTime("rule", TO_UPPER_LOWER_PATTER, DEFAULT_TIME_LIMIT + 1, 1.0), stats(), DEFAULT_POOL_SIZE + 1, false); + testRule(new AnyMaxTime("rule", TO_UPPER_LOWER_PATTERN, DEFAULT_TIME_LIMIT + 1, 1.0), stats(), DEFAULT_POOL_SIZE + 1, false); } @Test