Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add QNameModule coding
[controller.git]
/
opendaylight
/
md-sal
/
sal-clustering-commons
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
node
/
utils
/
QNameFactoryTest.java
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactoryTest.java
b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactoryTest.java
index c2b7c07fa58e431df3560abe1db473f76e17e541..557675edb9cb46bb6a0abdf1db22e96f99a56db2 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactoryTest.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactoryTest.java
@@
-5,33
+5,44
@@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.datastore.node.utils;
package org.opendaylight.controller.cluster.datastore.node.utils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
import org.junit.Test;
import org.opendaylight.controller.cluster.datastore.util.TestModel;
import org.opendaylight.yangtools.yang.common.QName;
import org.junit.Test;
import org.opendaylight.controller.cluster.datastore.util.TestModel;
import org.opendaylight.yangtools.yang.common.QName;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.opendaylight.yangtools.yang.common.Revision;
public class QNameFactoryTest {
@Test
public class QNameFactoryTest {
@Test
- public void testBasic(){
+ @Deprecated
+ public void testBasicString() {
QName expected = TestModel.AUG_NAME_QNAME;
QName created = QNameFactory.create(expected.toString());
QName expected = TestModel.AUG_NAME_QNAME;
QName created = QNameFactory.create(expected.toString());
-
- assertFalse( expected == created);
-
+ assertNotSame(expected, created);
assertEquals(expected, created);
QName cached = QNameFactory.create(expected.toString());
assertEquals(expected, created);
QName cached = QNameFactory.create(expected.toString());
+ assertSame(created, cached);
+ }
- assertEquals(expected, cached);
+ @Test
+ public void testBasic() {
+ QName expected = TestModel.AUG_NAME_QNAME;
+ QName created = lookup(expected);
+ assertNotSame(expected, created);
+ assertEquals(expected, created);
- assertTrue( cached == created );
+ QName cached = lookup(expected);
+ assertSame(created, cached);
}
}
+ private static QName lookup(final QName qname) {
+ return QNameFactory.create(qname.getLocalName(), qname.getNamespace().toString(),
+ qname.getRevision().map(Revision::toString).orElse(null));
+ }
}
}