import com.google.common.collect.Iterables;
import java.net.URI;
-import java.text.DateFormat;
-import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
+import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
private static final URI T1_NS = URI.create("urn:simple.demo.test1");
private static final URI T2_NS = URI.create("urn:simple.demo.test2");
private static final URI T3_NS = URI.create("urn:simple.demo.test3");
- private static Date rev;
+ private static final Revision REV = Revision.of("2013-06-18");
private static final StatementStreamSource BAR = sourceForResource("/model/bar.yang");
private static final StatementStreamSource BAZ = sourceForResource("/model/baz.yang");
sourceForResource("/ietf/network-topology@2013-07-12.yang"),
sourceForResource("/ietf/network-topology@2013-10-21.yang") };
- @BeforeClass
- public static void init() throws ParseException {
- final DateFormat simpleDateFormat = SimpleDateFormatUtil.getRevisionFormat();
- rev = simpleDateFormat.parse("2013-06-18");
- }
-
@Test
public void testTypeFromContext() throws Exception {
final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
- final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-4-4.yang");
+ final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-04-04.yang");
final StatementStreamSource test1 = sourceForResource("/context-test/test1.yang");
reactor.addSources(IETF);
final SchemaContext context = reactor.buildEffective();
- final Module module = context.findModuleByName("test1",
- SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
- assertNotNull(module);
-
+ final Module module = context.findModule("test1", Revision.of("2013-06-18")).get();
final LeafSchemaNode leaf = (LeafSchemaNode) module.getDataChildByName(QName.create(module.getQNameModule(),
"id"));
final UnsignedIntegerTypeDefinition leafType = (UnsignedIntegerTypeDefinition) leaf.getType();
QName qname = leafType.getQName();
assertEquals(URI.create("urn:simple.demo.test1"), qname.getNamespace());
- assertEquals(SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"), qname.getRevision());
+ assertEquals(Revision.ofNullable("2013-06-18"), qname.getRevision());
assertEquals("port-number", qname.getLocalName());
final UnsignedIntegerTypeDefinition leafBaseType = leafType.getBaseType();
qname = leafBaseType.getQName();
assertEquals(URI.create("urn:ietf:params:xml:ns:yang:ietf-inet-types"), qname.getNamespace());
- assertEquals(SimpleDateFormatUtil.getRevisionFormat().parse("2010-09-24"), qname.getRevision());
+ assertEquals(Revision.ofNullable("2010-09-24"), qname.getRevision());
assertEquals("port-number", qname.getLocalName());
final UnsignedIntegerTypeDefinition dscpExt = (UnsignedIntegerTypeDefinition) TestUtils.findTypedef(
reactor.addSources(BAZ, FOO, BAR, SUBFOO, test2);
final SchemaContext context = reactor.buildEffective();
- final Module testModule = context.findModuleByName("test2",
- SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
- assertNotNull(testModule);
-
- final Module contextModule = context.findModuleByNamespace(URI.create("urn:opendaylight.baz")).iterator()
- .next();
+ final Module testModule = context.findModule("test2", Revision.of("2013-06-18")).get();
+ final Module contextModule = context.findModules(URI.create("urn:opendaylight.baz")).iterator().next();
assertNotNull(contextModule);
final Set<GroupingDefinition> groupings = contextModule.getGroupings();
assertEquals(1, groupings.size());
reactor.addSources(BAZ, FOO, BAR, SUBFOO, test2);
final SchemaContext context = reactor.buildEffective();
- final Module module = context.findModuleByName("test2",
- SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
- assertNotNull(module);
+ final Module module = context.findModule("test2", Revision.of("2013-06-18")).get();
final ContainerSchemaNode peer = (ContainerSchemaNode) module.getDataChildByName(QName.create(
module.getQNameModule(), "peer"));
final ContainerSchemaNode destination = (ContainerSchemaNode) peer.getDataChildByName(QName.create(
// test grouping path
final List<QName> path = new ArrayList<>();
- final QName qname = QName.create(URI.create("urn:opendaylight.baz"),
- SimpleDateFormatUtil.getRevisionFormat().parse("2013-02-27"), "target");
+ final QName qname = QName.create(URI.create("urn:opendaylight.baz"), Revision.of("2013-02-27"), "target");
path.add(qname);
final SchemaPath expectedPath = SchemaPath.create(path, true);
assertEquals(expectedPath, usesNode.getGroupingPath());
// leaf address
assertNotNull(refineLeaf);
assertEquals("address", refineLeaf.getQName().getLocalName());
- assertEquals("description of address defined by refine", refineLeaf.getDescription());
- assertEquals("address reference added by refine", refineLeaf.getReference());
+ assertEquals(Optional.of("description of address defined by refine"), refineLeaf.getDescription());
+ assertEquals(Optional.of("address reference added by refine"), refineLeaf.getReference());
assertFalse(refineLeaf.isConfiguration());
assertTrue(refineLeaf.getConstraints().isMandatory());
final Set<MustDefinition> leafMustConstraints = refineLeaf.getConstraints().getMustConstraints();
assertNotNull(refineContainer);
final Set<MustDefinition> mustConstraints = refineContainer.getConstraints().getMustConstraints();
assertTrue(mustConstraints.isEmpty());
- assertEquals("description of port defined by refine", refineContainer.getDescription());
- assertEquals("port reference added by refine", refineContainer.getReference());
+ assertEquals(Optional.of("description of port defined by refine"), refineContainer.getDescription());
+ assertEquals(Optional.of("port reference added by refine"), refineContainer.getReference());
assertFalse(refineContainer.isConfiguration());
assertTrue(refineContainer.isPresenceContainer());
// list addresses
assertNotNull(refineList);
- assertEquals("description of addresses defined by refine", refineList.getDescription());
- assertEquals("addresses reference added by refine", refineList.getReference());
+ assertEquals(Optional.of("description of addresses defined by refine"), refineList.getDescription());
+ assertEquals(Optional.of("addresses reference added by refine"), refineList.getReference());
assertFalse(refineList.isConfiguration());
assertEquals(2, (int) refineList.getConstraints().getMinElements());
assertEquals(12, (int) refineList.getConstraints().getMaxElements());
final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
- final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-4-4.yang");
+ final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-04-04.yang");
final StatementStreamSource test3 = sourceForResource("/context-test/test3.yang");
reactor.addSources(IETF);
reactor.addSources(types, test3);
final SchemaContext context = reactor.buildEffective();
- final Module module = context.findModuleByName("test3",
- SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
- assertNotNull(module);
-
+ final Module module = context.findModule("test3", Revision.of("2013-06-18")).get();
final Set<IdentitySchemaNode> identities = module.getIdentities();
assertEquals(1, identities.size());
final IdentitySchemaNode identity = identities.iterator().next();
final QName idQName = identity.getQName();
assertEquals(URI.create("urn:simple.demo.test3"), idQName.getNamespace());
- assertEquals(SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"), idQName.getRevision());
+ assertEquals(Revision.ofNullable("2013-06-18"), idQName.getRevision());
assertEquals("pt", idQName.getLocalName());
final IdentitySchemaNode baseIdentity = Iterables.getOnlyElement(identity.getBaseIdentities());
final QName idBaseQName = baseIdentity.getQName();
assertEquals(URI.create("urn:custom.types.demo"), idBaseQName.getNamespace());
- assertEquals(SimpleDateFormatUtil.getRevisionFormat().parse("2012-04-16"), idBaseQName.getRevision());
+ assertEquals(Revision.ofNullable("2012-04-16"), idBaseQName.getRevision());
assertEquals("service-type", idBaseQName.getLocalName());
}
final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
- final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-4-4.yang");
+ final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-04-04.yang");
final StatementStreamSource test3 = sourceForResource("/context-test/test3.yang");
reactor.addSources(IETF);
final SchemaContext context = reactor.buildEffective();
- final Module module = context.findModuleByName("test3",
- SimpleDateFormatUtil.getRevisionFormat().parse("2013-06-18"));
- assertNotNull(module);
-
+ final Module module = context.findModule("test3", Revision.of("2013-06-18")).get();
final ContainerSchemaNode network = (ContainerSchemaNode) module.getDataChildByName(QName.create(
module.getQNameModule(), "network"));
final List<UnknownSchemaNode> unknownNodes = network.getUnknownSchemaNodes();
final UnknownSchemaNode un = unknownNodes.get(0);
final QName unType = un.getNodeType();
assertEquals(URI.create("urn:custom.types.demo"), unType.getNamespace());
- assertEquals(SimpleDateFormatUtil.getRevisionFormat().parse("2012-04-16"), unType.getRevision());
+ assertEquals(Revision.ofNullable("2012-04-16"), unType.getRevision());
assertEquals("mountpoint", unType.getLocalName());
assertEquals("point", un.getNodeParameter());
assertNotNull(un.getExtensionDefinition());
// test augmentation process
final ContainerSchemaNode augmentHolder = (ContainerSchemaNode) ifEntry.getDataChildByName(QName.create(T3_NS,
- rev, "augment-holder"));
+ REV, "augment-holder"));
assertNotNull(augmentHolder);
- final DataSchemaNode ds0 = augmentHolder.getDataChildByName(QName.create(T2_NS, rev, "ds0ChannelNumber"));
+ final DataSchemaNode ds0 = augmentHolder.getDataChildByName(QName.create(T2_NS, REV, "ds0ChannelNumber"));
assertNotNull(ds0);
- final DataSchemaNode interfaceId = augmentHolder.getDataChildByName(QName.create(T2_NS, rev, "interface-id"));
+ final DataSchemaNode interfaceId = augmentHolder.getDataChildByName(QName.create(T2_NS, REV, "interface-id"));
assertNotNull(interfaceId);
- final DataSchemaNode higherLayerIf = augmentHolder.getDataChildByName(QName.create(T2_NS, rev,
+ final DataSchemaNode higherLayerIf = augmentHolder.getDataChildByName(QName.create(T2_NS, REV,
"higher-layer-if"));
assertNotNull(higherLayerIf);
final ContainerSchemaNode schemas = (ContainerSchemaNode) augmentHolder.getDataChildByName(QName.create(T2_NS,
- rev, "schemas"));
+ REV, "schemas"));
assertNotNull(schemas);
- assertNotNull(schemas.getDataChildByName(QName.create(T1_NS, rev, "id")));
+ assertNotNull(schemas.getDataChildByName(QName.create(T1_NS, REV, "id")));
// test augment target after augmentation: check if it is same instance
final ListSchemaNode ifEntryAfterAugment = (ListSchemaNode) interfaces.getDataChildByName(QName.create(
reactor.addSources(bar, deviationTest);
final SchemaContext context = reactor.buildEffective();
- final Module testModule = context.findModuleByName("deviation-test", SimpleDateFormatUtil.getRevisionFormat()
- .parse("2013-02-27"));
- assertNotNull(testModule);
-
+ final Module testModule = context.findModule("deviation-test", Revision.of("2013-02-27")).get();
final Set<Deviation> deviations = testModule.getDeviations();
assertEquals(1, deviations.size());
final Deviation dev = deviations.iterator().next();
- assertEquals("system/user ref", dev.getReference());
+ assertEquals(Optional.of("system/user ref"), dev.getReference());
final URI expectedNS = URI.create("urn:opendaylight.bar");
- final Date expectedRev = SimpleDateFormatUtil.getRevisionFormat().parse("2013-07-03");
+ final Revision expectedRev = Revision.of("2013-07-03");
final List<QName> path = new ArrayList<>();
path.add(QName.create(expectedNS, expectedRev, "interfaces"));
path.add(QName.create(expectedNS, expectedRev, "ifEntry"));
Code Review / yangtools.git / blobdiff