/*
 * Copyright (c) 2014, 2015 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,
 * 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.assertNotSame;
import static org.junit.Assert.assertSame;

import org.junit.Test;
import org.opendaylight.controller.cluster.datastore.node.utils.QNameFactory.Key;
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
    @Deprecated
    public void testBasicString() {
        QName expected = TestModel.AUG_NAME_QNAME;
        QName created = QNameFactory.create(expected.toString());
        assertNotSame(expected, created);
        assertEquals(expected, created);

        QName cached = QNameFactory.create(expected.toString());
        assertSame(created, cached);
    }

    @Test
    public void testBasic() {
        QName expected = TestModel.AUG_NAME_QNAME;
        QName created = QNameFactory.create(createKey(expected));
        assertNotSame(expected, created);
        assertEquals(expected, created);

        QName cached = QNameFactory.create(createKey(expected));
        assertSame(created, cached);
    }

    private static Key createKey(final QName qname) {
        return new Key(qname.getLocalName(), qname.getNamespace().toString(),
            qname.getRevision().map(Revision::toString).orElse(null));
    }
}

@@ -536,90 +536,8 @@
 st;%0A
-import org.opendaylight.controller.cluster.datastore.node.utils.QNameFactory.Key;%0A
 impo
@@ -1235,37 +1235,14 @@
 d = 
-QNameFactory.create(createKey
+lookup
 (exp
@@ -1239,33 +1239,32 @@
 lookup(expected)
-)
 ;%0A        assert
@@ -1360,37 +1360,14 @@
 d = 
-QNameFactory.create(createKey
+lookup
 (exp
@@ -1372,17 +1372,16 @@
 xpected)
-)
 ;%0A      
@@ -1441,21 +1441,20 @@
 tic 
-Key createKey
+QName lookup
 (fin
@@ -1490,15 +1490,27 @@
 urn 
-new Key
+QNameFactory.create
 (qna

Add QNameModule coding