From 991f6884d1b801d7dc8bae45de1e39b8e1eb49b6 Mon Sep 17 00:00:00 2001 From: Bharat saraswal Date: Fri, 17 Jun 2016 12:16:25 +0530 Subject: [PATCH] ONOS-4719 - Environmental vaiables dependency removed from UT Change-Id: Id57ed2c7fbba9347b1b990c1305862460f78cbcd --- .../yangutils/plugin/manager/ChoiceCaseTranslatorTest.java | 5 ++--- .../yangutils/plugin/manager/EnumTranslatorTest.java | 5 ++--- .../yangutils/plugin/manager/NotificationTranslatorTest.java | 5 ++--- .../yangutils/plugin/manager/RpcTranslatorTest.java | 5 ++--- .../yangutils/plugin/manager/UnionTranslatorTest.java | 3 +-- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ChoiceCaseTranslatorTest.java b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ChoiceCaseTranslatorTest.java index b872ab6faa..a9516ebfac 100644 --- a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ChoiceCaseTranslatorTest.java +++ b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/ChoiceCaseTranslatorTest.java @@ -40,15 +40,14 @@ public final class ChoiceCaseTranslatorTest { @Test public void processChoiceCaseTranslator() throws IOException, ParserException { - String userDir = System.getProperty("user.dir"); YangNode node = manager.getDataModel("src/test/resources/ChoiceCaseTranslator.yang"); YangPluginConfig yangPluginConfig = new YangPluginConfig(); - yangPluginConfig.setCodeGenDir(userDir + "/target/ChoiceCaseTestGenFile/"); + yangPluginConfig.setCodeGenDir("target/ChoiceCaseTestGenFile/"); generateJavaCode(node, yangPluginConfig); - deleteDirectory(userDir + "/target/ChoiceCaseTestGenFile/"); + deleteDirectory("target/ChoiceCaseTestGenFile/"); } // TODO enhance the test cases, after having a framework of translator test. } diff --git a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/EnumTranslatorTest.java b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/EnumTranslatorTest.java index 6956851657..c8784c8408 100644 --- a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/EnumTranslatorTest.java +++ b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/EnumTranslatorTest.java @@ -41,15 +41,14 @@ public final class EnumTranslatorTest { public void processEnumTranslator() throws IOException, ParserException { - String userDir = System.getProperty("user.dir"); YangNode node = manager.getDataModel("src/test/resources/EnumTranslator.yang"); YangPluginConfig yangPluginConfig = new YangPluginConfig(); - yangPluginConfig.setCodeGenDir(userDir + "/target/EnumTestGenFile/"); + yangPluginConfig.setCodeGenDir("target/EnumTestGenFile/"); generateJavaCode(node, yangPluginConfig); - deleteDirectory(userDir + "/target/EnumTestGenFile/"); + deleteDirectory("target/EnumTestGenFile/"); } // TODO enhance the test cases, after having a framework of translator test. } diff --git a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/NotificationTranslatorTest.java b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/NotificationTranslatorTest.java index 2801adf191..ab98c76cfb 100644 --- a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/NotificationTranslatorTest.java +++ b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/NotificationTranslatorTest.java @@ -41,15 +41,14 @@ public final class NotificationTranslatorTest { public void processUnionTranslator() throws IOException, ParserException { - String userDir = System.getProperty("user.dir"); YangNode node = manager.getDataModel("src/test/resources/NotificationTest.yang"); YangPluginConfig yangPluginConfig = new YangPluginConfig(); - yangPluginConfig.setCodeGenDir(userDir + "/target/NotificationTest/"); + yangPluginConfig.setCodeGenDir("target/NotificationTest/"); generateJavaCode(node, yangPluginConfig); - deleteDirectory(userDir + "/target/NotificationTest/"); + deleteDirectory("target/NotificationTest/"); } // TODO enhance the test cases, after having a framework of translator test. diff --git a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/RpcTranslatorTest.java b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/RpcTranslatorTest.java index 8f8b157fb3..e34613dfe4 100644 --- a/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/RpcTranslatorTest.java +++ b/utils/yangutils/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/RpcTranslatorTest.java @@ -41,15 +41,14 @@ public final class RpcTranslatorTest { public void processRpcTranslator() throws IOException, ParserException { - String userDir = System.getProperty("user.dir"); YangNode node = manager.getDataModel("src/test/resources/RpcTranslator.yang"); YangPluginConfig yangPluginConfig = new YangPluginConfig(); - yangPluginConfig.setCodeGenDir(userDir + "/target/RpcTestGenFile/"); + yangPluginConfig.setCodeGenDir("target/RpcTestGenFile/"); generateJavaCode(node, yangPluginConfig); - deleteDirectory(userDir + "/target/RpcTestGenFile/"); + deleteDirectory("target/RpcTestGenFile/"); } // TODO enhance the test cases, after having a framework of translator test. } 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 7682d1956b..b892eddfc4 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 @@ -41,7 +41,6 @@ public final class UnionTranslatorTest { public void processUnionTranslator() throws IOException, ParserException { - String userDir = System.getProperty("user.dir"); YangNode node = manager.getDataModel("src/test/resources/UnionTranslator.yang"); YangPluginConfig yangPluginConfig = new YangPluginConfig(); @@ -49,7 +48,7 @@ public final class UnionTranslatorTest { generateJavaCode(node, yangPluginConfig); - deleteDirectory(userDir + "/target/UnionTestGenFile/"); + deleteDirectory("target/UnionTestGenFile/"); } // TODO enhance the test cases, after having a framework of translator test.