Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Spring Aspect logging"
[nonrtric.git]
/
policy-agent
/
src
/
test
/
java
/
org
/
oransc
/
policyagent
/
tasks
/
ServiceSupervisionTest.java
diff --git
a/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
b/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
index
381c2d1
..
070e8da
100644
(file)
--- a/
policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
+++ b/
policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
@@
-31,8
+31,10
@@
import static org.mockito.Mockito.when;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
+
import java.time.Duration;
import java.util.Collections;
import java.time.Duration;
import java.util.Collections;
+
import org.awaitility.Durations;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.awaitility.Durations;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@
-99,7
+101,7
@@
public class ServiceSupervisionTest {
await().atMost(Durations.FIVE_SECONDS).with().pollInterval(Durations.ONE_SECOND).until(service::isExpired);
await().atMost(Durations.FIVE_SECONDS).with().pollInterval(Durations.ONE_SECOND).until(service::isExpired);
- serviceSupervisionUnderTest.checkAllServices();
+ serviceSupervisionUnderTest.checkAllServices()
.blockLast()
;
assertThat(policies.size()).isEqualTo(0);
assertThat(services.size()).isEqualTo(0);
assertThat(policies.size()).isEqualTo(0);
assertThat(services.size()).isEqualTo(0);
@@
-123,7
+125,7
@@
public class ServiceSupervisionTest {
final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(ServiceSupervision.class, WARN);
final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(ServiceSupervision.class, WARN);
- serviceSupervisionUnderTest.checkAllServices();
+ serviceSupervisionUnderTest.checkAllServices()
.blockLast()
;
assertThat(policies.size()).isEqualTo(0);
assertThat(services.size()).isEqualTo(0);
assertThat(policies.size()).isEqualTo(0);
assertThat(services.size()).isEqualTo(0);
@@
-141,7
+143,7
@@
public class ServiceSupervisionTest {
ServiceSupervision serviceSupervisionUnderTest =
new ServiceSupervision(services, policies, a1ClientFactoryMock);
ServiceSupervision serviceSupervisionUnderTest =
new ServiceSupervision(services, policies, a1ClientFactoryMock);
- serviceSupervisionUnderTest.checkAllServices();
+ serviceSupervisionUnderTest.checkAllServices()
.blockLast()
;
assertThat(policies.size()).isEqualTo(1);
assertThat(services.size()).isEqualTo(1);
assertThat(policies.size()).isEqualTo(1);
assertThat(services.size()).isEqualTo(1);
@@
-157,7
+159,7
@@
public class ServiceSupervisionTest {
ServiceSupervision serviceSupervisionUnderTest =
new ServiceSupervision(services, policies, a1ClientFactoryMock);
ServiceSupervision serviceSupervisionUnderTest =
new ServiceSupervision(services, policies, a1ClientFactoryMock);
- serviceSupervisionUnderTest.checkAllServices();
+ serviceSupervisionUnderTest.checkAllServices()
.blockLast()
;
assertThat(policies.size()).isEqualTo(1);
assertThat(services.size()).isEqualTo(1);
assertThat(policies.size()).isEqualTo(1);
assertThat(services.size()).isEqualTo(1);