X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fimpl%2FYangParserSimpleTest.java;h=0320fa123a3d9484cb4aece830279d98b331e010;hb=0eb60011b52e4e56c62b47a36eb334f2c3b3ad6a;hp=dfbcc74e47a04c5d033f71bda753067596651757;hpb=dd2edcd83da73c13333e496c7ae9aa59a5111d15;p=yangtools.git diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java index dfbcc74e47..0320fa123a 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java @@ -7,7 +7,11 @@ */ package org.opendaylight.yangtools.yang.parser.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.net.URI; import java.text.DateFormat; @@ -17,11 +21,21 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; - import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.*; +import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; +import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; +import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; +import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; +import org.opendaylight.yangtools.yang.model.api.Module; +import org.opendaylight.yangtools.yang.model.api.MustDefinition; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.Status; +import org.opendaylight.yangtools.yang.model.api.TypeDefinition; +import org.opendaylight.yangtools.yang.model.api.UsesNode; public class YangParserSimpleTest { private final URI snNS = URI.create("urn:opendaylight:simple-nodes"); @@ -46,7 +60,6 @@ public class YangParserSimpleTest { // test SchemaNode args QName qname = data.getQName(); assertEquals("data", qname.getLocalName()); - assertEquals(snPref, qname.getPrefix()); assertEquals(snNS, qname.getNamespace()); assertEquals(snRev, qname.getRevision()); assertEquals("anyxml desc", data.getDescription()); @@ -146,8 +159,8 @@ public class YangParserSimpleTest { assertEquals(typedefQName, nodesType.getQName()); SchemaPath nodesTypePath = TestUtils.createPath(true, snNS, snRev, snPref, "nodes", "nodes-type"); assertEquals(nodesTypePath, nodesType.getPath()); - assertNull(nodesType.getDescription()); - assertNull(nodesType.getReference()); + assertTrue(nodesType.getDescription().isEmpty()); + assertTrue(nodesType.getReference().isEmpty()); assertEquals(Status.CURRENT, nodesType.getStatus()); assertEquals(0, nodesType.getUnknownSchemaNodes().size()); @@ -180,7 +193,7 @@ public class YangParserSimpleTest { private Date rev; private final String prefix = "sn"; - private SchemaPath createPath(String... names) { + private SchemaPath createPath(final String... names) { try { rev = new SimpleDateFormat("yyyy-MM-dd").parse("2013-07-30"); } catch (ParseException e) { @@ -191,7 +204,7 @@ public class YangParserSimpleTest { for (String name : names) { path.add(new QName(ns, rev, prefix, name)); } - return new SchemaPath(path, true); + return SchemaPath.create(path, true); } }