X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2Futils%2FQNameFactoryTest.java;h=557675edb9cb46bb6a0abdf1db22e96f99a56db2;hb=2d72ea2f5f6860a8e2bb2ae12212ac35b0cd8b99;hp=9515240e932e76031109658e26e50b50ac44b6ba;hpb=917283d6f5633ad981bebb6dfc6d6e0245876ab5;p=controller.git 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 9515240e93..557675edb9 100644 --- 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,32 +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 */ - package org.opendaylight.controller.cluster.datastore.node.utils; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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.opendaylight.yangtools.yang.common.Revision; public class QNameFactoryTest { @Test - public void testBasic() { + @Deprecated + public void testBasicString() { 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()); + 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); + + QName cached = lookup(expected); + assertSame(created, cached); + } - assertTrue(cached == created); + private static QName lookup(final QName qname) { + return QNameFactory.create(qname.getLocalName(), qname.getNamespace().toString(), + qname.getRevision().map(Revision::toString).orElse(null)); } }