Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate users of Optional.get()
[controller.git]
/
opendaylight
/
md-sal
/
eos-dom-akka
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
eos
/
akka
/
AkkaEntityOwnershipServiceTest.java
diff --git
a/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java
b/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java
index 199e7931bb1e8a6234302a91ff2e1b23f0f3c970..dc4afb426a5bb26bba17c66f43a3dcefa901b739 100644
(file)
--- a/
opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java
+++ b/
opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java
@@
-252,9
+252,7
@@
public class AkkaEntityOwnershipServiceTest extends AbstractNativeEosTest {
private static void verifyGetOwnershipState(final DOMEntityOwnershipService service, final DOMEntity entity,
final EntityOwnershipState expState) {
await().atMost(Duration.ofSeconds(5)).untilAsserted(() -> {
private static void verifyGetOwnershipState(final DOMEntityOwnershipService service, final DOMEntity entity,
final EntityOwnershipState expState) {
await().atMost(Duration.ofSeconds(5)).untilAsserted(() -> {
- final Optional<EntityOwnershipState> state = service.getOwnershipState(entity);
- assertTrue("getOwnershipState present", state.isPresent());
- assertEquals("EntityOwnershipState", expState, state.get());
+ assertEquals(Optional.of(expState), service.getOwnershipState(entity));
});
}
});
}
@@
-316,4
+314,4
@@
public class AkkaEntityOwnershipServiceTest extends AbstractNativeEosTest {
assertNotNull("EntityOwnershipCandidateRegistration null", reg);
assertEquals("getInstance", entity, reg.getInstance());
}
assertNotNull("EntityOwnershipCandidateRegistration null", reg);
assertEquals("getInstance", entity, reg.getInstance());
}
-}
\ No newline at end of file
+}