Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rework ClusterSingletonServiceGroupImpl locking
[mdsal.git]
/
singleton-service
/
mdsal-singleton-dom-impl
/
src
/
test
/
java
/
org
/
opendaylight
/
mdsal
/
singleton
/
dom
/
impl
/
ClusterSingletonServiceGroupImplTest.java
diff --git
a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java
b/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java
index 5d681b00f1da1b6c1151c1c293d2f79a4d626f7f..e59453e15c50b17efa85e55961511fb2db4cdc43 100644
(file)
--- a/
singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java
+++ b/
singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImplTest.java
@@
-243,7
+243,7
@@
public class ClusterSingletonServiceGroupImplTest {
singletonServiceGroup.initialize();
verify(mockEosService).registerCandidate(MAIN_ENTITY);
singletonServiceGroup.registerService(firstReg);
singletonServiceGroup.initialize();
verify(mockEosService).registerCandidate(MAIN_ENTITY);
singletonServiceGroup.registerService(firstReg);
- assert
True
(singletonServiceGroup.unregisterService(firstReg));
+ assert
NotNull
(singletonServiceGroup.unregisterService(firstReg));
verify(mockClusterSingletonService, never()).closeServiceInstance();
}
verify(mockClusterSingletonService, never()).closeServiceInstance();
}
@@
-260,7
+260,7
@@
public class ClusterSingletonServiceGroupImplTest {
verify(mockEosService).registerCandidate(MAIN_ENTITY);
singletonServiceGroup.registerService(firstReg);
singletonServiceGroup.registerService(secondReg);
verify(mockEosService).registerCandidate(MAIN_ENTITY);
singletonServiceGroup.registerService(firstReg);
singletonServiceGroup.registerService(secondReg);
- assert
False
(singletonServiceGroup.unregisterService(firstReg));
+ assert
Null
(singletonServiceGroup.unregisterService(firstReg));
verify(mockClusterSingletonService, never()).closeServiceInstance();
}
verify(mockClusterSingletonService, never()).closeServiceInstance();
}
@@
-384,7
+384,7
@@
public class ClusterSingletonServiceGroupImplTest {
verify(mockClusterSingletonService).instantiateServiceInstance();
// Base entity in jeopardy should not matter...
verify(mockClusterSingletonService).instantiateServiceInstance();
// Base entity in jeopardy should not matter...
- singletonServiceGroup.ownershipChanged(getEntityToJeopardy());
+ singletonServiceGroup.ownershipChanged(getEntityTo
Master
Jeopardy());
verify(mockClusterSingletonService, never()).closeServiceInstance();
// ... application state is actually guarded by cleanup
verify(mockClusterSingletonService, never()).closeServiceInstance();
// ... application state is actually guarded by cleanup
@@
-416,7
+416,7
@@
public class ClusterSingletonServiceGroupImplTest {
* Not initialized provider has to close and remove all singletonServices from Group and
* Group itself remove too.
*/
* Not initialized provider has to close and remove all singletonServices from Group and
* Group itself remove too.
*/
- @Test(expected =
Runtim
eException.class)
+ @Test(expected =
IllegalStat
eException.class)
public void tryToTakeLeaderForNotInitializedGroupTest() {
singletonServiceGroup.registerService(firstReg);
}
public void tryToTakeLeaderForNotInitializedGroupTest() {
singletonServiceGroup.registerService(firstReg);
}
@@
-436,7
+436,7
@@
public class ClusterSingletonServiceGroupImplTest {
verify(mockEosService).registerCandidate(CLOSE_ENTITY);
singletonServiceGroup.ownershipChanged(getDoubleEntityToMaster());
verify(mockClusterSingletonService).instantiateServiceInstance();
verify(mockEosService).registerCandidate(CLOSE_ENTITY);
singletonServiceGroup.ownershipChanged(getDoubleEntityToMaster());
verify(mockClusterSingletonService).instantiateServiceInstance();
- assert
True
(singletonServiceGroup.unregisterService(firstReg));
+ assert
NotNull
(singletonServiceGroup.unregisterService(firstReg));
verify(mockClusterSingletonService, never()).closeServiceInstance();
singletonServiceGroup.ownershipChanged(getEntityToSlaveNoMaster());
verify(mockClusterSingletonService).closeServiceInstance();
verify(mockClusterSingletonService, never()).closeServiceInstance();
singletonServiceGroup.ownershipChanged(getEntityToSlaveNoMaster());
verify(mockClusterSingletonService).closeServiceInstance();
@@
-486,18
+486,16
@@
public class ClusterSingletonServiceGroupImplTest {
ExecutionException {
initializeGroupAndStartService();
ExecutionException {
initializeGroupAndStartService();
- assert
True
(singletonServiceGroup.unregisterService(firstReg));
+ assert
NotNull
(singletonServiceGroup.unregisterService(firstReg));
verify(mockClusterSingletonService, never()).closeServiceInstance();
verify(mockClusterSingletonService, never()).closeServiceInstance();
- verify(mockEntityCandReg
, never()
).close();
+ verify(mockEntityCandReg).close();
final ListenableFuture<?> future = singletonServiceGroup.closeClusterSingletonGroup();
assertNotNull(future);
assertFalse(future.isDone());
final ListenableFuture<?> future = singletonServiceGroup.closeClusterSingletonGroup();
assertNotNull(future);
assertFalse(future.isDone());
- verify(mockClusterSingletonService, never()).closeServiceInstance();
- verify(mockEntityCandReg).close();
+ verify(mockClusterSingletonService).closeServiceInstance();
singletonServiceGroup.ownershipChanged(getEntityToSlave());
singletonServiceGroup.ownershipChanged(getEntityToSlave());
- verify(mockClusterSingletonService).closeServiceInstance();
verify(mockCloseEntityCandReg).close();
singletonServiceGroup.ownershipChanged(getDoubleEntityToSlave());
verify(mockCloseEntityCandReg).close();
singletonServiceGroup.ownershipChanged(getDoubleEntityToSlave());
@@
-533,6
+531,11
@@
public class ClusterSingletonServiceGroupImplTest {
EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NO_OWNER);
}
EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NO_OWNER);
}
+ private static GenericEntityOwnershipChange<TestInstanceIdentifier, TestEntity> getEntityToMasterJeopardy() {
+ return new GenericEntityOwnershipChange<>(MAIN_ENTITY,
+ EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED, true);
+ }
+
private static GenericEntityOwnershipChange<TestInstanceIdentifier, TestEntity> getEntityToJeopardy() {
return new GenericEntityOwnershipChange<>(MAIN_ENTITY,
EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER, true);
private static GenericEntityOwnershipChange<TestInstanceIdentifier, TestEntity> getEntityToJeopardy() {
return new GenericEntityOwnershipChange<>(MAIN_ENTITY,
EntityOwnershipChangeState.REMOTE_OWNERSHIP_LOST_NO_OWNER, true);