From: Vratko Polak Date: Thu, 28 Sep 2017 12:36:56 +0000 (+0200) Subject: Revert "Fix broken tests according to yangtools... X-Git-Tag: v14.0.0~1444 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c8628897d3d84cf871ae308b684aac2a007be540;p=yangtools.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 6c26a1cd0acb2b898b80cb099ed0352c29410230. Change-Id: I31732adc545df92fdb82e7047a19624b2454639d Signed-off-by: Vratko Polak --- 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