Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug-2301 - Clustering:Snapshots need not be stored in in-mem ReplicatedLog...
[controller.git]
/
opendaylight
/
config
/
yang-jmx-generator
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
config
/
yangjmxgenerator
/
AbstractYangTest.java
diff --git
a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java
b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java
index b9f2ba9cd1012c2d861212d9fc50ec02b32d051e..e3c3a3024c8b4819b6083fd480e3831f3fbfe292 100644
(file)
--- a/
opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java
+++ b/
opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/AbstractYangTest.java
@@
-7,8
+7,7
@@
*/
package org.opendaylight.controller.config.yangjmxgenerator;
*/
package org.opendaylight.controller.config.yangjmxgenerator;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.format;
+import static org.junit.Assert.assertNotNull;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@
-92,8
+91,8
@@
public abstract class AbstractYangTest {
QName qName = identitySchemaNode.getQName();
Preconditions.checkArgument(
result.containsKey(qName) == false,
QName qName = identitySchemaNode.getQName();
Preconditions.checkArgument(
result.containsKey(qName) == false,
-
format("Two identities of %s contain same " + "
qname %s",
- module, qName)
)
;
+
"Two identities of %s contain same
qname %s",
+ module, qName);
result.put(qName, identitySchemaNode);
}
return result;
result.put(qName, identitySchemaNode);
}
return result;