[ONOS-4583] Union defect fix.
Change-Id: Ic31866b9a1b7bd5d8209d5d22f4292ab9c79a118
diff --git a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ManagerCodeGeneratorTest.java b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ManagerCodeGeneratorTest.java
index c3b2fe7..6bde56f 100644
--- a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ManagerCodeGeneratorTest.java
+++ b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ManagerCodeGeneratorTest.java
@@ -39,7 +39,7 @@
/**
* Checks manager translation should not result in any exception.
*
- * @throws MojoExecutionException
+ * @throws MojoExecutionException when fails to do mojo operations
*/
@Test
public void processManagerTranslator() throws IOException, ParserException, MojoExecutionException {
@@ -73,7 +73,7 @@
/**
* Checks manager translation in different package should not result in any exception.
*
- * @throws MojoExecutionException
+ * @throws MojoExecutionException when fails to do mojo operations
*/
@Test
public void processManagerInDifferentPackageTranslator() throws IOException, ParserException,
@@ -102,7 +102,7 @@
/**
* Checks manager translation in different package should not result in any exception.
*
- * @throws MojoExecutionException
+ * @throws MojoExecutionException when fails to do mojo operations
*/
@Test
public void processManagerforMultiChildTranslator() throws IOException, ParserException,
@@ -140,6 +140,42 @@
assertThat(true, is(manager4.exists()));
deleteDirectory("target/manager/");
+ deleteDirectory("target/manager/");
+ }
+
+ /**
+ * Checks manager translation in different package should not result in any exception.
+ *
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processManagerforMultiChildWithDifferentPackageTranslator() throws IOException, ParserException,
+ MojoExecutionException {
+
+ String searchDir = "src/test/resources/manager/MultiChild";
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/manager/");
+ yangPluginConfig.setManagerCodeGenDir("target/manager1/");
+
+ utilManager.translateToJava(yangPluginConfig);
+
+ String file1 = "target/manager1/org/onosproject/yang/gen/v1/test8/test/rev20160704/Test8Manager.java";
+
+ File manager1 = new File(file1);
+ assertThat(true, is(manager1.exists()));
+
+
+ String file2 = "target/manager/org/onosproject/yang/gen/v1/test8/test/rev20160704/Test8Service.java";
+
+ File service2 = new File(file2);
+ assertThat(true, is(service2.exists()));
+
+ deleteDirectory("target/manager/");
deleteDirectory("target/manager1/");
}
}
diff --git a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/TypeDefTranslatorTest.java b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/TypeDefTranslatorTest.java
new file mode 100644
index 0000000..d433d41
--- /dev/null
+++ b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/TypeDefTranslatorTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.yangutils.plugin.manager;
+
+import java.io.IOException;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.junit.Test;
+import org.onosproject.yangutils.parser.exceptions.ParserException;
+import org.onosproject.yangutils.utils.io.impl.YangFileScanner;
+import org.onosproject.yangutils.utils.io.impl.YangPluginConfig;
+
+import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.deleteDirectory;
+
+/**
+ * Unit test case for typedef translator.
+ */
+public class TypeDefTranslatorTest {
+
+ private final YangUtilManager utilManager = new YangUtilManager();
+
+ /**
+ * Checks typedef translation should not result in any exception.
+ *
+ * @throws MojoExecutionException
+ */
+ @Test
+ public void processTypeDefTranslator() throws IOException, ParserException, MojoExecutionException {
+
+ String searchDir = "src/test/resources/typedefTranslator";
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/typedefTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/typedefTranslator/");
+ utilManager.translateToJava(yangPluginConfig);
+
+ deleteDirectory("target/typedefTranslator/");
+ }
+
+}
diff --git a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/UnionTranslatorTest.java b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/UnionTranslatorTest.java
index 46d4f67..b992d39 100644
--- a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/UnionTranslatorTest.java
+++ b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/UnionTranslatorTest.java
@@ -18,10 +18,12 @@
import java.io.IOException;
+import org.apache.maven.plugin.MojoExecutionException;
import org.junit.Test;
import org.onosproject.yangutils.datamodel.YangNode;
import org.onosproject.yangutils.parser.exceptions.ParserException;
import org.onosproject.yangutils.parser.impl.YangUtilsParserManager;
+import org.onosproject.yangutils.utils.io.impl.YangFileScanner;
import org.onosproject.yangutils.utils.io.impl.YangPluginConfig;
import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode;
@@ -52,5 +54,168 @@
deleteDirectory("target/UnionTestGenFile/");
}
+ /**
+ * Unit test case to test conflicting types.
+ *
+ * @throws IOException when fails to do IO operations
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processUnionIntUintConflictingTypes() throws IOException, MojoExecutionException {
+ String searchDir = "src/test/resources/unionTranslator/intuint";
+ YangUtilManager utilManager = new YangUtilManager();
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/unionTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/unionTranslator/");
+
+ utilManager.translateToJava(yangPluginConfig);
+ deleteDirectory("target/unionTranslator/");
+ }
+
+ /**
+ * Unit test case to test conflicting types.
+ *
+ * @throws IOException when fails to do IO operations
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processUnionUintIntConflictingTypes() throws IOException, MojoExecutionException {
+ String searchDir = "src/test/resources/unionTranslator/uintint";
+ YangUtilManager utilManager = new YangUtilManager();
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/unionTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/unionTranslator/");
+
+ utilManager.translateToJava(yangPluginConfig);
+ deleteDirectory("target/unionTranslator/");
+ }
+
+ /**
+ * Unit test case to test conflicting types.
+ *
+ * @throws IOException when fails to do IO operations
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processUnionLongUlongConflictingTypes() throws IOException, MojoExecutionException {
+ String searchDir = "src/test/resources/unionTranslator/longulong";
+ YangUtilManager utilManager = new YangUtilManager();
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/unionTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/unionTranslator/");
+
+ utilManager.translateToJava(yangPluginConfig);
+ deleteDirectory("target/unionTranslator/");
+ }
+
+ /**
+ * Unit test case to test conflicting types.
+ *
+ * @throws IOException when fails to do IO operations
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processUnionUlongLongConflictingTypes() throws IOException, MojoExecutionException {
+ String searchDir = "src/test/resources/unionTranslator/ulonglong";
+ YangUtilManager utilManager = new YangUtilManager();
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/unionTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/unionTranslator/");
+
+ utilManager.translateToJava(yangPluginConfig);
+ deleteDirectory("target/unionTranslator/");
+ }
+
+ /**
+ * Unit test case to test conflicting types.
+ *
+ * @throws IOException when fails to do IO operations
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processUnionIntUintUlongLongConflictingTypes() throws IOException, MojoExecutionException {
+ String searchDir = "src/test/resources/unionTranslator/intuintulonglong";
+ YangUtilManager utilManager = new YangUtilManager();
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/unionTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/unionTranslator/");
+
+ utilManager.translateToJava(yangPluginConfig);
+ deleteDirectory("target/unionTranslator/");
+ }
+
+ /**
+ * Unit test case to test conflicting types.
+ *
+ * @throws IOException when fails to do IO operations
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processUnionIntUintUlongLongStringConflictingTypes() throws IOException,
+ MojoExecutionException {
+ String searchDir = "src/test/resources/unionTranslator/intuintulonglongstring";
+ YangUtilManager utilManager = new YangUtilManager();
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/unionTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/unionTranslator/");
+
+ utilManager.translateToJava(yangPluginConfig);
+ deleteDirectory("target/unionTranslator/");
+ }
+
+ /**
+ * Unit test case to test conflicting types.
+ *
+ * @throws IOException when fails to do IO operations
+ * @throws MojoExecutionException when fails to do mojo operations
+ */
+ @Test
+ public void processUnionIntUintStringConflictingTypes() throws IOException,
+ MojoExecutionException {
+ String searchDir = "src/test/resources/unionTranslator/intuintstring";
+ YangUtilManager utilManager = new YangUtilManager();
+ utilManager.createYangFileInfoSet(YangFileScanner.getYangFiles(searchDir));
+ utilManager.parseYangFileInfoSet();
+ utilManager.createYangNodeSet();
+ utilManager.resolveDependenciesUsingLinker();
+
+ YangPluginConfig yangPluginConfig = new YangPluginConfig();
+ yangPluginConfig.setCodeGenDir("target/unionTranslator/");
+ yangPluginConfig.setManagerCodeGenDir("target/unionTranslator/");
+
+ utilManager.translateToJava(yangPluginConfig);
+ deleteDirectory("target/unionTranslator/");
+ }
+
// TODO enhance the test cases, after having a framework of translator test.
}