From: Robert Varga Date: Mon, 7 May 2018 12:48:14 +0000 (+0200) Subject: Cleanup mdsal-binding-java-api-generator compilation tests X-Git-Tag: release/fluorine~220 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=47f758c43c2c7957aaf474d75848010936abef65;p=mdsal.git Cleanup mdsal-binding-java-api-generator compilation tests Various subclasses of BaseCompilationTest have used copy&pasted code to generate sources using the same pattern. Rather than doing that, centralize code generation in the base class, simplifying the test cases. Change-Id: I75f10d321805de641cd48a4e69c8115e6514ee91 Signed-off-by: Robert Varga --- 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 1e569c35e5..9420ea6e39 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 @@ -9,18 +9,12 @@ package org.opendaylight.mdsal.binding.java.api.generator.test; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableSet; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; -import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class AugmentToUsesInAugmentCompilationTest extends BaseCompilationTest { @@ -28,11 +22,7 @@ public class AugmentToUsesInAugmentCompilationTest extends BaseCompilationTest { public void testAugmentToUsesInAugment() throws IOException, URISyntaxException { final File sourcesOutputDir = CompilationTestUtils.generatorOutput("augment-uses-to-augment"); final File compiledOutputDir = CompilationTestUtils.compilerOutput("augment-uses-to-augment"); - final List sourceFiles = CompilationTestUtils.getSourceFiles("/compilation/augment-uses-to-augment"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); - final List types = bindingGenerator.generateTypes(context); - final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); - generator.generateToFile(sourcesOutputDir); + generateTestSources("/compilation/augment-uses-to-augment", sourcesOutputDir); // Test if all sources are generated from 'module foo' File fooParent = new File(sourcesOutputDir, CompilationTestUtils.NS_FOO); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/BaseCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/BaseCompilationTest.java index cb95792066..cf0c28e683 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/BaseCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/BaseCompilationTest.java @@ -9,10 +9,20 @@ package org.opendaylight.mdsal.binding.java.api.generator.test; import static org.junit.Assert.assertTrue; +import com.google.common.collect.ImmutableSet; +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.List; import org.junit.Before; import org.junit.BeforeClass; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; +import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; +import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public abstract class BaseCompilationTest { @@ -32,4 +42,13 @@ public abstract class BaseCompilationTest { bindingGenerator = new BindingGeneratorImpl(); } + protected final void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) + throws IOException, URISyntaxException { + final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); + final SchemaContext context = YangParserTestUtils.parseYangFiles(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)); + 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 cf649baf33..bc4a23afda 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 @@ -9,21 +9,13 @@ package org.opendaylight.mdsal.binding.java.api.generator.test; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableSet; import java.io.File; -import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.Arrays; -import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Previous construction of union constructor @@ -85,14 +77,4 @@ public class Bug1276Test extends BaseCompilationTest { CompilationTestUtils.cleanUp(sourcesOutputDir, compiledOutputDir); } - - private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) - throws IOException, URISyntaxException { - final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(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 b07e6bc767..f43415b0d3 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 @@ -11,20 +11,12 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import java.io.File; import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.List; +import java.util.HashMap; import java.util.Map; import java.util.Scanner; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Bug5151 involves adding {@literal @}return annotations to accessor methods. @@ -37,7 +29,8 @@ public class Bug5151Test extends BaseCompilationTest { public void test() throws Exception { final File sourcesOutputDir = CompilationTestUtils.generatorOutput(BUG_ID); final File compiledOutputDir = CompilationTestUtils.compilerOutput(BUG_ID); - generateTestSources(CompilationTestUtils.FS + "compilation" + CompilationTestUtils.FS + BUG_ID, sourcesOutputDir); + generateTestSources(CompilationTestUtils.FS + "compilation" + CompilationTestUtils.FS + BUG_ID, + sourcesOutputDir); // Test if sources are compilable CompilationTestUtils.testCompilation(sourcesOutputDir, compiledOutputDir); @@ -59,27 +52,19 @@ public class Bug5151Test extends BaseCompilationTest { } private static boolean findInFile(final File file, final String searchText) throws FileNotFoundException { - final Scanner scanner = new Scanner(file); - while (scanner.hasNextLine()) { - final String nextLine = scanner.nextLine(); - if (nextLine.contains(searchText)) { - return true; + try (Scanner scanner = new Scanner(file)) { + while (scanner.hasNextLine()) { + final String nextLine = scanner.nextLine(); + if (nextLine.contains(searchText)) { + return true; + } } } return false; } - private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) - throws IOException, URISyntaxException { - final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); - final List types = bindingGenerator.generateTypes(context); - final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); - generator.generateToFile(sourcesOutputDir); - } - private static Map getFiles(final File path) { - return getFiles(path, Maps.newHashMap()); + return getFiles(path, new HashMap<>()); } private static Map getFiles(final File path, final Map files) { 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 9843a83ad0..11c0df596c 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 @@ -11,24 +11,16 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.BASE_PKG; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.cleanUp; -import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.testCompilation; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import java.io.File; -import java.io.IOException; import java.lang.reflect.Constructor; -import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.List; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Test correct functionality of copy constructor of generated builder classes. @@ -104,14 +96,4 @@ public class Bug532Test extends BaseCompilationTest { cleanUp(sourcesOutputDir, compiledOutputDir); } - - private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) - throws IOException, URISyntaxException { - final List sourceFiles = getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(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 7a59f33c23..533bfdec16 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 @@ -18,21 +18,14 @@ import static org.opendaylight.mdsal.binding.java.api.generator.test.Compilation import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.assertFilesCount; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.assertImplementsIfc; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.cleanUp; -import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.testCompilation; -import com.google.common.collect.ImmutableSet; import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; -import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class CascadeUsesCompilationTest extends BaseCompilationTest { @@ -40,11 +33,7 @@ public class CascadeUsesCompilationTest extends BaseCompilationTest { public void testCascadeUsesCompilation() throws Exception { final File sourcesOutputDir = CompilationTestUtils.generatorOutput("cascade-uses"); final File compiledOutputDir = CompilationTestUtils.compilerOutput("cascade-uses"); - final List sourceFiles = getSourceFiles("/compilation/cascade-uses"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); - final List types = bindingGenerator.generateTypes(context); - final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); - generator.generateToFile(sourcesOutputDir); + generateTestSources("/compilation/cascade-uses", sourcesOutputDir); // Test if all sources are generated from module foo File parent = new File(sourcesOutputDir, NS_FOO); 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 a245f4c519..df86d87863 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 @@ -13,10 +13,8 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import java.io.File; -import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -25,21 +23,15 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.WildcardType; import java.math.BigDecimal; import java.math.BigInteger; -import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Test correct code generation. @@ -641,17 +633,8 @@ public class CompilationTest extends BaseCompilationTest { CompilationTestUtils.cleanUp(sourcesOutputDir, compiledOutputDir); } - private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) - throws IOException, URISyntaxException { - final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(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)); - generator.generateToFile(sourcesOutputDir); - } - - private static void testReturnTypeIdentityref(final Class clazz, final String methodName, final String returnTypeStr) throws Exception { + private static void testReturnTypeIdentityref(final Class clazz, final String methodName, + final String returnTypeStr) throws Exception { Method method; java.lang.reflect.Type returnType; try { @@ -671,8 +654,8 @@ public class CompilationTest extends BaseCompilationTest { } } - private static void testReturnTypeInstanceIdentitifer(final ClassLoader loader, final Class clazz, final String methodName) - throws Exception { + private static void testReturnTypeInstanceIdentitifer(final ClassLoader loader, final Class clazz, + final String methodName) throws Exception { Method method; Class rawReturnType; java.lang.reflect.Type returnType; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTestUtils.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTestUtils.java index 0aebe8e90b..d9c8e88f5b 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTestUtils.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/CompilationTestUtils.java @@ -446,5 +446,4 @@ public class CompilationTestUtils { throw new RuntimeException("Failed to clean up after test"); } } - } 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 a8a71c1218..b5aa586ac0 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 @@ -8,17 +8,10 @@ package org.opendaylight.mdsal.binding.java.api.generator.test; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.cleanUp; -import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.testCompilation; -import com.google.common.collect.ImmutableSet; import java.io.File; -import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Test if generated classes from yang file is compilable, generated javadoc comments contains @@ -30,11 +23,7 @@ public class EncodingInJavaDocTest extends BaseCompilationTest { public void testAugmentToUsesInAugment() throws Exception { final File sourcesOutputDir = CompilationTestUtils.generatorOutput("encoding-javadoc"); final File compiledOutputDir = CompilationTestUtils.compilerOutput("encoding-javadoc"); - final List sourceFiles = getSourceFiles("/compilation/encoding-javadoc"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); - final List types = bindingGenerator.generateTypes(context); - final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); - generator.generateToFile(sourcesOutputDir); + generateTestSources("/compilation/encoding-javadoc", sourcesOutputDir); // Test if sources are compilable testCompilation(sourcesOutputDir, compiledOutputDir); 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 dfe572e05c..9d6b667209 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 @@ -13,21 +13,12 @@ import static org.opendaylight.mdsal.binding.java.api.generator.test.Compilation import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.assertFilesCount; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.assertImplementsIfc; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.cleanUp; -import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.mdsal.binding.java.api.generator.test.CompilationTestUtils.testCompilation; -import com.google.common.collect.ImmutableSet; import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; -import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Test correct code generation. @@ -71,14 +62,4 @@ public class NestedGroupingCompilationTest extends BaseCompilationTest { cleanUp(sourcesOutputDir, compiledOutputDir); } - - private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) - throws IOException, URISyntaxException { - final List sourceFiles = getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(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 8a646f1131..fd3af51eee 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 @@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import java.io.File; import java.lang.reflect.Constructor; @@ -23,10 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * Test correct code generation. @@ -41,11 +36,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { public void test() throws Exception { final File sourcesOutputDir = CompilationTestUtils.generatorOutput("typedef"); final File compiledOutputDir = CompilationTestUtils.compilerOutput("typedef"); - final List sourceFiles = CompilationTestUtils.getSourceFiles("/compilation/typedef"); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); - final List types = bindingGenerator.generateTypes(context); - final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); - generator.generateToFile(sourcesOutputDir); + generateTestSources("/compilation/typedef", sourcesOutputDir); File parent = new File(sourcesOutputDir, CompilationTestUtils.NS_FOO); File bitsExt = new File(parent, "BitsExt.java"); 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 eb4e010429..6ce9eeb307 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 @@ -11,18 +11,12 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.common.collect.ImmutableSet; import java.io.File; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; -import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * union constructor with indentityref @@ -64,12 +58,4 @@ public class UnionWithIdentityrefTest extends BaseCompilationTest { CompilationTestUtils.cleanUp(sourcesOutputDir, compiledOutputDir); } - - private void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception { - final List sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath); - final SchemaContext context = YangParserTestUtils.parseYangFiles(sourceFiles); - final List types = bindingGenerator.generateTypes(context); - final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); - generator.generateToFile(sourcesOutputDir); - } }