Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix checkstyle issues to enforce it
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
ConfigTransactionManagerImplTest.java
diff --git
a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java
b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java
index 9595e60ff64ccc325f7d8079cd64fd51ba26ed3c..ede2a805a8c0a2814fd1d027bd276a645503a4ac 100644
(file)
--- a/
opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java
+++ b/
opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionManagerImplTest.java
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2013
, 2017
Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@
-7,17
+7,16
@@
*/
package org.opendaylight.controller.config.manager.impl;
*/
package org.opendaylight.controller.config.manager.impl;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+import javax.management.InstanceAlreadyExistsException;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import javax.management.InstanceAlreadyExistsException;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
public class ConfigTransactionManagerImplTest extends
AbstractConfigTest {
public class ConfigTransactionManagerImplTest extends
AbstractConfigTest {
@@
-33,7
+32,7
@@
public class ConfigTransactionManagerImplTest extends
try {
configRegistryJMXRegistrator.registerToJMX(mockedRegistry);
fail();
try {
configRegistryJMXRegistrator.registerToJMX(mockedRegistry);
fail();
- } catch (Exception e) {
+ } catch (
final InstanceAlreadyExists
Exception e) {
assertTrue(e instanceof InstanceAlreadyExistsException);
}
}
assertTrue(e instanceof InstanceAlreadyExistsException);
}
}
@@
-50,5
+49,4
@@
public class ConfigTransactionManagerImplTest extends
.createTransaction();
transaction.commit();
}
.createTransaction();
transaction.commit();
}
-
}
}