X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fbinding-generator-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Fgenerator%2Fimpl%2FGenEnumResolvingTest.java;h=f8cf951c17a55af6e122474c815e88c89db1b9d0;hp=a95eb072ba4f2bc35329fe5dd121727ccb3f7bcc;hb=3c8c7171aa9a2fdf322b85cf104ae551665aa0d8;hpb=8f13b5e59fc066808cc73879f8defcb9cf3dc82a diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenEnumResolvingTest.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenEnumResolvingTest.java index a95eb072ba..f8cf951c17 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenEnumResolvingTest.java +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenEnumResolvingTest.java @@ -7,6 +7,13 @@ */ package org.opendaylight.controller.sal.binding.generator.impl; +import static org.junit.Assert.*; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + import org.junit.Test; import org.opendaylight.controller.binding.generator.util.ReferencedTypeImpl; import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; @@ -19,15 +26,6 @@ import org.opendaylight.controller.yang.model.api.SchemaContext; import org.opendaylight.controller.yang.model.parser.api.YangModelParser; import org.opendaylight.controller.yang.parser.impl.YangParserImpl; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - public class GenEnumResolvingTest { private SchemaContext resolveSchemaContextFromFiles( @@ -76,7 +74,7 @@ public class GenEnumResolvingTest { Enumeration linkUpDownTrapEnable = null; Enumeration operStatus = null; - final List enums = genInterface.getEnumDefintions(); + final List enums = genInterface.getEnumerations(); assertNotNull("Generated Type Interface cannot contain NULL reference" + " to Enumeration types!", enums); assertEquals("Generated Type Interface MUST contain 2 Enumeration " + @@ -108,8 +106,8 @@ public class GenEnumResolvingTest { assertNotNull("Generated Interface cannot contain NULL reference for " + "Method Signature Definitions!", methods); - assertEquals("Expected count of method signature definitions is 26", - 26, methods.size()); + assertEquals("Expected count of method signature definitions is 21", + 21, methods.size()); Enumeration ianaIfType = null; for (final MethodSignature method : methods) { if (method.getName().equals("getType")) { @@ -186,8 +184,8 @@ public class GenEnumResolvingTest { final List methods = genInterface.getMethodDefinitions(); assertNotNull("Generated Type Interface cannot contain NULL reference" + " to Enumeration types!", methods); - assertEquals("Generated Type Interface MUST contain 7 Methods ", - 7, methods.size()); + assertEquals("Generated Type Interface MUST contain 4 Methods ", + 4, methods.size()); for (final MethodSignature method : methods) { if (method.getName().equals("getLinkUpDownTrapEnable")) { linkUpDownTrapEnable = method.getReturnType();