X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-java-api-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fjava%2Fapi%2Fgenerator%2FUnionTypedefUnusedImportTest.java;h=153353ac56f461b8cd6a13c02f85aed53e2302b2;hb=31776f5c9d96892e93b8378ca09dc0c3caa41c2c;hp=8e35df7a72d09060f555daa2ce37e61e1a8a2efd;hpb=0efe5a0d2cffb6a2e4e78570f79f367cc234d74e;p=mdsal.git

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTypedefUnusedImportTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTypedefUnusedImportTest.java
index 8e35df7a72..153353ac56 100644
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTypedefUnusedImportTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTypedefUnusedImportTest.java
@@ -7,54 +7,22 @@
  */
 package org.opendaylight.mdsal.binding.java.api.generator;
 
-import static org.junit.Assert.assertFalse;
-import static org.opendaylight.mdsal.binding.java.api.generator.CompilationTestUtils.FS;
-import static org.opendaylight.mdsal.binding.java.api.generator.CompilationTestUtils.GENERATOR_OUTPUT_PATH;
+import static org.junit.Assert.assertEquals;
 import static org.opendaylight.mdsal.binding.java.api.generator.CompilationTestUtils.cleanUp;
 import static org.opendaylight.mdsal.binding.java.api.generator.CompilationTestUtils.testCompilation;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.List;
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 
 public class UnionTypedefUnusedImportTest extends BaseCompilationTest {
-
     @Test
     public void testUnionTypedefUnusedImport() throws Exception {
         final File sourcesOutputDir = CompilationTestUtils.generatorOutput("union-typedef");
-        final List<GeneratedType> types = generateTestSources("/compilation/union-typedef", sourcesOutputDir);
-
-        final boolean isUsedImport = containsImport(
-            "org.opendaylight.yang.gen.v1.org.opendaylight.yangtools.union.typedef.rev130208.TypedefUnion");
-        assertFalse(String.format("Class shouldn't contain import for this type '%s'", types.get(1).getName()),
-                isUsedImport);
+        final var types = generateTestSources("/compilation/union-typedef", sourcesOutputDir);
+        assertEquals(2, types.size());
 
         final File compiledOutputDir = CompilationTestUtils.compilerOutput("union-typedef");
         testCompilation(sourcesOutputDir, compiledOutputDir);
         cleanUp(sourcesOutputDir, compiledOutputDir);
     }
-
-    private static String readFile(final String path, final Charset encoding) throws IOException {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
-
-    private static boolean containsImport(final String fullImport) throws URISyntaxException, IOException {
-        final String filePath = GENERATOR_OUTPUT_PATH + FS + "union-typedef" + FS + "org" + FS + "opendaylight" + FS
-                + "yang" + FS + "gen" + FS + "v1" + FS + "org" + FS + "opendaylight" + FS + "yangtools" + FS + "union"
-                + FS + "typedef" + FS + "rev141124" + FS + "TypedefUnionBuilder.java";
-        final String fileContent = readFile(filePath, StandardCharsets.UTF_8);
-
-        if (fileContent.contains(fullImport)) {
-            return true;
-        }
-        return false;
-    }
 }