From: Vratko Polak Date: Thu, 28 Sep 2017 12:36:56 +0000 (+0200) Subject: Revert "Fix broken tests according to yangtools... X-Git-Tag: release/oxygen~78 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0cf54025e72c2fad09d1901b38931eb46512313c;p=mdsal.git Revert "Fix broken tests according to yangtools... Oxygen is using Yangtools 1.2.0 again, so that change towards 2.0.0-SNAPSHOT behavior has to be reverted. This reverts commit 6a290d78a6d6f32eafcb808457a4bb06875151e0. Change-Id: I31732adc545df92fdb82e7047a19624b2454639d Signed-off-by: Vratko Polak --- diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java index 28b850d8a0..0a38e9320e 100644 --- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java +++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/DocGenTest.java @@ -50,7 +50,7 @@ public class DocGenTest { @Test public void testListGeneration() throws Exception { final List sourceFiles = getSourceFiles("/doc-gen"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final Set modules = context.getModules(); final BasicCodeGenerator generator = new DocumentationGeneratorImpl(); Collection generatedFiles = generator.generateSources(context, GENERATOR_OUTPUT_DIR, modules); diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java index 4755e11e7c..1a0731851a 100644 --- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java +++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java @@ -136,7 +136,7 @@ public class YangModuleInfoCompilationTest { private static void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); CodeGeneratorImpl codegen = new CodeGeneratorImpl(); codegen.setBuildContext(new DefaultBuildContext()); codegen.generateSources(context, sourcesOutputDir, context.getModules()); @@ -145,7 +145,7 @@ public class YangModuleInfoCompilationTest { @Test public void generateTestSourcesWithAdditionalConfig() throws Exception { final List sourceFiles = getSourceFiles("/yang-module-info"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); CodeGeneratorImpl codegen = new CodeGeneratorImpl(); codegen.setBuildContext(new DefaultBuildContext()); codegen.setResourceBaseDir(null); diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java index 7e1e89a536..c94f8f40d0 100644 --- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java +++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/wadl/generator/maven/WadlGenTest.java @@ -52,7 +52,7 @@ public class WadlGenTest { @Test public void testListGeneration() throws Exception { final List sourceFiles = getSourceFiles("/wadl-gen"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final Set modules = context.getModules(); final BasicCodeGenerator generator = new WadlGenerator(); Collection generatedWadlFiles = generator.generateSources(context, GENERATOR_OUTPUT_DIR, modules); @@ -63,7 +63,7 @@ public class WadlGenTest { @Test public void testListGenerationWithoutPath() throws Exception { final List sourceFiles = getSourceFiles("/wadl-gen"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final Set modules = context.getModules(); final BasicCodeGenerator generator = new WadlGenerator(); Collection generatedWadlFiles = generator.generateSources(context, null, modules); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodecTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodecTest.java index 8743d3756d..fe6cd20e24 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodecTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodecTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -54,8 +53,7 @@ public class BindingToNormalizedNodeCodecTest { */ @Test public void fromNormalizedNodeTest() throws Exception { - final SchemaContext schemaCtx = - YangParserTestUtils.parseYangFiles(new File(getClass().getResource("/test.yang").toURI())); + final SchemaContext schemaCtx = YangParserTestUtils.parseYangSource("/test.yang"); final NormalizedNode data = prepareData(schemaCtx, 42); final Entry, DataObject> fromNormalizedNode = fromNormalizedNode(data, schemaCtx); @@ -85,8 +83,7 @@ public class BindingToNormalizedNodeCodecTest { */ @Test public void fromNormalizedNodeWithAnotherInputDataTest() throws Exception { - final SchemaContext schemaCtx = - YangParserTestUtils.parseYangFiles(new File(getClass().getResource("/test.yang").toURI())); + final SchemaContext schemaCtx = YangParserTestUtils.parseYangSource("/test.yang"); final NormalizedNode data = prepareData(schemaCtx, "42"); final Entry, DataObject> fromNormalizedNode = fromNormalizedNode(data, schemaCtx); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java index f0ba3c2921..66f516baae 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java @@ -35,7 +35,7 @@ public class AugmentRelativeXPathTest extends AbstractTypesTest { @Test public void AugmentationWithRelativeXPathTest() throws IOException, SourceException, ReactorException { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java index 5a062c2ae7..b3912d48d6 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java @@ -39,7 +39,7 @@ public class AugmentedTypeTest { File ietfInterfaces = new File(getClass().getResource("/augment-test-models/ietf-interfaces@2012-11-15.yang") .toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, augmentTopology, + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, augmentTopology, augmentNetworkLink, augmentTopologyTunnels, ietfInterfaces); assertNotNull("Schema Context is null", context); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java index 142d50a66c..4cb2cdbd8e 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java @@ -11,6 +11,7 @@ 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; @@ -18,8 +19,11 @@ import java.util.List; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BinaryTypeTest { @@ -38,8 +42,8 @@ public class BinaryTypeTest { } @Test - public void binaryTypeTest() throws Exception { - final SchemaContext context = YangParserTestUtils.parseYangFiles(yangModels); + public void binaryTypeTest() throws IOException, SourceException, ReactorException { + final SchemaContext context = YangParserTestUtils.parseYangSources(yangModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java index d2e9d8d5ff..8c89adaab6 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java @@ -11,42 +11,49 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; + import com.google.common.collect.ImmutableList; import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URISyntaxException; import java.util.List; import org.junit.Test; +import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BindingGeneratorImplTest { @Test - public void isisTotpologyStatementParserTest() throws Exception { - final File topo = new File(getClass().getResource("/isis-topology/network-topology@2013-10-21.yang").toURI()); - final File isis = new File(getClass().getResource("/isis-topology/isis-topology@2013-10-21.yang").toURI()); - final File l3 = - new File(getClass().getResource("/isis-topology/l3-unicast-igp-topology@2013-10-21.yang").toURI()); + public void isisTotpologyStatementParserTest() throws IOException, + URISyntaxException, ReactorException { + final InputStream topo = getClass().getResourceAsStream("/isis-topology/network-topology@2013-10-21.yang"); + final InputStream isis = getClass().getResourceAsStream("/isis-topology/isis-topology@2013-10-21.yang"); + final InputStream l3 = getClass().getResourceAsStream("/isis-topology/l3-unicast-igp-topology@2013-10-21.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(ImmutableList.of(isis, l3, topo)); + SchemaContext context = YangParserTestUtils.parseYangStreams(ImmutableList.of(isis, l3, topo)); assertNotNull(context); - final List generateTypes = new BindingGeneratorImpl(false) + List generateTypes = new BindingGeneratorImpl(false) .generateTypes(context); assertFalse(generateTypes.isEmpty()); } @Test - public void choiceNodeGenerationTest() throws Exception { - final File resourceFile = new File(getClass().getResource( + public void choiceNodeGenerationTest() throws IOException, + URISyntaxException, ReactorException { + File resourceFile = new File(getClass().getResource( "/binding-generator-impl-test/choice-test.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(resourceFile); + SchemaContext context = YangParserTestUtils.parseYangSources(resourceFile); - final List generateTypes = new BindingGeneratorImpl(false) + List generateTypes = new BindingGeneratorImpl(false) .generateTypes(context); GeneratedType choiceTestData = null; @@ -56,7 +63,7 @@ public class BindingGeneratorImplTest { GeneratedType myList2 = null; GeneratedType myContainer2 = null; - for (final Type type : generateTypes) { + for (Type type : generateTypes) { switch (type.getName()) { case "ChoiceTestData": choiceTestData = (GeneratedType) type; @@ -88,7 +95,7 @@ public class BindingGeneratorImplTest { List implements1 = myContainer.getImplements(); Type childOfParamType = null; - for (final Type type : implements1) { + for (Type type : implements1) { if (type.getName().equals("ChildOf")) { childOfParamType = ((ParameterizedType) type) .getActualTypeArguments()[0]; @@ -100,7 +107,7 @@ public class BindingGeneratorImplTest { implements1 = myList.getImplements(); childOfParamType = null; - for (final Type type : implements1) { + for (Type type : implements1) { if (type.getName().equals("ChildOf")) { childOfParamType = ((ParameterizedType) type) .getActualTypeArguments()[0]; @@ -112,7 +119,7 @@ public class BindingGeneratorImplTest { implements1 = myContainer2.getImplements(); childOfParamType = null; - for (final Type type : implements1) { + for (Type type : implements1) { if (type.getName().equals("ChildOf")) { childOfParamType = ((ParameterizedType) type) .getActualTypeArguments()[0]; @@ -124,7 +131,7 @@ public class BindingGeneratorImplTest { implements1 = myList2.getImplements(); childOfParamType = null; - for (final Type type : implements1) { + for (Type type : implements1) { if (type.getName().equals("ChildOf")) { childOfParamType = ((ParameterizedType) type) .getActualTypeArguments()[0]; @@ -137,17 +144,17 @@ public class BindingGeneratorImplTest { } @Test - public void notificationGenerationTest() throws Exception { - final File resourceFile = new File(getClass().getResource( + public void notificationGenerationTest() throws IOException, URISyntaxException, ReactorException { + File resourceFile = new File(getClass().getResource( "/binding-generator-impl-test/notification-test.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(resourceFile); + SchemaContext context = YangParserTestUtils.parseYangSources(resourceFile); - final List generateTypes = new BindingGeneratorImpl(false) + List generateTypes = new BindingGeneratorImpl(false) .generateTypes(context); GeneratedType foo = null; - for (final Type type : generateTypes) { + for (Type type : generateTypes) { if (type.getName().equals("Foo")) { foo = (GeneratedType) type; break; @@ -156,8 +163,8 @@ public class BindingGeneratorImplTest { Type childOf = null; Type dataObject = null; - final List impl = foo.getImplements(); - for (final Type type : impl) { + List impl = foo.getImplements(); + for (Type type : impl) { switch (type.getName()) { case "ChildOf": childOf = type; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java index 0afac68bdc..a740edb044 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java @@ -38,7 +38,7 @@ public class BitAndUnionTOEnclosingTest { public static void parseResources() throws IOException, SourceException, ReactorException { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java index 1d104f819a..c5ea0f5073 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java @@ -28,7 +28,7 @@ public class Bug4145Test { File resourceFile = new File(getClass().getResource( "/bug-4145/foo.yang").toURI()); - SchemaContext context = YangParserTestUtils.parseYangFiles(resourceFile); + SchemaContext context = YangParserTestUtils.parseYangSources(resourceFile); List generateTypes = new BindingGeneratorImpl(false) .generateTypes(context); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java index ef2a0fe50d..91824645a6 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java @@ -10,23 +10,26 @@ package org.opendaylight.mdsal.binding.generator.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import java.io.File; + +import java.io.FileNotFoundException; +import java.net.URISyntaxException; import java.util.List; import org.junit.Ignore; import org.junit.Test; +import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; import org.opendaylight.mdsal.binding.model.api.Enumeration; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug6135Test { @Ignore @Test - public void bug6135Test() throws Exception { - final SchemaContext context = YangParserTestUtils - .parseYangFiles(new File(Bug6135Test.class.getResource("/bug-6135/foo.yang").toURI())); + public void bug6135Test() throws FileNotFoundException, ReactorException, URISyntaxException { + final SchemaContext context = YangParserTestUtils.parseYangSource("/bug-6135/foo.yang"); assertNotNull(context); final List generateTypes = new BindingGeneratorImpl(false).generateTypes(context); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java index 8129af65a7..942c6f4187 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java @@ -59,7 +59,7 @@ public class ChoiceCaseGenTypesTest extends AbstractTypesTest { @Test public void choiceCaseResolvingTypeTest() throws IOException, SourceException, ReactorException { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java index 985934633a..3a349fe48a 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java @@ -27,7 +27,7 @@ public class ControllerTest { File co = new File(getClass().getResource("/controller-models/controller-openflow.yang").toURI()); File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(cn, co, ietfInetTypes); + final SchemaContext context = YangParserTestUtils.parseYangSources(cn, co, ietfInetTypes); assertNotNull("Schema Context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java index 6d0c7efec3..630387876f 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java @@ -31,7 +31,7 @@ public class ExtendedTypedefTest { File abstractTopology = new File(getClass().getResource("/typedef-of-typedef/typedef_of_typedef.yang").toURI()); File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInetTypes); + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInetTypes); assertNotNull("Schema Context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java index 064f593fd1..d1496f0fb4 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java @@ -35,7 +35,7 @@ public class GenEnumResolvingTest { .toURI()); File ianaIfTypeModel = new File(getClass().getResource("/ietf/iana-if-type.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(ietfInterfaces, ianaIfTypeModel); + final SchemaContext context = YangParserTestUtils.parseYangSources(ietfInterfaces, ianaIfTypeModel); assertTrue(context != null); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -97,7 +97,7 @@ public class GenEnumResolvingTest { @Test public void testTypedefEnumResolving() throws URISyntaxException, IOException, SourceException, ReactorException { File ianaIfType = new File(getClass().getResource("/ietf/iana-if-type.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(ianaIfType); + final SchemaContext context = YangParserTestUtils.parseYangSources(ianaIfType); assertTrue(context != null); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); final List genTypes = bindingGen.generateTypes(context); @@ -119,7 +119,7 @@ public class GenEnumResolvingTest { .toURI()); File ianaIfType = new File(getClass().getResource("/ietf/iana-if-type.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInterfaces, + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInterfaces, ianaIfType); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java index 4d907b044b..e1d53a7dc8 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java @@ -33,7 +33,7 @@ public class GenTypesSubSetTest { File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI()); File ietfYangTypes = new File(getClass().getResource("/ietf/ietf-yang-types.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInterfaces, + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInterfaces, ietfInetTypes, ietfYangTypes); Set modules = context.getModules(); @@ -65,7 +65,7 @@ public class GenTypesSubSetTest { File ietfYangTypes = new File(getClass().getResource("/ietf/ietf-yang-types.yang").toURI()); File ianaIfType = new File(getClass().getResource("/ietf/iana-if-type.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInterfaces, + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInterfaces, ietfInetTypes, ietfYangTypes, ianaIfType); assertNotNull("Schema Context is null", context); final Set modules = context.getModules(); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java index fb0b51fcb5..624b0a4b89 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java @@ -28,7 +28,7 @@ public class GenerateInnerClassForBitsAndUnionInLeavesTest { public void testInnerClassCreationForBitsAndUnionsInLeafes() throws Exception { final URI yangTypesPath = getClass().getResource("/bit_and_union_in_leaf.yang").toURI(); - final SchemaContext context = YangParserTestUtils.parseYangFiles(new File(yangTypesPath)); + final SchemaContext context = YangParserTestUtils.parseYangSources(new File(yangTypesPath)); assertTrue(context != null); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java index ed89c6add0..8146fd4bf4 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java @@ -33,7 +33,7 @@ public class GeneratedTypesBitsTest { public void testGeneretedTypesBitsTest() throws Exception { final URI yangTypesPath = getClass().getResource("/simple-bits-demo.yang").toURI(); - final SchemaContext context = YangParserTestUtils.parseYangFiles(new File(yangTypesPath)); + final SchemaContext context = YangParserTestUtils.parseYangSources(new File(yangTypesPath)); assertTrue(context != null); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java index 9b9c75d92c..47c275a71d 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java @@ -14,29 +14,34 @@ import static org.junit.Assert.assertTrue; 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.List; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesLeafrefTest { @Test - public void testLeafrefResolving() throws Exception { - final File abstractTopology = new File(getClass().getResource( + public void testLeafrefResolving() throws URISyntaxException, IOException, SourceException, ReactorException { + File abstractTopology = new File(getClass().getResource( "/leafref-test-models/abstract-topology@2013-02-08.yang").toURI()); - final File ietfInterfaces = new File(getClass().getResource("/ietf/ietf-interfaces.yang").toURI()); - final File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI()); - final File ietfYangTypes = new File(getClass().getResource("/ietf/ietf-yang-types.yang").toURI()); + File ietfInterfaces = new File(getClass().getResource("/ietf/ietf-interfaces.yang").toURI()); + File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI()); + File ietfYangTypes = new File(getClass().getResource("/ietf/ietf-yang-types.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInterfaces, + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInterfaces, ietfInetTypes, ietfYangTypes); assertNotNull(context); assertEquals(4, context.getModules().size()); @@ -56,7 +61,7 @@ public class GeneratedTypesLeafrefTest { GeneratedTransferObject gtTunnelKey = null; GeneratedType gtTopology = null; for (final Type type : genTypes) { - final String name = type.getName(); + String name = type.getName(); if ("InterfaceKey".equals(name)) { gtIfcKey = (GeneratedTransferObject) type; } else if ("Interface".equals(name)) { @@ -95,7 +100,7 @@ public class GeneratedTypesLeafrefTest { } } assertNotNull(condLeafref); - final Type condLeafRT = condLeafref.getReturnType(); + Type condLeafRT = condLeafref.getReturnType(); assertNotNull(condLeafRT); assertEquals("java.lang.Object", condLeafRT.getFullyQualifiedName()); @@ -109,7 +114,7 @@ public class GeneratedTypesLeafrefTest { } } assertNotNull(ifcIdProp); - final Type ifcIdPropType = ifcIdProp.getReturnType(); + Type ifcIdPropType = ifcIdProp.getReturnType(); assertNotNull(ifcIdPropType); assertEquals("java.lang.String", ifcIdPropType.getFullyQualifiedName()); @@ -126,13 +131,13 @@ public class GeneratedTypesLeafrefTest { } } assertNotNull(getIfcKey); - final Type getIfcKeyType = getIfcKey.getReturnType(); + Type getIfcKeyType = getIfcKey.getReturnType(); assertNotNull(getIfcKeyType); assertNotSame("java.lang.Void", getIfcKeyType); assertEquals("InterfaceKey", getIfcKeyType.getName()); assertNotNull(getHigherLayerIf); - final Type getHigherLayerIfType = getHigherLayerIf.getReturnType(); + Type getHigherLayerIfType = getHigherLayerIf.getReturnType(); assertNotNull(getHigherLayerIfType); assertNotSame("java.lang.Void", getHigherLayerIfType); assertEquals("List", getHigherLayerIfType.getName()); @@ -141,13 +146,13 @@ public class GeneratedTypesLeafrefTest { final List gtNetworkLinkMethods = gtNetworkLink.getMethodDefinitions(); assertNotNull(gtNetworkLinkMethods); MethodSignature getIfc = null; - for (final MethodSignature method : gtNetworkLinkMethods) { + for (MethodSignature method : gtNetworkLinkMethods) { if (method.getName().equals("getInterface")) { getIfc = method; } } assertNotNull(getIfc); - final Type getIfcType = getIfc.getReturnType(); + Type getIfcType = getIfc.getReturnType(); assertNotNull(getIfcType); assertNotSame("java.lang.Void", getIfcType); assertEquals("String", getIfcType.getName()); @@ -156,13 +161,13 @@ public class GeneratedTypesLeafrefTest { final List gtSourceMethods = gtSource.getMethodDefinitions(); assertNotNull(gtSourceMethods); MethodSignature getIdSource = null; - for (final MethodSignature method : gtSourceMethods) { + for (MethodSignature method : gtSourceMethods) { if (method.getName().equals("getId")) { getIdSource = method; } } assertNotNull(getIdSource); - final Type getIdType = getIdSource.getReturnType(); + Type getIdType = getIdSource.getReturnType(); assertNotNull(getIdType); assertNotSame("java.lang.Void", getIdType); assertEquals("Uri", getIdType.getName()); @@ -171,13 +176,13 @@ public class GeneratedTypesLeafrefTest { final List gtDestMethods = gtDest.getMethodDefinitions(); assertNotNull(gtDestMethods); MethodSignature getIdDest = null; - for (final MethodSignature method : gtDestMethods) { + for (MethodSignature method : gtDestMethods) { if (method.getName().equals("getId")) { getIdDest = method; } } assertNotNull(getIdDest); - final Type getIdDestType = getIdDest.getReturnType(); + Type getIdDestType = getIdDest.getReturnType(); assertNotNull(getIdDestType); assertNotSame("java.lang.Void", getIdDestType); assertEquals("Uri", getIdDestType.getName()); @@ -186,13 +191,13 @@ public class GeneratedTypesLeafrefTest { final List gtTunnelMethods = gtTunnel.getMethodDefinitions(); assertNotNull(gtTunnelMethods); MethodSignature getTunnelKey = null; - for (final MethodSignature method : gtTunnelMethods) { + for (MethodSignature method : gtTunnelMethods) { if (method.getName().equals("getKey")) { getTunnelKey = method; } } assertNotNull(getTunnelKey); - final Type getTunnelKeyType = getTunnelKey.getReturnType(); + Type getTunnelKeyType = getTunnelKey.getReturnType(); assertNotNull(getTunnelKeyType); assertNotSame("java.lang.Void", getTunnelKeyType); assertEquals("TunnelKey", getTunnelKeyType.getName()); @@ -207,18 +212,18 @@ public class GeneratedTypesLeafrefTest { } } assertNotNull(tunnelId); - final Type tunnelIdType = tunnelId.getReturnType(); + Type tunnelIdType = tunnelId.getReturnType(); assertNotNull(tunnelIdType); assertNotSame("java.lang.Void", tunnelIdType); assertEquals("Uri", tunnelIdType.getName()); } @Test - public void testLeafrefInvalidPathResolving() throws Exception { + public void testLeafrefInvalidPathResolving() throws URISyntaxException, IOException, SourceException, ReactorException { final URI resource = getClass().getResource("/leafref-test-invalid-model/foo.yang").toURI(); assertNotNull(resource); - final SchemaContext context = YangParserTestUtils.parseYangFiles(new File(resource)); + final SchemaContext context = YangParserTestUtils.parseYangSources(new File(resource)); assertNotNull(context); assertEquals(1, context.getModules().size()); @@ -226,8 +231,8 @@ public class GeneratedTypesLeafrefTest { try { bindingGen.generateTypes(context); fail("Expected IllegalArgumentException caused by invalid leafref path"); - } catch (final IllegalArgumentException e) { - final String expected = "Failed to find leafref target"; + } catch (IllegalArgumentException e) { + String expected = "Failed to find leafref target"; assertTrue(e.getMessage().contains(expected)); } } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java index 4d81a65da1..067ae8eb6e 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java @@ -41,7 +41,7 @@ public class GeneratedTypesStringTest { @Test public void constantGenerationTest() throws IOException, SourceException, ReactorException { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java index 3a5bfee0c5..b47b3dd1cb 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java @@ -34,7 +34,7 @@ public class GeneratedTypesTest { File abstractTopology = new File(getClass().getResource("/abstract-topology.yang").toURI()); File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInetTypes); + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInetTypes); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -47,7 +47,7 @@ public class GeneratedTypesTest { @Test public void testContainerResolving() throws URISyntaxException, IOException, SourceException, ReactorException { final File testFile = new File(getClass().getResource("/simple-container-demo.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testFile); + final SchemaContext context = YangParserTestUtils.parseYangSources(testFile); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -132,7 +132,7 @@ public class GeneratedTypesTest { @Test public void testLeafListResolving() throws URISyntaxException, IOException, SourceException, ReactorException { final File testFile = new File(getClass().getResource("/simple-leaf-list-demo.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testFile); + final SchemaContext context = YangParserTestUtils.parseYangSources(testFile); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -216,7 +216,7 @@ public class GeneratedTypesTest { @Test public void testListResolving() throws URISyntaxException, IOException, SourceException, ReactorException { final File testFile = new File(getClass().getResource("/simple-list-demo.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testFile); + final SchemaContext context = YangParserTestUtils.parseYangSources(testFile); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -339,7 +339,7 @@ public class GeneratedTypesTest { @Test public void testListCompositeKeyResolving() throws URISyntaxException, IOException, SourceException, ReactorException { final File testFile = new File(getClass().getResource("/list-composite-key.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testFile); + final SchemaContext context = YangParserTestUtils.parseYangSources(testFile); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -391,7 +391,7 @@ public class GeneratedTypesTest { @Test public void testGeneratedTypes() throws URISyntaxException, IOException, SourceException, ReactorException { final File testFile = new File(getClass().getResource("/demo-topology.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testFile); + final SchemaContext context = YangParserTestUtils.parseYangSources(testFile); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java index 823b14865e..b206cdfa9b 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java @@ -60,7 +60,7 @@ public class IdentityrefTypeTest { */ @Test public void testIdentityrefYangBuiltInType() throws IOException, SourceException, ReactorException { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java index c58f01e0ee..9b6005cf67 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/TypeProviderIntegrationTest.java @@ -38,7 +38,7 @@ public class TypeProviderIntegrationTest { .toURI()); File ietfInetTypes = new File(TypeProviderIntegrationTest.class.getResource("/ietf/ietf-inet-types.yang") .toURI()); - context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInetTypes); + context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInetTypes); assertNotNull(context); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java index 788b037984..300b2a2396 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java @@ -28,7 +28,7 @@ public class UnionTypeDefTest { public void unionTypeResolvingTest() throws Exception { final File abstractTopology = new File(getClass().getResource("/union-test-models/abstract-topology.yang").toURI()); final File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI()); - final SchemaContext context = YangParserTestUtils.parseYangFiles(abstractTopology, ietfInetTypes); + final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInetTypes); assertNotNull("context is null", context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -43,7 +43,7 @@ public class UnionTypeDefTest { @Test public void unionTypedefLeafrefTest() throws Exception { final File yang = new File(getClass().getResource("/leafref_typedef_union/bug8449.yang").toURI()); - final SchemaContext schemaContext = YangParserTestUtils.parseYangFiles(yang); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSources(yang); assertNotNull(schemaContext); final List generateTypes = new BindingGeneratorImpl(false).generateTypes(schemaContext); assertNotNull(generateTypes); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java index 2c73beb7c9..7d07af7504 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java @@ -45,7 +45,7 @@ public class UsesTest { @Test public void usesInGroupingDependenciesTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-dependencies.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -100,7 +100,7 @@ public class UsesTest { public void usesInCaseTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-case.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -148,7 +148,7 @@ public class UsesTest { public void usesInContainerTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-container.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -201,7 +201,7 @@ public class UsesTest { public void usesInGroupingTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-grouping.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -252,7 +252,7 @@ public class UsesTest { public void usesInListTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-list.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -334,7 +334,7 @@ public class UsesTest { public void usesInModulTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-modul.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -385,7 +385,7 @@ public class UsesTest { public void usesInRpcTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-rpc.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -478,7 +478,7 @@ public class UsesTest { public void usesInAugmentTest() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-augment.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); @@ -531,7 +531,7 @@ public class UsesTest { public void usesInNotification() throws IOException, SourceException, ReactorException { List testModels = loadTestResources("/uses-of-grouping/uses-of-grouping-notification.yang"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java index d2e21a0277..64af70e8b4 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.File; +import java.io.InputStream; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collections; @@ -33,6 +33,8 @@ import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** @@ -59,10 +61,10 @@ public class BaseYangTypesTest { private static BooleanTypeDefinition bool = null; @BeforeClass - public static void setup() throws Exception { - final List modelsToParse = Collections - .singletonList(new File(BaseYangTypesTest.class.getResource("/base-yang-types.yang").toURI())); - schemaContext = YangParserTestUtils.parseYangFiles(modelsToParse); + public static void setup() throws SourceException, ReactorException { + final List modelsToParse = Collections + .singletonList(BaseYangTypesTest.class.getResourceAsStream("/base-yang-types.yang")); + schemaContext = YangParserTestUtils.parseYangStreams(modelsToParse); assertNotNull(schemaContext); initTypeDefinitionsFromSchemaContext(); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java index 1577884e76..81b733b826 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/Bug4621.java @@ -10,10 +10,13 @@ package org.opendaylight.mdsal.binding.yang.types; import static org.junit.Assert.assertNotNull; import java.io.File; +import java.io.FileNotFoundException; import java.net.URI; +import java.net.URISyntaxException; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.opendaylight.mdsal.binding.yang.types.TypeProviderImpl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -21,6 +24,7 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug4621 { @@ -29,10 +33,10 @@ public class Bug4621 { public ExpectedException expectedEx = ExpectedException.none(); @Test - public void bug4621test() throws Exception { - final File file = new File(getClass().getResource("/bug-4621/foo.yang").toURI()); + public void bug4621test() throws FileNotFoundException, ReactorException, URISyntaxException { + File file = new File(getClass().getResource("/bug-4621/foo.yang").toURI()); - final SchemaContext schemaContext = YangParserTestUtils.parseYangFiles(file); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSources(file); final Module moduleValid = schemaContext.findModuleByNamespace(new URI("foo")).iterator().next(); final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext); @@ -40,10 +44,10 @@ public class Bug4621 { final QName listNode = QName.create(moduleValid.getQNameModule(), "neighbor"); final QName leafrefNode = QName.create(moduleValid.getQNameModule(), "neighbor2-id"); - final DataSchemaNode leafrefRel = ((ListSchemaNode) moduleValid.getDataChildByName(listNode)) + DataSchemaNode leafrefRel = ((ListSchemaNode) moduleValid.getDataChildByName(listNode)) .getDataChildByName(leafrefNode); - final LeafSchemaNode leafRel = (LeafSchemaNode) leafrefRel; - final TypeDefinition leafTypeRel = leafRel.getType(); + LeafSchemaNode leafRel = (LeafSchemaNode) leafrefRel; + TypeDefinition leafTypeRel = leafRel.getType(); assertNotNull(typeProvider.javaTypeForSchemaDefinitionType(leafTypeRel, leafRel)); } } \ No newline at end of file diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java index a99a820a57..0aa5658665 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java @@ -48,7 +48,7 @@ public class TypeProviderImplTest { public void testLeafRefRelativeSelfReference() throws Exception { File relative = new File(getClass().getResource("/leafref/leafref-relative-invalid.yang").toURI()); - final SchemaContext schemaContext = YangParserTestUtils.parseYangFiles(relative); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSources(relative); final Module moduleRelative = schemaContext.findModuleByNamespace(new URI("urn:xml:ns:yang:lrr")).iterator() .next(); final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext); @@ -67,7 +67,7 @@ public class TypeProviderImplTest { public void testLeafRefAbsoluteSelfReference() throws Exception { File relative = new File(getClass().getResource("/leafref/leafref-absolute-invalid.yang").toURI()); - final SchemaContext schemaContext = YangParserTestUtils.parseYangFiles(relative); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSources(relative); final Module moduleRelative = schemaContext.findModuleByNamespace(new URI("urn:xml:ns:yang:lra")).iterator() .next(); final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext); @@ -86,7 +86,7 @@ public class TypeProviderImplTest { public void testLeafRefRelativeAndAbsoluteValidReference() throws Exception { File valid = new File(getClass().getResource("/leafref/leafref-valid.yang").toURI()); - final SchemaContext schemaContext = YangParserTestUtils.parseYangFiles(valid); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSources(valid); final Module moduleValid = schemaContext.findModuleByNamespace(new URI("urn:xml:ns:yang:lrv")).iterator() .next(); final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext); @@ -113,7 +113,7 @@ public class TypeProviderImplTest { public void testMethodsOfTypeProviderImpl() throws Exception { final File abstractTopology = new File(getClass().getResource("/base-yang-types.yang").toURI()); - final SchemaContext schemaContext = YangParserTestUtils.parseYangFiles(abstractTopology); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSources(abstractTopology); final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderModel.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderModel.java index 8d20e9fee8..6349e65823 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderModel.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderModel.java @@ -7,10 +7,12 @@ */ package org.opendaylight.mdsal.binding.yang.types; -import java.io.File; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** @@ -25,20 +27,20 @@ public final class TypeProviderModel { private static final String TEST_TYPE_PROVIDER_PATH = "/"+TEST_TYPE_PROVIDER_MODULE_NAME+".yang"; private static final String TEST_TYPE_PROVIDER_B_PATH = "/test-type-provider-b.yang"; - private static File getFile(final String resourceName) throws Exception { - return new File(TypeProviderModel.class.getResource(resourceName).toURI()); + private static InputStream getInputStream(final String resourceName) { + return TypeProviderModel.class.getResourceAsStream(resourceName); } - private static List provideTestModelStreams() throws Exception { - final List arrayList = new ArrayList<>(); + private static List provideTestModelStreams() { + final List arrayList = new ArrayList<>(); - arrayList.add(getFile(BASE_YANG_TYPES_PATH)); - arrayList.add(getFile(TEST_TYPE_PROVIDER_PATH)); - arrayList.add(getFile(TEST_TYPE_PROVIDER_B_PATH)); + arrayList.add(getInputStream(BASE_YANG_TYPES_PATH)); + arrayList.add(getInputStream(TEST_TYPE_PROVIDER_PATH)); + arrayList.add(getInputStream(TEST_TYPE_PROVIDER_B_PATH)); return arrayList; } - public static SchemaContext createTestContext() throws Exception { - return YangParserTestUtils.parseYangFiles(provideTestModelStreams()); + public static SchemaContext createTestContext() throws SourceException, ReactorException { + return YangParserTestUtils.parseYangStreams(provideTestModelStreams()); } } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java index 6af6031558..fdd752336d 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java @@ -46,6 +46,8 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; /** * Test suite for testing public methods in TypeProviderImpl class @@ -68,7 +70,7 @@ public class TypeProviderTest { private SchemaNode schemaNode; @Before - public void setUp() throws Exception { + public void setUp() throws SourceException, ReactorException { MockitoAnnotations.initMocks(this); this.schemaContext = TypeProviderModel.createTestContext(); assertNotNull(this.schemaContext); 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 c5e5583ebe..d37e495ab8 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 @@ -83,7 +83,7 @@ public class BindingGeneratorUtilTest { public void testBindingGeneratorUtilMethods() throws Exception { List testModels = loadTestResources("/module.yang"); - final Set modules = YangParserTestUtils.parseYangFiles(testModels).getModules(); + final Set modules = YangParserTestUtils.parseYangSources(testModels).getModules(); String packageName = ""; Module module = null; for (Module m : modules) { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java index 1b348fb8ee..9ccc6d3891 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java @@ -30,7 +30,7 @@ public class AugmentToUsesInAugmentCompilationTest extends BaseCompilationTest { assertTrue("Failed to create test file '" + compiledOutputDir + "'", compiledOutputDir.mkdir()); final List sourceFiles = CompilationTestUtils.getSourceFiles("/compilation/augment-uses-to-augment"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug1276Test.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug1276Test.java index d34d6e63a0..8dd59bd4e7 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug1276Test.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug1276Test.java @@ -89,7 +89,7 @@ public class Bug1276Test extends BaseCompilationTest { private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java index cc3e303fab..eb00557eb3 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug5151Test.java @@ -72,7 +72,7 @@ public class Bug5151Test extends BaseCompilationTest { private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug532Test.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug532Test.java index bd31b634b3..410e233381 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug532Test.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/Bug532Test.java @@ -112,7 +112,7 @@ public class Bug532Test extends BaseCompilationTest { private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CascadeUsesCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CascadeUsesCompilationTest.java index d164574bff..9f42e58536 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CascadeUsesCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CascadeUsesCompilationTest.java @@ -47,7 +47,7 @@ public class CascadeUsesCompilationTest extends BaseCompilationTest { assertTrue("Failed to create test file '" + compiledOutputDir + "'", compiledOutputDir.mkdir()); final List sourceFiles = getSourceFiles("/compilation/cascade-uses"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java index 1b8cdbe761..8a750aeed0 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java @@ -49,7 +49,7 @@ public class ClassCodeGeneratorTest { @Test public void compositeKeyClassTest() throws IOException, SourceException, ReactorException { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final SchemaContext context = YangParserTestUtils.parseYangSources(testModels); assertNotNull(context); final BindingGenerator bindingGen = new BindingGeneratorImpl(true); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTest.java index 7499d8fe80..d694c02999 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTest.java @@ -664,7 +664,7 @@ public class CompilationTest extends BaseCompilationTest { private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); Collections.sort(types, (o1, o2) -> o2.getName().compareTo(o1.getName())); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/EncodingInJavaDocTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/EncodingInJavaDocTest.java index 2e6369baab..ca0a131a01 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/EncodingInJavaDocTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/EncodingInJavaDocTest.java @@ -38,7 +38,7 @@ public class EncodingInJavaDocTest extends BaseCompilationTest { assertTrue("Failed to create test file '" + compiledOutputDir + "'", compiledOutputDir.mkdir()); final List sourceFiles = getSourceFiles("/compilation/encoding-javadoc"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/NestedGroupingCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/NestedGroupingCompilationTest.java index 9f16a35f8c..a3230b8a5e 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/NestedGroupingCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/NestedGroupingCompilationTest.java @@ -78,7 +78,7 @@ public class NestedGroupingCompilationTest extends BaseCompilationTest { private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/TypedefCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/TypedefCompilationTest.java index 3b0c0fe38e..53e6b1f9a1 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/TypedefCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/TypedefCompilationTest.java @@ -45,7 +45,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertTrue("Failed to create test file '" + compiledOutputDir + "'", compiledOutputDir.mkdir()); final List sourceFiles = CompilationTestUtils.getSourceFiles("/compilation/typedef"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionTypedefUnusedImportTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionTypedefUnusedImportTest.java index cfa2e7a1a8..0aacf1e882 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionTypedefUnusedImportTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionTypedefUnusedImportTest.java @@ -41,7 +41,7 @@ public class UnionTypedefUnusedImportTest extends BaseCompilationTest { assertTrue("Failed to create test file '" + compiledOutputDir + "'", compiledOutputDir.mkdir()); final List sourceFiles = getSourceFiles("/compilation/union-typedef"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(new HashSet<>(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionWithIdentityrefTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionWithIdentityrefTest.java index a8478097d3..60d1aeecf7 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionWithIdentityrefTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/UnionWithIdentityrefTest.java @@ -71,7 +71,7 @@ public class UnionWithIdentityrefTest extends BaseCompilationTest { private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources(sourceFiles); final List types = bindingGenerator.generateTypes(context); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); generator.generateToFile(sourcesOutputDir); diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/class-name-collision.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/class-name-collision similarity index 100% rename from binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/class-name-collision.yang rename to binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/class-name-collision diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/configuration.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/configuration similarity index 100% rename from binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/configuration.yang rename to binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/configuration diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/other-module.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/other-module similarity index 100% rename from binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/other-module.yang rename to binding/mdsal-binding-java-api-generator/src/test/resources/compilation/class-name-collision/other-module diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenTypeTest.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenTypeTest.java index 095e44b599..fd5f15e370 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenTypeTest.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenTypeTest.java @@ -15,7 +15,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.base.Optional; -import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -166,8 +165,7 @@ public class AugmentToGenTypeTest { assertNotNull(generate); generate.setAccessible(true); - final SchemaContext context = - YangParserTestUtils.parseYangFiles(new File(getClass().getResource("/generator/test.yang").toURI())); + final SchemaContext context = YangParserTestUtils.parseYangSource("/generator/test.yang"); final TypeProvider typeProvider = new TypeProviderImpl(context); final Map genCtx = new HashMap<>(); final Map> genTypeBuilders = new HashMap<>(); @@ -187,8 +185,7 @@ public class AugmentToGenTypeTest { assertNotNull(generate); generate.setAccessible(true); - final SchemaContext context = YangParserTestUtils - .parseYangFiles(new File(getClass().getResource("/generator/test-augment.yang").toURI())); + final SchemaContext context = YangParserTestUtils.parseYangSource("/generator/test-augment.yang"); final TypeProvider typeProvider = new TypeProviderImpl(context); final Map genCtx = mock(Map.class); final Collection moduleContexts = new ArrayList<>(); diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtilsTest.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtilsTest.java index 2e37c5b549..f43d0caca3 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtilsTest.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtilsTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.io.File; + import java.io.FileNotFoundException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -194,8 +194,7 @@ public class AuxiliaryGenUtilsTest { assertNotNull(generate); generate.setAccessible(true); - final SchemaContext schemaContext = YangParserTestUtils - .parseYangFiles(new File(getClass().getResource("/generator/test-list.yang").toURI())); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSource("/generator/test-list.yang"); final ListSchemaNode containerSchemaNode = (ListSchemaNode) schemaContext.getModules().iterator().next().getChildNodes().iterator().next(); final String fullyQualifiedName = @@ -223,8 +222,7 @@ public class AuxiliaryGenUtilsTest { generate.setAccessible(true); final SchemaContext schemaContext = - YangParserTestUtils.parseYangFiles( - new File(getClass().getResource("/base/test-leaf-with-description.yang").toURI())); + YangParserTestUtils.parseYangSource("/base/test-leaf-with-description.yang"); final LeafSchemaNode containerSchemaNode = (LeafSchemaNode) schemaContext.getModules().iterator().next().getChildNodes().iterator().next(); final String fullyQualifiedName = "test.base.cont.with.leaf.MyList"; @@ -243,8 +241,7 @@ public class AuxiliaryGenUtilsTest { assertNotNull(generate); generate.setAccessible(true); - final SchemaContext schemaContext = - YangParserTestUtils.parseYangFiles(new File(getClass().getResource("/base/test-module.yang").toURI())); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSource("/base/test-module.yang"); final Object[] args = { schemaContext.getModules().iterator().next(), true }; final String result = (String) generate.invoke(AuxiliaryGenUtils.class, args); @@ -261,8 +258,7 @@ public class AuxiliaryGenUtilsTest { assertNotNull(generate); generate.setAccessible(true); - final SchemaContext schemaContext = YangParserTestUtils - .parseYangFiles(new File(getClass().getResource("/base/test-rpc-and-notification.yang").toURI())); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSource("/base/test-rpc-and-notification.yang"); final Module module = schemaContext.getModules().iterator().next(); Set schemaNodes = new HashSet<>(); schemaNodes.add(module.getRpcs().iterator().next()); @@ -491,8 +487,7 @@ public class AuxiliaryGenUtilsTest { final GeneratedTypeBuilder typeBuilder = new GeneratedTypeBuilderImpl("test.boolean.spc.def", "spec-type-def", new ModuleContext()); - final SchemaContext schemaContext = - YangParserTestUtils.parseYangFiles(new File(getClass().getResource(yangPath).toURI())); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSource(yangPath); final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext); final LeafSchemaNode leafSchemaNode = (LeafSchemaNode) schemaContext.getModules().iterator().next().getChildNodes().iterator().next(); @@ -516,8 +511,7 @@ public class AuxiliaryGenUtilsTest { final GeneratedTypeBuilder typeBuilder = new GeneratedTypeBuilderImpl("test.boolean.spc.def", "spec-type-def", new ModuleContext()); - final SchemaContext schemaContext = - YangParserTestUtils.parseYangFiles(new File(getClass().getResource("/base/test-union.yang").toURI())); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSource("/base/test-union.yang"); final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext); final LeafSchemaNode leafSchemaNode = (LeafSchemaNode) schemaContext.getModules().iterator().next().getChildNodes().iterator().next(); diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/BindingGeneratorImplTest.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/BindingGeneratorImplTest.java index e06edd2c64..fbfe586b69 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/BindingGeneratorImplTest.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/BindingGeneratorImplTest.java @@ -12,8 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.File; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; import org.junit.Test; @@ -32,8 +30,7 @@ public class BindingGeneratorImplTest { @Test public void genTypesTypeDefTest() throws Exception { final BindingGeneratorImpl bg = new BindingGeneratorImpl(false); - final SchemaContext schemaContext = YangParserTestUtils - .parseYangFiles(new File(getClass().getResource("/generator/test-typedef.yang").toURI())); + final SchemaContext schemaContext = YangParserTestUtils.parseYangSource("/generator/test-typedef.yang"); final List generateTypes = bg.generateTypes(schemaContext); assertNotNull(generateTypes); for (final Type genType : generateTypes) { @@ -52,8 +49,7 @@ public class BindingGeneratorImplTest { @Test public void generatedTypesEnumTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final SchemaContext context = YangParserTestUtils - .parseYangFiles(new File(getClass().getResource("/generator/apple-test.yang").toURI())); + final SchemaContext context = YangParserTestUtils.parseYangSource("/generator/apple-test.yang"); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); assertTrue(!generateTypes.isEmpty()); @@ -76,10 +72,10 @@ public class BindingGeneratorImplTest { @Test public void generatedTypesUsesEnumLeafTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final List sources = new ArrayList<>(); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype-base.yang").toURI())); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype.yang").toURI())); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sources); + final List sources = new ArrayList<>(); + sources.add("/uses-statement/test-uses-leaf-innertype-base.yang"); + sources.add("/uses-statement/test-uses-leaf-innertype.yang"); + final SchemaContext context = YangParserTestUtils.parseYangSources(sources); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); assertTrue(!generateTypes.isEmpty()); @@ -103,10 +99,10 @@ public class BindingGeneratorImplTest { @Test public void generatedTypesUsesBitsLeafTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final List sources = new ArrayList<>(); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype2-base.yang").toURI())); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype2.yang").toURI())); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sources); + final List sources = new ArrayList<>(); + sources.add("/uses-statement/test-uses-leaf-innertype2-base.yang"); + sources.add("/uses-statement/test-uses-leaf-innertype2.yang"); + final SchemaContext context = YangParserTestUtils.parseYangSources(sources); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); assertTrue(!generateTypes.isEmpty()); @@ -114,7 +110,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("MyCont") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype2.base.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getLeafBits")) { assertEquals("LeafBits", methodSignature.getReturnType().getName()); } @@ -125,7 +121,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("MyCont") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype2.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getLeafBits")) { assertEquals("LeafBits", methodSignature.getReturnType().getName()); } @@ -137,10 +133,10 @@ public class BindingGeneratorImplTest { @Test public void generatedTypesUsesUnionLeafTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final List sources = new ArrayList<>(); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype2-base.yang").toURI())); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype2.yang").toURI())); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sources); + final List sources = new ArrayList<>(); + sources.add("/uses-statement/test-uses-leaf-innertype2-base.yang"); + sources.add("/uses-statement/test-uses-leaf-innertype2.yang"); + final SchemaContext context = YangParserTestUtils.parseYangSources(sources); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); assertTrue(!generateTypes.isEmpty()); @@ -148,7 +144,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("MyCont") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype2.base.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getLeafUnion")) { assertEquals("LeafUnion", methodSignature.getReturnType().getName()); } @@ -159,7 +155,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("MyCont") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype2.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getLeafUnion")) { assertEquals("LeafUnion", methodSignature.getReturnType().getName()); } @@ -171,10 +167,10 @@ public class BindingGeneratorImplTest { @Test public void generatedTypesUsesLeafTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final List sources = new ArrayList<>(); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype2-base.yang").toURI())); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype2.yang").toURI())); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sources); + final List sources = new ArrayList<>(); + sources.add("/uses-statement/test-uses-leaf-innertype2-base.yang"); + sources.add("/uses-statement/test-uses-leaf-innertype2.yang"); + final SchemaContext context = YangParserTestUtils.parseYangSources(sources); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); assertTrue(!generateTypes.isEmpty()); @@ -182,7 +178,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("MyCont") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype2.base.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getLeafDecimal64")) { assertEquals("BigDecimal", methodSignature.getReturnType().getName()); } @@ -193,7 +189,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("MyCont") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype2.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getLeafDecimal64")) { assertEquals("BigDecimal", methodSignature.getReturnType().getName()); } @@ -205,10 +201,10 @@ public class BindingGeneratorImplTest { @Test public void generatedTypesUsesLeafInnertype3Test() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final List sources = new ArrayList<>(); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype3-base.yang").toURI())); - sources.add(new File(getClass().getResource("/uses-statement/test-uses-leaf-innertype3.yang").toURI())); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sources); + final List sources = new ArrayList<>(); + sources.add("/uses-statement/test-uses-leaf-innertype3-base.yang"); + sources.add("/uses-statement/test-uses-leaf-innertype3.yang"); + final SchemaContext context = YangParserTestUtils.parseYangSources(sources); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); assertTrue(!generateTypes.isEmpty()); @@ -216,7 +212,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("MyCont") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype3.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getBandwidth")) { assertEquals("Bandwidth", methodSignature.getReturnType().getName()); } @@ -227,7 +223,7 @@ public class BindingGeneratorImplTest { if (type.getName().equals("Open") && type.getPackageName() .equals("org.opendaylight.mdsal.gen.javav2.urn.test.uses.leaf.innertype3.rev170809.data")) { final GeneratedType gt = (GeneratedType) type; - for (final MethodSignature methodSignature : gt.getMethodDefinitions()) { + for (MethodSignature methodSignature : gt.getMethodDefinitions()) { if (methodSignature.getName().equals("getVersion")) { assertEquals("ProtocolVersion", methodSignature.getReturnType().getName()); } @@ -244,8 +240,7 @@ public class BindingGeneratorImplTest { @Test public void generatedTypesTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final SchemaContext context = YangParserTestUtils - .parseYangFiles(new File(getClass().getResource("/generator/test-list.yang").toURI())); + final SchemaContext context = YangParserTestUtils.parseYangSource("/generator/test-list.yang"); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); @@ -289,7 +284,7 @@ public class BindingGeneratorImplTest { @Test public void generateTypesDescriptionsTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(true); - final SchemaContext context = YangParserTestUtils.parseYangFiles(getFiles("/base/with_import/")); + final SchemaContext context = YangParserTestUtils.parseYangSources("/base/with_import/"); assertNotNull(context); final List generateTypes = bg.generateTypes(context, context.getModules()); @@ -311,7 +306,7 @@ public class BindingGeneratorImplTest { @Test public void generateTypesIdentityTest() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(true); - final SchemaContext context = YangParserTestUtils.parseYangFiles(getFiles("/identity/")); + final SchemaContext context = YangParserTestUtils.parseYangSources("/identity/"); assertNotNull(context); final List generateTypes = bg.generateTypes(context, context.getModules()); @@ -342,10 +337,6 @@ public class BindingGeneratorImplTest { } } - private File[] getFiles(final String path) throws URISyntaxException { - return new File(getClass().getResource(path).toURI()).listFiles(); - } - private void testActualType(final GeneratedType t, final int[] test_i) { MethodSignature methodSignature = null; switch (t.getName()) { diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8542Test.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8542Test.java index 3cc065c54c..a8c7c095b5 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8542Test.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8542Test.java @@ -11,20 +11,18 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.File; -import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.javav2.generator.api.BindingGenerator; import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; +import java.util.List; public class Bug8542Test { @Test public void Bug8542Test() throws Exception { final BindingGenerator bg = new BindingGeneratorImpl(false); - final SchemaContext context = YangParserTestUtils - .parseYangFiles(new File(getClass().getResource("/bug-8542/recursive-uses-augment.yang").toURI())); + final SchemaContext context = YangParserTestUtils.parseYangSource("/bug-8542/recursive-uses-augment.yang"); final List generateTypes = bg.generateTypes(context); assertNotNull(generateTypes); assertTrue(!generateTypes.isEmpty()); diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8575Test.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8575Test.java index 149fa06210..c94f93346b 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8575Test.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/Bug8575Test.java @@ -38,7 +38,7 @@ public class Bug8575Test { File foo = new File(getClass().getResource( "/bug-8575/foo.yang").toURI()); - SchemaContext context = YangParserTestUtils.parseYangFiles(foo); + SchemaContext context = YangParserTestUtils.parseYangSources(foo); final QName groupingQname = QName.create("foo", "2017-05-15", "A"); final QName containerQname = QName.create("foo", "2017-05-15", "A1"); diff --git a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java index f6523140fb..2484b4a80b 100644 --- a/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java +++ b/binding2/mdsal-binding2-generator-impl/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/impl/YangTemplateTest.java @@ -11,10 +11,8 @@ package org.opendaylight.mdsal.binding.javav2.generator.impl; import static org.junit.Assert.assertTrue; import com.google.common.annotations.Beta; -import java.io.File; import java.io.FileNotFoundException; import java.net.URISyntaxException; -import java.net.URL; import java.util.Iterator; import java.util.Set; import org.junit.Assert; @@ -33,8 +31,7 @@ public class YangTemplateTest { @Before public void setup() throws URISyntaxException, ReactorException, FileNotFoundException { - File[] listFiles = new File(getClass().getResource("/yang-template").toURI()).listFiles(); - this.modules = YangParserTestUtils.parseYangFiles(listFiles).getModules(); + this.modules = YangParserTestUtils.parseYangSources("/yang-template").getModules(); } @Test diff --git a/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFileTest.java b/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFileTest.java index 47bbe5b43d..57c7e8d958 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFileTest.java +++ b/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFileTest.java @@ -27,8 +27,7 @@ public class GeneratorJavaFileTest { @Test public void generatedFilesTest() throws Exception { - final File[] listFiles = new File(getClass().getResource("/base/with_import/").toURI()).listFiles(); - final SchemaContext context = YangParserTestUtils.parseYangFiles(listFiles); + final SchemaContext context = YangParserTestUtils.parseYangSources("/base/with_import/"); final BindingGenerator bindingGenerator = new BindingGeneratorImpl(true); final List types = bindingGenerator.generateTypes(context, context.getModules()); final BuildContext buildContext = new DefaultBuildContext(); diff --git a/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContextTest.java b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContextTest.java index 74213576c7..5df2959ebb 100644 --- a/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContextTest.java +++ b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContextTest.java @@ -29,7 +29,7 @@ public class BindingRuntimeContextTest { @Before public void setup() throws URISyntaxException, FileNotFoundException, ReactorException { - schemaContext = YangParserTestUtils.parseYangFiles( + schemaContext = YangParserTestUtils.parseYangSources( new File(getClass().getResource("/yang/test-runtime.yang").toURI())); myCont = (DataNodeContainer) schemaContext.getChildNodes().iterator().next(); brc = BindingRuntimeContext.create(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), schemaContext); diff --git a/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtilsTest.java b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtilsTest.java index c26a3f2989..d87b5685a0 100644 --- a/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtilsTest.java +++ b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtilsTest.java @@ -36,7 +36,7 @@ public class BindingSchemaContextUtilsTest { @Before public void setup() throws URISyntaxException, FileNotFoundException, ReactorException { - schemaContext = YangParserTestUtils.parseYangFiles( + schemaContext = YangParserTestUtils.parseYangSources( new File(getClass().getResource("/yang/test-runtime.yang").toURI())); myCont = (DataNodeContainer) schemaContext.getChildNodes().iterator().next(); myChoice = (ChoiceSchemaNode) myCont.getChildNodes().iterator().next(); diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerMultiShardTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerMultiShardTest.java index 5bd0a44f92..4da15e53fb 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerMultiShardTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerMultiShardTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.common.util.concurrent.Futures; -import java.net.URISyntaxException; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -56,6 +55,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContaine import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +68,7 @@ public class ShardedDOMDataTreeProducerMultiShardTest { static { try { schemaContext = TestModel.createTestContext(); - } catch (final URISyntaxException e) { + } catch (final ReactorException e) { LOG.error("Unable to create schema context for TestModel", e); } } diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeTest.java index 90d034b37a..3a3a2e8a1b 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.common.util.concurrent.ListenableFuture; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -59,6 +58,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableCo import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,7 +71,7 @@ public class ShardedDOMDataTreeTest { static { try { schemaContext = TestModel.createTestContext(); - } catch (final URISyntaxException e) { + } catch (final ReactorException e) { LOG.error("Unable to create schema context for TestModel", e); } } @@ -219,7 +219,7 @@ public class ShardedDOMDataTreeTest { final DOMDataTreeListener mockedDataTreeListener = mock(DOMDataTreeListener.class); doNothing().when(mockedDataTreeListener).onDataTreeChanged(anyCollection(), anyMap()); - final InMemoryDOMDataTreeShard testShard = InMemoryDOMDataTreeShard.create(TEST_ID, executor, 1); + InMemoryDOMDataTreeShard testShard = InMemoryDOMDataTreeShard.create(TEST_ID, executor, 1); testShard.onGlobalContextUpdated(schemaContext); final DOMDataTreeProducer regProducer = dataTreeService.createProducer(Collections.singleton(TEST_ID)); @@ -277,7 +277,7 @@ public class ShardedDOMDataTreeTest { tx.createCursor(new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, oid1)); assertNotNull(cursor); - final MapNode innerList = ImmutableMapNodeBuilder + MapNode innerList = ImmutableMapNodeBuilder .create() .withNodeIdentifier(new NodeIdentifier(TestModel.INNER_LIST_QNAME)) .build(); diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java index 9aa98879c1..2f97daa948 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java @@ -7,12 +7,12 @@ */ package org.opendaylight.mdsal.dom.broker.util; -import java.io.File; -import java.net.URISyntaxException; +import java.io.InputStream; import java.util.Collections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class TestModel { @@ -49,11 +49,11 @@ public class TestModel { YangInstanceIdentifier.builder(ANOTHER_SHARD_PATH).node(NEW_SHARD_LIST).build(); private static final String DATASTORE_TEST_YANG = "/odl-datastore-test.yang"; - public static SchemaContext createTestContext() throws URISyntaxException { - return YangParserTestUtils.parseYangFiles(Collections.singletonList(getFile())); + public static SchemaContext createTestContext() throws ReactorException { + return YangParserTestUtils.parseYangStreams(Collections.singletonList(getInputStream())); } - private static File getFile() throws URISyntaxException { - return new File(TestModel.class.getResource(DATASTORE_TEST_YANG).toURI()); + private static InputStream getInputStream() { + return TestModel.class.getResourceAsStream(DATASTORE_TEST_YANG); } } diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java index 38184890a7..9748505cbf 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java @@ -15,6 +15,7 @@ import static org.junit.Assert.assertTrue; import com.google.common.base.Optional; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import java.io.IOException; import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Ignore; @@ -38,6 +39,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; public class InMemoryDataStoreTest { @@ -45,7 +48,7 @@ public class InMemoryDataStoreTest { private InMemoryDOMDataStore domStore; @Before - public void setupStore() throws Exception { + public void setupStore() throws IOException, YangSyntaxErrorException, ReactorException { domStore = new InMemoryDOMDataStore("TEST", MoreExecutors.newDirectExecutorService()); schemaContext = TestModel.createTestContext(); domStore.onGlobalContextUpdated(schemaContext); @@ -56,57 +59,57 @@ public class InMemoryDataStoreTest { assertNotNull(domStore); - final DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); + DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); assertNotNull(readTx); - final DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); + DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); /** * Writes /test in writeTx. */ - final NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx.write(TestModel.TEST_PATH, testNode); /** * Reads /test from writeTx Read should return container. */ - final ListenableFuture>> writeTxContainer = writeTx.read(TestModel.TEST_PATH); + ListenableFuture>> writeTxContainer = writeTx.read(TestModel.TEST_PATH); assertEquals("read: isPresent", true, writeTxContainer.get().isPresent()); assertEquals("read: data", testNode, writeTxContainer.get().get()); /** * Reads /test from readTx Read should return Absent. */ - final ListenableFuture>> readTxContainer = readTx.read(TestModel.TEST_PATH); + ListenableFuture>> readTxContainer = readTx.read(TestModel.TEST_PATH); assertEquals("read: isPresent", false, readTxContainer.get().isPresent()); } @Test public void testTransactionCommit() throws InterruptedException, ExecutionException { - final DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); + DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); /** * Writes /test in writeTx. */ - final NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx.write(TestModel.TEST_PATH, testNode); /** * Reads /test from writeTx Read should return container. */ - final ListenableFuture>> writeTxContainer = writeTx.read(TestModel.TEST_PATH); + ListenableFuture>> writeTxContainer = writeTx.read(TestModel.TEST_PATH); assertEquals("read: isPresent", true, writeTxContainer.get().isPresent()); assertEquals("read: data", testNode, writeTxContainer.get().get()); - final DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); + DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); assertThreePhaseCommit(cohort); - final Optional> afterCommitRead = - domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get(); + Optional> afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH) + .get(); assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent()); assertEquals("After commit read: data", testNode, afterCommitRead.get()); } @@ -186,10 +189,10 @@ public class InMemoryDataStoreTest { @Test public void testExistsForExistingData() throws Exception { - final DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); + DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); - final ContainerNode containerNode = ImmutableContainerNodeBuilder.create() + ContainerNode containerNode = ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME)) .addChild(ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME) .addChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, @@ -201,13 +204,13 @@ public class InMemoryDataStoreTest { assertEquals(Boolean.TRUE, exists.get()); - final DOMStoreThreePhaseCommitCohort ready = writeTx.ready(); + DOMStoreThreePhaseCommitCohort ready = writeTx.ready(); ready.preCommit().get(); ready.commit().get(); - final DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); + DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); assertNotNull(readTx); exists = @@ -219,14 +222,14 @@ public class InMemoryDataStoreTest { @Test public void testExistsForNonExistingData() throws Exception { - final DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); + DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); ListenableFuture exists = writeTx.exists(TestModel.TEST_PATH); assertEquals(Boolean.FALSE, exists.get()); - final DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); + DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); assertNotNull(readTx); exists = @@ -238,7 +241,7 @@ public class InMemoryDataStoreTest { @Test(expected = ReadFailedException.class) public void testExistsThrowsReadFailedException() throws Exception { - final DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); + DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); assertNotNull(readTx); readTx.close(); @@ -251,7 +254,7 @@ public class InMemoryDataStoreTest { @Test(expected = ReadFailedException.class) public void testReadWithReadOnlyTransactionClosed() throws Throwable { - final DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); + DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction(); assertNotNull(readTx); readTx.close(); @@ -263,11 +266,11 @@ public class InMemoryDataStoreTest { @Test(expected = ReadFailedException.class) public void testReadWithReadOnlyTransactionFailure() throws Throwable { - final DataTreeSnapshot mockSnapshot = Mockito.mock(DataTreeSnapshot.class); + DataTreeSnapshot mockSnapshot = Mockito.mock(DataTreeSnapshot.class); Mockito.doThrow(new RuntimeException("mock ex")).when(mockSnapshot) .readNode(Mockito.any(YangInstanceIdentifier.class)); - final DOMStoreReadTransaction readTx = SnapshotBackedTransactions.newReadTransaction("1", true, mockSnapshot); + DOMStoreReadTransaction readTx = SnapshotBackedTransactions.newReadTransaction("1", true, mockSnapshot); doReadAndThrowEx(readTx); } @@ -276,7 +279,7 @@ public class InMemoryDataStoreTest { @Test(expected = ReadFailedException.class) public void testReadWithReadWriteTransactionClosed() throws Throwable { - final DOMStoreReadTransaction readTx = domStore.newReadWriteTransaction(); + DOMStoreReadTransaction readTx = domStore.newReadWriteTransaction(); assertNotNull(readTx); readTx.close(); @@ -288,15 +291,15 @@ public class InMemoryDataStoreTest { @Test(expected = ReadFailedException.class) public void testReadWithReadWriteTransactionFailure() throws Throwable { - final DataTreeSnapshot mockSnapshot = Mockito.mock(DataTreeSnapshot.class); - final DataTreeModification mockModification = Mockito.mock(DataTreeModification.class); + DataTreeSnapshot mockSnapshot = Mockito.mock(DataTreeSnapshot.class); + DataTreeModification mockModification = Mockito.mock(DataTreeModification.class); Mockito.doThrow(new RuntimeException("mock ex")).when(mockModification) .readNode(Mockito.any(YangInstanceIdentifier.class)); Mockito.doReturn(mockModification).when(mockSnapshot).newModification(); @SuppressWarnings("unchecked") - final TransactionReadyPrototype mockReady = Mockito.mock(TransactionReadyPrototype.class); - final DOMStoreReadTransaction readTx = - SnapshotBackedTransactions.newReadWriteTransaction("1", false, mockSnapshot, mockReady); + TransactionReadyPrototype mockReady = Mockito.mock(TransactionReadyPrototype.class); + DOMStoreReadTransaction readTx = SnapshotBackedTransactions.newReadWriteTransaction( + "1", false, mockSnapshot, mockReady); doReadAndThrowEx(readTx); } @@ -305,7 +308,7 @@ public class InMemoryDataStoreTest { private static void doReadAndThrowEx(final DOMStoreReadTransaction readTx) throws Throwable { try { readTx.read(TestModel.TEST_PATH).get(); - } catch (final ExecutionException e) { + } catch (ExecutionException e) { throw e.getCause(); } } @@ -313,7 +316,7 @@ public class InMemoryDataStoreTest { @Test(expected = IllegalStateException.class) public void testWriteWithTransactionReady() throws Exception { - final DOMStoreWriteTransaction writeTx = domStore.newWriteOnlyTransaction(); + DOMStoreWriteTransaction writeTx = domStore.newWriteOnlyTransaction(); writeTx.ready(); @@ -324,7 +327,7 @@ public class InMemoryDataStoreTest { @Test(expected = IllegalStateException.class) public void testReadyWithTransactionAlreadyReady() throws Exception { - final DOMStoreWriteTransaction writeTx = domStore.newWriteOnlyTransaction(); + DOMStoreWriteTransaction writeTx = domStore.newWriteOnlyTransaction(); writeTx.ready(); @@ -335,31 +338,31 @@ public class InMemoryDataStoreTest { @Test public void testTransactionAbort() throws InterruptedException, ExecutionException { - final DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); + DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); assertTestContainerWrite(writeTx); - final DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); + DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); assertTrue(cohort.canCommit().get().booleanValue()); cohort.preCommit().get(); cohort.abort().get(); - final Optional> afterCommitRead = - domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get(); + Optional> afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH) + .get(); assertFalse(afterCommitRead.isPresent()); } @Test public void testTransactionChain() throws InterruptedException, ExecutionException { - final DOMStoreTransactionChain txChain = domStore.createTransactionChain(); + DOMStoreTransactionChain txChain = domStore.createTransactionChain(); assertNotNull(txChain); /** * We alocate new read-write transaction and write /test. */ - final DOMStoreReadWriteTransaction firstTx = txChain.newReadWriteTransaction(); + DOMStoreReadWriteTransaction firstTx = txChain.newReadWriteTransaction(); assertTestContainerWrite(firstTx); /** @@ -372,7 +375,7 @@ public class InMemoryDataStoreTest { * We alocate chained transaction - read transaction, note first one is * still not commited to datastore. */ - final DOMStoreReadTransaction secondReadTx = txChain.newReadOnlyTransaction(); + DOMStoreReadTransaction secondReadTx = txChain.newReadOnlyTransaction(); /** * We test if we are able to read data from tx, read should not fail @@ -384,7 +387,7 @@ public class InMemoryDataStoreTest { * We alocate next transaction, which is still based on first one, but * is read-write. */ - final DOMStoreReadWriteTransaction thirdDeleteTx = txChain.newReadWriteTransaction(); + DOMStoreReadWriteTransaction thirdDeleteTx = txChain.newReadWriteTransaction(); /** * We test existence of /test in third transaction container should @@ -400,7 +403,7 @@ public class InMemoryDataStoreTest { /** * third transaction is sealed. */ - final DOMStoreThreePhaseCommitCohort thirdDeleteTxCohort = thirdDeleteTx.ready(); + DOMStoreThreePhaseCommitCohort thirdDeleteTxCohort = thirdDeleteTx.ready(); /** * We commit first transaction. @@ -409,7 +412,7 @@ public class InMemoryDataStoreTest { assertThreePhaseCommit(firstWriteTxCohort); // Alocates store transacion - final DOMStoreReadTransaction storeReadTx = domStore.newReadOnlyTransaction(); + DOMStoreReadTransaction storeReadTx = domStore.newReadOnlyTransaction(); /** * We verify transaction is commited to store, container should exists * in datastore. @@ -425,8 +428,8 @@ public class InMemoryDataStoreTest { @Test @Ignore public void testTransactionConflict() throws InterruptedException, ExecutionException { - final DOMStoreReadWriteTransaction txOne = domStore.newReadWriteTransaction(); - final DOMStoreReadWriteTransaction txTwo = domStore.newReadWriteTransaction(); + DOMStoreReadWriteTransaction txOne = domStore.newReadWriteTransaction(); + DOMStoreReadWriteTransaction txTwo = domStore.newReadWriteTransaction(); assertTestContainerWrite(txOne); assertTestContainerWrite(txTwo); @@ -466,7 +469,7 @@ public class InMemoryDataStoreTest { private static Optional> assertTestContainerExists(final DOMStoreReadTransaction readTx) throws InterruptedException, ExecutionException { - final ListenableFuture>> writeTxContainer = readTx.read(TestModel.TEST_PATH); + ListenableFuture>> writeTxContainer = readTx.read(TestModel.TEST_PATH); assertTrue(writeTxContainer.get().isPresent()); return writeTxContainer.get(); } diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java index a70dff231d..8e4cf2b8f7 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java @@ -7,11 +7,14 @@ */ package org.opendaylight.controller.md.sal.dom.store.impl; -import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.util.Collections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; +import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class TestModel { @@ -31,11 +34,11 @@ public class TestModel { YangInstanceIdentifier.builder(TEST_PATH).node(OUTER_LIST_QNAME).build(); private static final String DATASTORE_TEST_YANG = "/odl-datastore-test.yang"; - public static SchemaContext createTestContext() throws Exception { - return YangParserTestUtils.parseYangFiles(Collections.singletonList(getFile())); + public static SchemaContext createTestContext() throws IOException, YangSyntaxErrorException, ReactorException { + return YangParserTestUtils.parseYangStreams(Collections.singletonList(getInputStream())); } - private static File getFile() throws Exception { - return new File(TestModel.class.getResource(DATASTORE_TEST_YANG).toURI()); + private static InputStream getInputStream() { + return TestModel.class.getResourceAsStream(DATASTORE_TEST_YANG); } }