X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=binding%2Fmdsal-binding-java-api-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fjava%2Fapi%2Fgenerator%2Ftest%2FBaseCompilationTest.java;h=d1d6f396be9ae287a21810c1824eccfa547a3e4c;hb=d1081ff6798c7678eaaa5decb1a389a884389f51;hp=c31cfd42f656ec625b12483c095cbef8d66f6d94;hpb=29b8a6e7b1ad3b7b9fa7043f27c4d2129f082d6f;p=mdsal.git 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 c31cfd42f6..d1d6f396be 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 @@ -10,6 +10,8 @@ package org.opendaylight.mdsal.binding.java.api.generator.test; import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Table; +import com.google.common.collect.Table.Cell; import com.google.common.io.Files; import java.io.File; import java.io.IOException; @@ -18,6 +20,7 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.function.Supplier; import org.junit.Before; import org.junit.BeforeClass; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; @@ -25,7 +28,7 @@ import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; import org.opendaylight.mdsal.binding.java.api.generator.YangModuleInfoTemplate; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.binding.BindingMapping; +import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -53,7 +56,12 @@ public abstract class BaseCompilationTest { Collections.sort(types, (o1, o2) -> o2.getName().compareTo(o1.getName())); final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types)); - generator.generateToFile(sourcesOutputDir); + final Table> generatedFiles = generator.generateFileContent(true); + for (Cell> cell : generatedFiles.cellSet()) { + final File target = new File(sourcesOutputDir, cell.getColumnKey()); + Files.createParentDirs(target); + Files.asCharSink(target, StandardCharsets.UTF_8).write(cell.getValue().get()); + } } protected final List generateTestSources(final String resourceDirPath, final File sourcesOutputDir)