Skip to content

Commit

Permalink
cleaned up tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dev-mlb
dev-mlb committed Dec 21, 2023
1 parent 2bcc1d8 commit 3c3073e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions src/test/java/emissary/core/sentinel/protocols/ProtocolTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ProtocolTest extends UnitTest {
Rule rule1 = mock(Rule.class);
Action action = mock(Action.class);
Map<String, Sentinel.Tracker> 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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/emissary/core/sentinel/protocols/rules/AllMaxTimeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class AllMaxTimeTest extends UnitTest {

Collection<Protocol.PlaceAgentStats> 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;
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/emissary/core/sentinel/protocols/rules/AnyMaxTimeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class AnyMaxTimeTest extends UnitTest {

Collection<Protocol.PlaceAgentStats> 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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3c3073e

Please sign in to comment.