[ONOS-5232] Update generated code
Change-Id: I9c25d9f2888fbee78fddf10d02a3fa94f7ce46e0
diff --git a/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/JavaDocGenTest.java b/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/JavaDocGenTest.java
index eb2a674..dcb4a34 100644
--- a/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/JavaDocGenTest.java
+++ b/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/JavaDocGenTest.java
@@ -56,7 +56,7 @@
*/
@Test
public void builderClassGenerationTest() {
- String builderClassJavaDoc = getJavaDoc(BUILDER_CLASS, TEST_NAME, false, getStubPluginConfig(), null);
+ String builderClassJavaDoc = getJavaDoc(BUILDER_CLASS, TEST_NAME, false, null);
assertThat(true, is(builderClassJavaDoc.contains("Represents the builder implementation of")
&& builderClassJavaDoc.contains(END_STRING)));
}
@@ -66,7 +66,7 @@
*/
@Test
public void builderInterfaceGenerationTest() {
- String builderInterfaceJavaDoc = getJavaDoc(BUILDER_INTERFACE, TEST_NAME, false, getStubPluginConfig(), null);
+ String builderInterfaceJavaDoc = getJavaDoc(BUILDER_INTERFACE, TEST_NAME, false, null);
assertThat(true,
is(builderInterfaceJavaDoc.contains("Builder for")
&& builderInterfaceJavaDoc.contains(END_STRING)));
@@ -77,7 +77,7 @@
*/
@Test
public void buildGenerationTest() {
- String buildDoc = getJavaDoc(BUILD_METHOD, TEST_NAME, false, getStubPluginConfig(), null);
+ String buildDoc = getJavaDoc(BUILD_METHOD, TEST_NAME, false, null);
assertThat(true, is(buildDoc.contains("Builds object of") && buildDoc.contains(END_STRING)));
}
@@ -109,7 +109,7 @@
*/
@Test
public void constructorGenerationTest() {
- String constructorDoc = getJavaDoc(CONSTRUCTOR, TEST_NAME, false, getStubPluginConfig(), null);
+ String constructorDoc = getJavaDoc(CONSTRUCTOR, TEST_NAME, false, null);
assertThat(true,
is(constructorDoc.contains("Creates an instance of ")
&& constructorDoc.contains("builder object of")
@@ -121,7 +121,7 @@
*/
@Test
public void defaultConstructorGenerationTest() {
- String defaultConstructorDoc = getJavaDoc(DEFAULT_CONSTRUCTOR, TEST_NAME, false, getStubPluginConfig(), null);
+ String defaultConstructorDoc = getJavaDoc(DEFAULT_CONSTRUCTOR, TEST_NAME, false, null);
assertThat(true, is(defaultConstructorDoc.contains("Creates an instance of ")
&& defaultConstructorDoc.contains(END_STRING)));
}
@@ -131,7 +131,7 @@
*/
@Test
public void getterGenerationTest() {
- String getterJavaDoc = getJavaDoc(GETTER_METHOD, TEST_NAME, false, getStubPluginConfig(), null);
+ String getterJavaDoc = getJavaDoc(GETTER_METHOD, TEST_NAME, false, null);
assertThat(true,
is(getterJavaDoc.contains("Returns the attribute") && getterJavaDoc.contains(END_STRING)));
}
@@ -141,7 +141,7 @@
*/
@Test
public void implClassGenerationTest() {
- String implClassJavaDoc = getJavaDoc(IMPL_CLASS, TEST_NAME, false, getStubPluginConfig(), null);
+ String implClassJavaDoc = getJavaDoc(IMPL_CLASS, TEST_NAME, false, null);
assertThat(true,
is(implClassJavaDoc.contains("Represents the implementation of")
&& implClassJavaDoc.contains(END_STRING)));
@@ -152,7 +152,7 @@
*/
@Test
public void interfaceGenerationTest() {
- String interfaceJavaDoc = getJavaDoc(INTERFACE, TEST_NAME, false, getStubPluginConfig(), null);
+ String interfaceJavaDoc = getJavaDoc(INTERFACE, TEST_NAME, false, null);
assertThat(true,
is(interfaceJavaDoc.contains("Abstraction of an entity which represents the functionality of")
&& interfaceJavaDoc.contains(END_STRING)));
@@ -163,7 +163,7 @@
*/
@Test
public void packageInfoGenerationTest() {
- String packageInfo = getJavaDoc(PACKAGE_INFO, TEST_NAME, false, getStubPluginConfig(), null);
+ String packageInfo = getJavaDoc(PACKAGE_INFO, TEST_NAME, false, null);
assertThat(true,
is(packageInfo.contains("Implementation of YANG node") && packageInfo.contains(END_STRING)));
}
@@ -173,7 +173,7 @@
*/
@Test
public void packageInfoGenerationForChildNodeTest() {
- String packageInfo = getJavaDoc(PACKAGE_INFO, TEST_NAME, true, getStubPluginConfig(), null);
+ String packageInfo = getJavaDoc(PACKAGE_INFO, TEST_NAME, true, null);
assertThat(true, is(packageInfo.contains("Implementation of YANG node testName's children nodes")
&& packageInfo.contains(END_STRING)));
}
@@ -183,7 +183,7 @@
*/
@Test
public void setterGenerationTest() {
- String setterJavaDoc = getJavaDoc(SETTER_METHOD, TEST_NAME, false, getStubPluginConfig(), null);
+ String setterJavaDoc = getJavaDoc(SETTER_METHOD, TEST_NAME, false, null);
assertThat(true,
is(setterJavaDoc.contains("Returns the builder object of") && setterJavaDoc.contains(END_STRING)));
}
@@ -193,7 +193,7 @@
*/
@Test
public void typeDefSetterGenerationTest() {
- String typeDefSetter = getJavaDoc(TYPE_DEF_SETTER_METHOD, TEST_NAME, false, getStubPluginConfig(), null);
+ String typeDefSetter = getJavaDoc(TYPE_DEF_SETTER_METHOD, TEST_NAME, false, null);
assertThat(true, is(typeDefSetter.contains("Sets the value of") && typeDefSetter.contains(END_STRING)));
}
diff --git a/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/YangIoUtilsTest.java b/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/YangIoUtilsTest.java
index 6766aec..52c69d3 100644
--- a/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/YangIoUtilsTest.java
+++ b/plugin/src/test/java/org/onosproject/yangutils/utils/io/impl/YangIoUtilsTest.java
@@ -16,17 +16,16 @@
package org.onosproject.yangutils.utils.io.impl;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.commons.io.FileUtils;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.onosproject.yangutils.utils.UtilConstants;
-import org.onosproject.yangutils.utils.io.YangPluginConfig;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
@@ -66,7 +65,7 @@
File dirPath = new File(CREATE_PATH);
dirPath.mkdirs();
- addPackageInfo(dirPath, CHECK1, CREATE_PATH, false, getStubPluginConfig());
+ addPackageInfo(dirPath, CHECK1, CREATE_PATH, false);
File filePath = new File(dirPath + File.separator + PKG_INFO);
assertThat(filePath.isFile(), is(true));
FileUtils.deleteDirectory(new File(BASE_DIR));
@@ -82,7 +81,7 @@
File dirPath = new File(CREATE_PATH);
dirPath.mkdirs();
- addPackageInfo(dirPath, CHECK1, PATH + CREATE_PATH, false, getStubPluginConfig());
+ addPackageInfo(dirPath, CHECK1, PATH + CREATE_PATH, false);
File filePath = new File(dirPath + File.separator + PKG_INFO);
assertThat(filePath.isFile(), is(true));
FileUtils.deleteDirectory(new File(BASE_DIR));
@@ -98,7 +97,7 @@
File dirPath = new File(CREATE_PATH);
dirPath.mkdirs();
- addPackageInfo(dirPath, CHECK1, PATH + CREATE_PATH, true, getStubPluginConfig());
+ addPackageInfo(dirPath, CHECK1, PATH + CREATE_PATH, true);
File filePath = new File(dirPath + File.separator + PKG_INFO);
assertThat(filePath.isFile(), is(true));
FileUtils.deleteDirectory(new File(BASE_DIR));
@@ -115,7 +114,7 @@
File dirPath = new File("invalid/check");
thrown.expect(IOException.class);
thrown.expectMessage(MSG);
- addPackageInfo(dirPath, CHECK1, CREATE_PATH, false, getStubPluginConfig());
+ addPackageInfo(dirPath, CHECK1, CREATE_PATH, false);
File filePath1 = new File(dirPath + File.separator + PKG_INFO);
assertThat(filePath1.isFile(), is(false));
FileUtils.deleteDirectory(dirPath);
@@ -196,15 +195,4 @@
assertThat(test.contains(TRIM_STRING), is(true));
}
- /**
- * Returns stub pluginConfig.
- *
- * @return stub pluginConfig
- */
- private YangPluginConfig getStubPluginConfig() {
- YangPluginConfig pluginConfig = new YangPluginConfig();
- pluginConfig.setConflictResolver(null);
- return pluginConfig;
- }
-
}