X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-generator-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fmodel%2Futil%2FBindingGeneratorUtilTest.java;h=76240b31266d0f463ed52b20cf1208c2fcd2c0c1;hb=1970840c5ffc3daef3b92737ff672504e9e93822;hp=0d2f426d34e617f0c3217062783e3ed620d2312c;hpb=c77348ddc6ccebb90ef32b5e55f38e0997047f36;p=mdsal.git diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java index 0d2f426d34..76240b3126 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java @@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import java.io.Serializable; -import java.util.List; import java.util.Optional; import java.util.Set; import org.junit.Rule; @@ -43,7 +42,7 @@ import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition; import org.opendaylight.yangtools.yang.model.util.BaseConstraints; -import org.opendaylight.yangtools.yang.model.util.DataNodeIterator; +import org.opendaylight.yangtools.yang.model.util.SchemaNodeUtils; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; import org.opendaylight.yangtools.yang.model.util.type.DerivedTypes; import org.opendaylight.yangtools.yang.model.util.type.InvalidLengthConstraintException; @@ -86,10 +85,8 @@ public class BindingGeneratorUtilTest { "org.opendaylight.yang.gen.v1.urn.m.o.d.u.l.e.n.a.m.e.t.e.s.t._case._1digit.rev130910", packageName); // test of the method packageNameForGeneratedType() - DataNodeIterator it = new DataNodeIterator(module); - List schemaContainers = it.allContainers(); String subPackageNameForDataNode = ""; - for (ContainerSchemaNode containerSchemaNode : schemaContainers) { + for (ContainerSchemaNode containerSchemaNode : SchemaNodeUtils.getAllContainers(module)) { if (containerSchemaNode.getQName().getLocalName().equals("cont-inner")) { subPackageNameForDataNode = BindingGeneratorUtil.packageNameForGeneratedType(packageName, containerSchemaNode.getPath());