From 706d481f3c98be7095f1565419c5153e0ea48063 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Wed, 11 Jun 2014 17:49:20 +0200 Subject: [PATCH] BUG-865: removed use of deprecated methods from tests. Removed use of deprecated methods from parser in binding-generator-impl tests. Change-Id: I08ba5d2c2abc55b818e389502512f35774a90db3 Signed-off-by: Martin Vitez --- .../impl/AugmentRelativeXPathTest.java | 13 +- .../generator/impl/AugmentedTypeTest.java | 40 +++--- .../generator/impl/BinaryTypeTest.java | 13 +- .../impl/BitAndUnionTOEnclosingTest.java | 15 +-- .../impl/ChoiceCaseGenTypesTest.java | 15 +-- .../generator/impl/ControllerTest.java | 13 +- .../generator/impl/ExtendedTypedefTest.java | 13 +- .../generator/impl/GenEnumResolvingTest.java | 122 +++++++----------- .../generator/impl/GenTypesSubSetTest.java | 20 +-- .../impl/GeneratedTypesBitsTest.java | 9 +- .../impl/GeneratedTypesLeafrefTest.java | 22 ++-- .../impl/GeneratedTypesStringTest.java | 16 +-- .../generator/impl/GeneratedTypesTest.java | 28 ++-- .../generator/impl/IdentityrefTypeTest.java | 13 +- .../generator/impl/SupportTestUtil.java | 13 +- .../impl/TypeProviderIntegrationTest.java | 4 +- .../generator/impl/UnionTypeDefTest.java | 13 +- .../sal/binding/generator/impl/UsesTest.java | 69 +++++----- 18 files changed, 183 insertions(+), 268 deletions(-) diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java index 6611ac40e8..84a390861e 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java @@ -12,12 +12,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; @@ -26,9 +25,8 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class AugmentRelativeXPathTest { @@ -49,10 +47,9 @@ public class AugmentRelativeXPathTest { } @Test - public void AugmentationWithRelativeXPathTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(augmentModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void AugmentationWithRelativeXPathTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(augmentModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java index 933db8dc8a..4dca4dfdde 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java @@ -12,12 +12,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; @@ -26,9 +25,8 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class AugmentedTypeTest { @@ -49,10 +47,9 @@ public class AugmentedTypeTest { } @Test - public void augmentedAbstractTopologyTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(augmentModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void augmentedAbstractTopologyTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(augmentModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -176,19 +173,20 @@ public class AugmentedTypeTest { final List networkLink2Methods = gtNetworkLink2.getMethodDefinitions(); assertNotNull("networkLink2Methods is null", networkLink2Methods); -// FIXME: in some cases getIfcMethod is null which causes test fail. fix ASAP -// MethodSignature getIfcMethod = null; -// for (MethodSignature method : networkLink2Methods) { -// if (method.getName().equals("getInterface")) { -// getIfcMethod = method; -// break; -// } -// } -// -// assertNotNull("getIfcMethod is null", getIfcMethod); -// assertNotNull("getIfcMethod.getReturnType() is null", getIfcMethod.getReturnType()); -// assertFalse("getIfcMethod.getReturnType() should not be Void", getIfcMethod.getReturnType().equals("java.lang.Void")); -// assertTrue("getIfcMethod.getReturnType().getName() must be String", getIfcMethod.getReturnType().getName().equals("String")); + MethodSignature getIfcMethod = null; + for (MethodSignature method : networkLink2Methods) { + if (method.getName().equals("getInterface")) { + getIfcMethod = method; + break; + } + } + + assertNotNull("getIfcMethod is null", getIfcMethod); + assertNotNull("getIfcMethod.getReturnType() is null", getIfcMethod.getReturnType()); + assertFalse("getIfcMethod.getReturnType() should not be Void", + getIfcMethod.getReturnType().equals("java.lang.Void")); + assertTrue("getIfcMethod.getReturnType().getName() must be String", getIfcMethod.getReturnType().getName() + .equals("String")); } @Test diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java index 06f2844a00..f5c2c1b2aa 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java @@ -11,19 +11,17 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class BinaryTypeTest { @@ -42,10 +40,9 @@ public class BinaryTypeTest { } @Test - public void binaryTypeTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(yangModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void binaryTypeTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(yangModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java index a9be781252..030cd11757 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java @@ -13,11 +13,10 @@ import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestU import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsMethods; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; @@ -25,9 +24,8 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class BitAndUnionTOEnclosingTest { @@ -36,10 +34,9 @@ public class BitAndUnionTOEnclosingTest { private static List genTypes = null; private static GeneratedType parentContainer = null; - public static void parseResources() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public static void parseResources() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -56,7 +53,7 @@ public class BitAndUnionTOEnclosingTest { } @BeforeClass - public static void loadTestResources() throws URISyntaxException { + public static void loadTestResources() throws IOException, URISyntaxException { final File listModelFile = new File(ExtendedTypedefTest.class.getResource("/bit_and_union.yang").toURI()); testModels.add(listModelFile); parseResources(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java index 8e5b95f07c..d0bf3c7399 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java @@ -14,21 +14,19 @@ import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestU import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsMethods; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class ChoiceCaseGenTypesTest { @@ -72,11 +70,9 @@ public class ChoiceCaseGenTypesTest { } @Test - public void choiceCaseResolvingTypeTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(yangModels); - - final SchemaContext context = parser.resolveSchemaContext(modules); + public void choiceCaseResolvingTypeTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(yangModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -147,7 +143,6 @@ public class ChoiceCaseGenTypesTest { genType = checkGeneratedType(genTypes, "LeafAugCase", pcgPref + ".netconf.state.datastores.datastore.locks.lock.type"); // choice - // FIXME containsMethods(genType, new NameTypePattern("getLeafAugCase", "String")); containsInterface("LockType", genType); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java index 93362b9c88..34705a9e86 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java @@ -12,19 +12,17 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class ControllerTest { @@ -45,10 +43,9 @@ public class ControllerTest { } @Test - public void controllerAugmentationTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(controllerModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void controllerAugmentationTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(controllerModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java index 481d6149ed..7c7fb9de55 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java @@ -13,12 +13,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; @@ -26,9 +25,8 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.sal.binding.yang.types.BaseYangTypes; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class ExtendedTypedefTest { @@ -48,10 +46,9 @@ public class ExtendedTypedefTest { } @Test - public void constantGenerationTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void constantGenerationTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java index ce37ca5e25..8aefb6b175 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java @@ -12,48 +12,42 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; -import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class GenEnumResolvingTest { - private SchemaContext resolveSchemaContextFromFiles( - final URI... yangFiles) { - final YangModelParser parser = new YangParserImpl(); + private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws IOException { + final YangContextParser parser = new YangParserImpl(); final List inputFiles = new ArrayList(); for (int i = 0; i < yangFiles.length; ++i) { inputFiles.add(new File(yangFiles[i])); } - final Set modules = parser.parseYangModels(inputFiles); - return parser.resolveSchemaContext(modules); + return parser.parseFiles(inputFiles); } @Test - public void testLeafEnumResolving() throws URISyntaxException { - final URI ietfInterfacesPath = getClass().getResource( - "/enum-test-models/ietf-interfaces@2012-11-15.yang").toURI(); - final URI ifTypePath = getClass().getResource( - "/enum-test-models/iana-if-type@2012-06-05.yang").toURI(); - final URI yangTypesPath = getClass().getResource( - "/enum-test-models/ietf-yang-types@2010-09-24.yang").toURI(); - - final SchemaContext context = resolveSchemaContextFromFiles( - ietfInterfacesPath, ifTypePath, yangTypesPath); + public void testLeafEnumResolving() throws URISyntaxException, IOException { + final URI ietfInterfacesPath = getClass().getResource("/enum-test-models/ietf-interfaces@2012-11-15.yang") + .toURI(); + final URI ifTypePath = getClass().getResource("/enum-test-models/iana-if-type@2012-06-05.yang").toURI(); + final URI yangTypesPath = getClass().getResource("/enum-test-models/ietf-yang-types@2010-09-24.yang").toURI(); + + final SchemaContext context = resolveSchemaContextFromFiles(ietfInterfacesPath, ifTypePath, yangTypesPath); assertTrue(context != null); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -70,16 +64,13 @@ public class GenEnumResolvingTest { } } } - assertNotNull("Generated Type Interface is not present in list of " + - "Generated Types", genInterface); + assertNotNull("Generated Type Interface is not present in list of Generated Types", genInterface); Enumeration linkUpDownTrapEnable = null; Enumeration operStatus = null; 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 " + - "Types", 2, enums.size()); + assertNotNull("Generated Type Interface cannot contain NULL reference to Enumeration types!", enums); + assertEquals("Generated Type Interface MUST contain 2 Enumeration Types", 2, enums.size()); for (final Enumeration e : enums) { if (e.getName().equals("LinkUpDownTrapEnable")) { linkUpDownTrapEnable = e; @@ -88,46 +79,36 @@ public class GenEnumResolvingTest { } } - assertNotNull("Expected Enum LinkUpDownTrapEnable, but was NULL!", - linkUpDownTrapEnable); + assertNotNull("Expected Enum LinkUpDownTrapEnable, but was NULL!", linkUpDownTrapEnable); assertNotNull("Expected Enum OperStatus, but was NULL!", operStatus); - assertNotNull("Enum LinkUpDownTrapEnable MUST contain Values definition " + - "not NULL reference!", linkUpDownTrapEnable.getValues()); - assertNotNull("Enum OperStatus MUST contain Values definition not " + - "NULL reference!", operStatus.getValues()); - assertEquals("Enum LinkUpDownTrapEnable MUST contain 2 values!", 2, - linkUpDownTrapEnable.getValues().size()); - assertEquals("Enum OperStatus MUST contain 7 values!", 7, - operStatus.getValues().size()); + assertNotNull("Enum LinkUpDownTrapEnable MUST contain Values definition not NULL reference!", + linkUpDownTrapEnable.getValues()); + assertNotNull("Enum OperStatus MUST contain Values definition not NULL reference!", operStatus.getValues()); + assertEquals("Enum LinkUpDownTrapEnable MUST contain 2 values!", 2, linkUpDownTrapEnable.getValues().size()); + assertEquals("Enum OperStatus MUST contain 7 values!", 7, operStatus.getValues().size()); - final List methods = genInterface - .getMethodDefinitions(); + final List methods = genInterface.getMethodDefinitions(); - assertNotNull("Generated Interface cannot contain NULL reference for " + - "Method Signature Definitions!", methods); + assertNotNull("Generated Interface cannot contain NULL reference for Method Signature Definitions!", methods); - assertEquals("Expected count of method signature definitions is 15", - 15, methods.size()); + assertEquals("Expected count of method signature definitions is 15", 15, methods.size()); Enumeration ianaIfType = null; for (final MethodSignature method : methods) { if (method.getName().equals("getType")) { if (method.getReturnType() instanceof Enumeration) { - ianaIfType = (Enumeration)method.getReturnType(); + ianaIfType = (Enumeration) method.getReturnType(); } } } - assertNotNull("Method getType MUST return Enumeration Type, " + - "not NULL reference!", ianaIfType); - assertEquals("Enumeration getType MUST contain 272 values!", 272, - ianaIfType.getValues().size()); + assertNotNull("Method getType MUST return Enumeration Type not NULL reference!", ianaIfType); + assertEquals("Enumeration getType MUST contain 272 values!", 272, ianaIfType.getValues().size()); } @Test - public void testTypedefEnumResolving() throws URISyntaxException { - final URI ianaIfTypePath = getClass().getResource( - "/leafref-test-models/iana-if-type@2012-06-05.yang").toURI(); + public void testTypedefEnumResolving() throws URISyntaxException, IOException { + final URI ianaIfTypePath = getClass().getResource("/leafref-test-models/iana-if-type@2012-06-05.yang").toURI(); final SchemaContext context = resolveSchemaContextFromFiles(ianaIfTypePath); assertTrue(context != null); @@ -140,27 +121,19 @@ public class GenEnumResolvingTest { assertTrue(type instanceof Enumeration); final Enumeration enumer = (Enumeration) type; - assertEquals("Enumeration type MUST contain 272 values!", 272, - enumer.getValues().size()); + assertEquals("Enumeration type MUST contain 272 values!", 272, enumer.getValues().size()); } @Test - public void testLeafrefEnumResolving() throws URISyntaxException { - final URI ietfInterfacesPath = getClass().getResource( - "/enum-test-models/ietf-interfaces@2012-11-15.yang").toURI(); - final URI ifTypePath = getClass().getResource( - "/enum-test-models/iana-if-type@2012-06-05.yang").toURI(); - final URI yangTypesPath = getClass().getResource( - "/enum-test-models/ietf-yang-types@2010-09-24.yang").toURI(); - final URI topologyPath = getClass().getResource( - "/enum-test-models/abstract-topology@2013-02-08.yang") + public void testLeafrefEnumResolving() throws URISyntaxException, IOException { + final URI ietfInterfacesPath = getClass().getResource("/enum-test-models/ietf-interfaces@2012-11-15.yang") .toURI(); - final URI inetTypesPath = getClass().getResource( - "/enum-test-models/ietf-inet-types@2010-09-24.yang") - .toURI(); - final SchemaContext context = resolveSchemaContextFromFiles( - ietfInterfacesPath, ifTypePath, yangTypesPath, topologyPath, - inetTypesPath); + final URI ifTypePath = getClass().getResource("/enum-test-models/iana-if-type@2012-06-05.yang").toURI(); + final URI yangTypesPath = getClass().getResource("/enum-test-models/ietf-yang-types@2010-09-24.yang").toURI(); + final URI topologyPath = getClass().getResource("/enum-test-models/abstract-topology@2013-02-08.yang").toURI(); + final URI inetTypesPath = getClass().getResource("/enum-test-models/ietf-inet-types@2010-09-24.yang").toURI(); + final SchemaContext context = resolveSchemaContextFromFiles(ietfInterfacesPath, ifTypePath, yangTypesPath, + topologyPath, inetTypesPath); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -171,22 +144,20 @@ public class GenEnumResolvingTest { GeneratedType genInterface = null; for (final Type type : genTypes) { if (type instanceof GeneratedType) { - if (type.getPackageName().equals("org.opendaylight.yang.gen.v1.urn.model._abstract.topology.rev130208.topology.interfaces") + if (type.getPackageName().equals( + "org.opendaylight.yang.gen.v1.urn.model._abstract.topology.rev130208.topology.interfaces") && type.getName().equals("Interface")) { genInterface = (GeneratedType) type; } } } - assertNotNull("Generated Type Interface is not present in list of " + - "Generated Types", genInterface); + assertNotNull("Generated Type Interface is not present in list of Generated Types", genInterface); Type linkUpDownTrapEnable = null; Type operStatus = null; final List methods = genInterface.getMethodDefinitions(); - assertNotNull("Generated Type Interface cannot contain NULL reference" + - " to Enumeration types!", methods); - assertEquals("Generated Type Interface MUST contain 5 Methods ", - 5, methods.size()); + assertNotNull("Generated Type Interface cannot contain NULL reference to Enumeration types!", methods); + assertEquals("Generated Type Interface MUST contain 5 Methods ", 5, methods.size()); for (final MethodSignature method : methods) { if (method.getName().equals("getLinkUpDownTrapEnable")) { linkUpDownTrapEnable = method.getReturnType(); @@ -195,16 +166,15 @@ public class GenEnumResolvingTest { } } - assertNotNull("Expected Referenced Enum LinkUpDownTrapEnable, but was NULL!", - linkUpDownTrapEnable); + assertNotNull("Expected Referenced Enum LinkUpDownTrapEnable, but was NULL!", linkUpDownTrapEnable); assertTrue("Expected LinkUpDownTrapEnable of type Enumeration", linkUpDownTrapEnable instanceof Enumeration); assertEquals(linkUpDownTrapEnable.getPackageName(), "org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev121115.interfaces.Interface"); - assertNotNull("Expected Referenced Enum OperStatus, but was NULL!", - operStatus); + assertNotNull("Expected Referenced Enum OperStatus, but was NULL!", operStatus); assertTrue("Expected OperStatus of type Enumeration", operStatus instanceof Enumeration); assertEquals(operStatus.getPackageName(), "org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev121115.interfaces.Interface"); } + } diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java index 3f5295b02f..c3443eb7d8 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java @@ -12,20 +12,20 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class GenTypesSubSetTest { @@ -46,10 +46,10 @@ public class GenTypesSubSetTest { } @Test - public void genTypesFromSubsetOfTwoModulesTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(yangModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void genTypesFromSubsetOfTwoModulesTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(yangModels); + Set modules = context.getModules(); final Set toGenModules = new HashSet<>(); for (final Module module : modules) { @@ -73,10 +73,10 @@ public class GenTypesSubSetTest { } @Test - public void genTypesFromSubsetOfThreeModulesTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(yangModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void genTypesFromSubsetOfThreeModulesTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(yangModels); + final Set modules = context.getModules(); final Set toGenModules = new HashSet<>(); for (final Module module : modules) { diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java index 153ca3acdc..1dc8f00dde 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java @@ -13,9 +13,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.net.URI; -import java.net.URISyntaxException; import java.util.List; - import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; @@ -30,7 +28,7 @@ public class GeneratedTypesBitsTest { @Test - public void testGeneretedTypesBitsTest() throws URISyntaxException { + public void testGeneretedTypesBitsTest() throws Exception { final URI yangTypesPath = getClass().getResource("/simple-bits-demo.yang").toURI(); final SchemaContext context = SupportTestUtil.resolveSchemaContextFromFiles(yangTypesPath); @@ -51,7 +49,6 @@ public class GeneratedTypesBitsTest { int hashPropertiesNum = 0; String nameReturnParamType = ""; - String nameMethodeParamType = ""; boolean getByteLeafMethodFound = false; boolean setByteLeafMethodFound = false; int setByteLeafMethodParamNum = 0; @@ -100,10 +97,6 @@ public class GeneratedTypesBitsTest { List parameters = methodSignature.getParameters(); setByteLeafMethodParamNum = parameters.size(); - for (Parameter parameter : parameters) { - nameMethodeParamType = parameter.getType().getName(); - } - } } diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java index dff47a3740..3eccac64aa 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java @@ -7,15 +7,17 @@ */ package org.opendaylight.yangtools.sal.binding.generator.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.fail; import java.io.File; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; @@ -23,27 +25,25 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class GeneratedTypesLeafrefTest { - private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) { - final YangModelParser parser = new YangParserImpl(); + private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws IOException { + final YangContextParser parser = new YangParserImpl(); final List inputFiles = new ArrayList(); for (int i = 0; i < yangFiles.length; ++i) { inputFiles.add(new File(yangFiles[i])); } - final Set modules = parser.parseYangModels(inputFiles); - return parser.resolveSchemaContext(modules); + return parser.parseFiles(inputFiles); } @Test - public void testLeafrefResolving() throws URISyntaxException { + public void testLeafrefResolving() throws URISyntaxException, IOException { final URI topologyPath = getClass().getResource("/leafref-test-models/abstract-topology@2013-02-08.yang") .toURI(); final URI interfacesPath = getClass().getResource("/leafref-test-models/ietf-interfaces@2012-11-15.yang") @@ -236,7 +236,7 @@ public class GeneratedTypesLeafrefTest { } @Test - public void testLeafrefInvalidPathResolving() throws URISyntaxException { + public void testLeafrefInvalidPathResolving() throws URISyntaxException, IOException { final URI resource = getClass().getResource("/leafref-test-invalid-model/foo.yang").toURI(); assertNotNull(resource); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java index ada474a78e..d0f15174f3 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java @@ -7,14 +7,14 @@ */ package org.opendaylight.yangtools.sal.binding.generator.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; @@ -22,9 +22,8 @@ import org.opendaylight.yangtools.sal.binding.model.api.Constant; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class GeneratedTypesStringTest { @@ -39,10 +38,9 @@ public class GeneratedTypesStringTest { } @Test - public void constantGenerationTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void constantGenerationTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java index e28a31697f..014c7112d4 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java @@ -7,15 +7,15 @@ */ package org.opendaylight.yangtools.sal.binding.generator.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.io.File; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; @@ -23,27 +23,25 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class GeneratedTypesTest { - private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) { - final YangModelParser parser = new YangParserImpl(); + private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws IOException { + final YangContextParser parser = new YangParserImpl(); final List inputFiles = new ArrayList(); for (int i = 0; i < yangFiles.length; ++i) { inputFiles.add(new File(yangFiles[i])); } - final Set modules = parser.parseYangModels(inputFiles); - return parser.resolveSchemaContext(modules); + return parser.parseFiles(inputFiles); } @Test - public void testMultipleModulesResolving() throws URISyntaxException { + public void testMultipleModulesResolving() throws URISyntaxException, IOException { final URI topologyPath = getClass().getResource("/abstract-topology.yang").toURI(); final URI typesPath = getClass().getResource("/ietf-inet-types@2010-09-24.yang").toURI(); final SchemaContext context = resolveSchemaContextFromFiles(topologyPath, typesPath); @@ -57,7 +55,7 @@ public class GeneratedTypesTest { } @Test - public void testContainerResolving() throws URISyntaxException { + public void testContainerResolving() throws URISyntaxException, IOException { final URI filePath = getClass().getResource("/simple-container-demo.yang").toURI(); final SchemaContext context = resolveSchemaContextFromFiles(filePath); assert (context != null); @@ -142,7 +140,7 @@ public class GeneratedTypesTest { } @Test - public void testLeafListResolving() throws URISyntaxException { + public void testLeafListResolving() throws URISyntaxException, IOException { final URI filePath = getClass().getResource("/simple-leaf-list-demo.yang").toURI(); final SchemaContext context = resolveSchemaContextFromFiles(filePath); assertNotNull(context); @@ -226,7 +224,7 @@ public class GeneratedTypesTest { } @Test - public void testListResolving() throws URISyntaxException { + public void testListResolving() throws URISyntaxException, IOException { final URI filePath = getClass().getResource("/simple-list-demo.yang").toURI(); final SchemaContext context = resolveSchemaContextFromFiles(filePath); assertNotNull(context); @@ -349,7 +347,7 @@ public class GeneratedTypesTest { } @Test - public void testListCompositeKeyResolving() throws URISyntaxException { + public void testListCompositeKeyResolving() throws URISyntaxException, IOException { final URI filePath = getClass().getResource("/list-composite-key.yang").toURI(); final SchemaContext context = resolveSchemaContextFromFiles(filePath); @@ -402,7 +400,7 @@ public class GeneratedTypesTest { } @Test - public void testGeneratedTypes() throws URISyntaxException { + public void testGeneratedTypes() throws URISyntaxException, IOException { final URI filePath = getClass().getResource("/demo-topology.yang").toURI(); final SchemaContext context = resolveSchemaContextFromFiles(filePath); assertNotNull(context); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java index 378ccc7080..ff81f55beb 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java @@ -11,12 +11,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.io.File; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.Before; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; @@ -25,9 +24,8 @@ import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class IdentityrefTypeTest { @@ -57,10 +55,9 @@ public class IdentityrefTypeTest { * provideTypeForIdentityref} */ @Test - public void testIdentityrefYangBuiltInType() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void testIdentityrefYangBuiltInType() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java index 1a767ea63b..59a04ff4e6 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java @@ -11,34 +11,31 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class SupportTestUtil { - public static SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) { - final YangModelParser parser = new YangParserImpl(); + public static SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws IOException { + final YangContextParser parser = new YangParserImpl(); final List inputFiles = new ArrayList(); for (int i = 0; i < yangFiles.length; ++i) { inputFiles.add(new File(yangFiles[i])); } - final Set modules = parser.parseYangModels(inputFiles); - return parser.resolveSchemaContext(modules); + return parser.parseFiles(inputFiles); } public static void containsMethods(final GeneratedType genType, final NameTypePattern... searchedSignsWhat) { diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java index 8df0beee7b..5fce20947b 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java @@ -11,11 +11,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.net.URI; -import java.net.URISyntaxException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Set; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -33,7 +31,7 @@ public class TypeProviderIntegrationTest { private Module m; @BeforeClass - public static void setup() throws ParseException, URISyntaxException { + public static void setup() throws Exception { final URI path1 = TypeProviderIntegrationTest.class.getResource("/type-provider/test.yang").toURI(); final URI path2 = TypeProviderIntegrationTest.class.getResource( "/type-provider/ietf-inet-types@2010-09-24.yang").toURI(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java index daf8de5588..18610d2b9d 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java @@ -11,19 +11,17 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class UnionTypeDefTest { @@ -43,10 +41,9 @@ public class UnionTypeDefTest { } @Test - public void unionTypeResolvingTest() { - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(yangModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + public void unionTypeResolvingTest() throws IOException { + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(yangModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java index 42620a26a2..8c4cb56c36 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java @@ -14,19 +14,17 @@ import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestU import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsMethods; import java.io.File; +import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; -import java.util.Set; - import org.junit.Test; import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; public class UsesTest { @@ -43,11 +41,10 @@ public class UsesTest { } @Test - public void usesInGroupingDependenciesTest() { + public void usesInGroupingDependenciesTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-dependencies.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -99,11 +96,10 @@ public class UsesTest { } @Test - public void usesInCaseTest() { + public void usesInCaseTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-case.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -148,11 +144,10 @@ public class UsesTest { } @Test - public void usesInContainerTest() { + public void usesInContainerTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-container.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -202,11 +197,10 @@ public class UsesTest { } @Test - public void usesInGroupingTest() { + public void usesInGroupingTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-grouping.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -254,11 +248,10 @@ public class UsesTest { } @Test - public void usesInListTest() { + public void usesInListTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-list.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -337,11 +330,10 @@ public class UsesTest { } @Test - public void usesInModulTest() { + public void usesInModulTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-modul.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -389,11 +381,10 @@ public class UsesTest { } @Test - public void usesInRpcTest() { + public void usesInRpcTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-rpc.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -483,11 +474,10 @@ public class UsesTest { } @Test - public void usesInAugmentTest() { + public void usesInAugmentTest() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-augment.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); @@ -537,11 +527,10 @@ public class UsesTest { } @Test - public void usesInNotification() { + public void usesInNotification() throws IOException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-notification.yang"); - final YangModelParser parser = new YangParserImpl(); - final Set modules = parser.parseYangModels(testModels); - final SchemaContext context = parser.resolveSchemaContext(modules); + final YangContextParser parser = new YangParserImpl(); + final SchemaContext context = parser.parseFiles(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(); -- 2.36.6