X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fstmt%2FYangTypes2StmtTest.java;h=27a53ed45fe61c842adc2f2127187dc02cf78725;hb=043b7275acc4712d396606005a921415527135c0;hp=a653275a595a08445df1cefcd26f7c817db480c3;hpb=b81b12961e1d021c241e285e32ef20595a3098bd;p=yangtools.git diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java index a653275a59..27a53ed45f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java @@ -16,16 +16,13 @@ import java.net.URI; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; +import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class YangTypes2StmtTest { @@ -36,75 +33,68 @@ public class YangTypes2StmtTest { private static final StatementStreamSource TYPEFILE4 = sourceForResource( "/semantic-statement-parser/identityreftest.yang"); - private static final QNameModule types2Module = QNameModule.create(URI.create("types2"), - SimpleDateFormatUtil.DEFAULT_DATE_REV); - - private static final QName lfDecimal = QName.create(types2Module, "lf-decimal"); - private static final QName lfMyString = QName.create(types2Module, "lf-my-string"); - private static final QName lfInt8 = QName.create(types2Module, "lf-int8"); - private static final QName lfInt16 = QName.create(types2Module, "lf-int16"); - private static final QName lfInt32 = QName.create(types2Module, "lf-int32"); - private static final QName lfInt64 = QName.create(types2Module, "lf-int64"); - private static final QName lfUInt8 = QName.create(types2Module, "lf-uint8"); - private static final QName lfUInt16 = QName.create(types2Module, "lf-uint16"); - private static final QName lfUInt32 = QName.create(types2Module, "lf-uint32"); - private static final QName lfUInt64 = QName.create(types2Module, "lf-uint64"); - private static final QName lfBool = QName.create(types2Module, "lf-bool"); + private static final QNameModule TYPES2_MODULE = QNameModule.create(URI.create("types2")); + + private static final QName LF_DECIMAL = QName.create(TYPES2_MODULE, "lf-decimal"); + private static final QName LF_MY_STRING = QName.create(TYPES2_MODULE, "lf-my-string"); + private static final QName LF_INT8 = QName.create(TYPES2_MODULE, "lf-int8"); + private static final QName LF_INT16 = QName.create(TYPES2_MODULE, "lf-int16"); + private static final QName LF_INT32 = QName.create(TYPES2_MODULE, "lf-int32"); + private static final QName LF_INT64 = QName.create(TYPES2_MODULE, "lf-int64"); + private static final QName LF_UINT8 = QName.create(TYPES2_MODULE, "lf-uint8"); + private static final QName LF_UINT16 = QName.create(TYPES2_MODULE, "lf-uint16"); + private static final QName LF_UINT32 = QName.create(TYPES2_MODULE, "lf-uint32"); + private static final QName LF_UINT64 = QName.create(TYPES2_MODULE, "lf-uint64"); + private static final QName LF_BOOL = QName.create(TYPES2_MODULE, "lf-bool"); @Test - public void readAndParseYangFileTest() throws SourceException, ReactorException { - CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, TYPEFILE1, TYPEFILE2, TYPEFILE3, TYPEFILE4); - EffectiveSchemaContext result = reactor.buildEffective(); + public void readAndParseYangFileTest() throws ReactorException { + SchemaContext result = DefaultReactors.defaultReactor().newBuild() + .addSources(TYPEFILE1, TYPEFILE2, TYPEFILE3, TYPEFILE4) + .buildEffective(); assertNotNull(result); - final LeafSchemaNode lfDecimalNode = (LeafSchemaNode) result.getDataChildByName(lfDecimal); + final LeafSchemaNode lfDecimalNode = (LeafSchemaNode) result.getDataChildByName(LF_DECIMAL); assertNotNull(lfDecimalNode); assertTrue(lfDecimalNode.getType() instanceof DecimalTypeDefinition); final DecimalTypeDefinition lfDecimalNodeType = (DecimalTypeDefinition) lfDecimalNode.getType(); - assertEquals(2, lfDecimalNodeType.getFractionDigits().intValue()); + assertEquals(2, lfDecimalNodeType.getFractionDigits()); - final LeafSchemaNode lfInt8Node = (LeafSchemaNode) result.getDataChildByName(lfInt8); + final LeafSchemaNode lfInt8Node = (LeafSchemaNode) result.getDataChildByName(LF_INT8); assertNotNull(lfInt8Node); assertEquals(BaseTypes.int8Type().getClass(), lfInt8Node.getType().getClass()); - final LeafSchemaNode lfInt16Node = (LeafSchemaNode) result.getDataChildByName(lfInt16); + final LeafSchemaNode lfInt16Node = (LeafSchemaNode) result.getDataChildByName(LF_INT16); assertNotNull(lfInt16Node); assertEquals(BaseTypes.int16Type().getClass(), lfInt16Node.getType().getClass()); - final LeafSchemaNode lfInt32Node = (LeafSchemaNode) result.getDataChildByName(lfInt32); + final LeafSchemaNode lfInt32Node = (LeafSchemaNode) result.getDataChildByName(LF_INT32); assertNotNull(lfInt32Node); assertEquals(BaseTypes.int32Type().getClass(), lfInt32Node.getType().getClass()); - final LeafSchemaNode lfInt64Node = (LeafSchemaNode) result.getDataChildByName(lfInt64); + final LeafSchemaNode lfInt64Node = (LeafSchemaNode) result.getDataChildByName(LF_INT64); assertNotNull(lfInt64Node); assertEquals(BaseTypes.int64Type().getClass(), lfInt64Node.getType().getClass()); - final LeafSchemaNode lfUInt8Node = (LeafSchemaNode) result.getDataChildByName(lfUInt8); + final LeafSchemaNode lfUInt8Node = (LeafSchemaNode) result.getDataChildByName(LF_UINT8); assertNotNull(lfUInt8Node); assertEquals(BaseTypes.uint8Type().getClass(), lfUInt8Node.getType().getClass()); - final LeafSchemaNode lfUInt16Node = (LeafSchemaNode) result.getDataChildByName(lfUInt16); + final LeafSchemaNode lfUInt16Node = (LeafSchemaNode) result.getDataChildByName(LF_UINT16); assertNotNull(lfUInt16Node); assertEquals(BaseTypes.uint16Type().getClass(), lfUInt16Node.getType().getClass()); - final LeafSchemaNode lfUInt32Node = (LeafSchemaNode) result.getDataChildByName(lfUInt32); + final LeafSchemaNode lfUInt32Node = (LeafSchemaNode) result.getDataChildByName(LF_UINT32); assertNotNull(lfUInt32Node); assertEquals(BaseTypes.uint32Type().getClass(), lfUInt32Node.getType().getClass()); - final LeafSchemaNode lfUInt64Node = (LeafSchemaNode) result.getDataChildByName(lfUInt64); + final LeafSchemaNode lfUInt64Node = (LeafSchemaNode) result.getDataChildByName(LF_UINT64); assertNotNull(lfUInt64Node); assertEquals(BaseTypes.uint64Type().getClass(), lfUInt64Node.getType().getClass()); - final LeafSchemaNode lfBoolNode = (LeafSchemaNode) result.getDataChildByName(lfBool); + final LeafSchemaNode lfBoolNode = (LeafSchemaNode) result.getDataChildByName(LF_BOOL); assertNotNull(lfBoolNode); assertEquals(BaseTypes.booleanType().getClass(), lfBoolNode.getType().getClass()); } - - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final StatementStreamSource... sources) { - for (StatementStreamSource source : sources) { - reactor.addSource(source); - } - } }