Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove unused exceptions
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
SimpleShardDataTreeCohortTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java
index be19a3d0da804b78abf29489bfd5449aad53e5cb..34d36b058bbea8f35c5f5370df2ee8098e85918c 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohortTest.java
@@
-53,7
+53,7
@@
public class SimpleShardDataTreeCohortTest extends AbstractTest {
private SimpleShardDataTreeCohort cohort;
@Before
private SimpleShardDataTreeCohort cohort;
@Before
- public void setup()
throws Exception
{
+ public void setup() {
MockitoAnnotations.initMocks(this);
doReturn(Optional.empty()).when(mockUserCohorts).commit();
MockitoAnnotations.initMocks(this);
doReturn(Optional.empty()).when(mockUserCohorts).commit();
@@
-64,7
+64,7
@@
public class SimpleShardDataTreeCohortTest extends AbstractTest {
}
@Test
}
@Test
- public void testCanCommitSuccess()
throws Exception
{
+ public void testCanCommitSuccess() {
canCommitSuccess();
}
canCommitSuccess();
}
@@
-82,7
+82,7
@@
public class SimpleShardDataTreeCohortTest extends AbstractTest {
verifyNoMoreInteractions(callback);
}
verifyNoMoreInteractions(callback);
}
- private void testValidatationPropagates(final Exception cause)
throws DataValidationFailedException
{
+ private void testValidatationPropagates(final Exception cause) {
doAnswer(invocation -> {
invocation.getArgumentAt(0, SimpleShardDataTreeCohort.class).failedCanCommit(cause);
return null;
doAnswer(invocation -> {
invocation.getArgumentAt(0, SimpleShardDataTreeCohort.class).failedCanCommit(cause);
return null;
@@
-97,17
+97,17
@@
public class SimpleShardDataTreeCohortTest extends AbstractTest {
}
@Test
}
@Test
- public void testCanCommitWithConflictingModEx()
throws DataValidationFailedException
{
+ public void testCanCommitWithConflictingModEx() {
testValidatationPropagates(new ConflictingModificationAppliedException(YangInstanceIdentifier.EMPTY, "mock"));
}
@Test
testValidatationPropagates(new ConflictingModificationAppliedException(YangInstanceIdentifier.EMPTY, "mock"));
}
@Test
- public void testCanCommitWithDataValidationEx()
throws DataValidationFailedException
{
+ public void testCanCommitWithDataValidationEx() {
testValidatationPropagates(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock"));
}
@Test
testValidatationPropagates(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock"));
}
@Test
- public void testCanCommitWithIllegalArgumentEx()
throws DataValidationFailedException
{
+ public void testCanCommitWithIllegalArgumentEx() {
testValidatationPropagates(new IllegalArgumentException("mock"));
}
testValidatationPropagates(new IllegalArgumentException("mock"));
}
@@
-131,7
+131,7
@@
public class SimpleShardDataTreeCohortTest extends AbstractTest {
}
@Test
}
@Test
- public void testPreCommitAndCommitSuccess()
throws Exception
{
+ public void testPreCommitAndCommitSuccess() {
canCommitSuccess();
final DataTreeCandidateTip candidate = preCommitSuccess();
canCommitSuccess();
final DataTreeCandidateTip candidate = preCommitSuccess();
@@
-152,7
+152,7
@@
public class SimpleShardDataTreeCohortTest extends AbstractTest {
}
@Test
}
@Test
- public void testPreCommitWithIllegalArgumentEx()
throws Exception
{
+ public void testPreCommitWithIllegalArgumentEx() {
canCommitSuccess();
final Exception cause = new IllegalArgumentException("mock");
canCommitSuccess();
final Exception cause = new IllegalArgumentException("mock");
@@
-172,7
+172,7
@@
public class SimpleShardDataTreeCohortTest extends AbstractTest {
}
@Test
}
@Test
- public void testPreCommitWithReportedFailure()
throws Exception
{
+ public void testPreCommitWithReportedFailure() {
canCommitSuccess();
final Exception cause = new IllegalArgumentException("mock");
canCommitSuccess();
final Exception cause = new IllegalArgumentException("mock");