commit c421600f812c5a884c2eaf2929cb551664f3446a
author Vinod Kumar S <vinods.kumar@huawei.com> Thu Mar 03 19:55:30 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 03 17:05:18 2016 +0000
tree ff2ee68497aef5545591bc7146c1b10f5a5041dc
parent 5ccbe3f2e6a1d1025972d8f4798234fe8fe70e38

removed code duplication in translator, and addressed review comments

Change-Id: I27767a81c4bf279c80d2b98192f75f8f507b4457

utils/yangutils/src/test/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGeneratorTest.java

diff --git a/utils/yangutils/src/test/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGeneratorTest.java b/utils/yangutils/src/test/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGeneratorTest.java
index 0daa5d5..6d0056e 100644
--- a/utils/yangutils/src/test/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGeneratorTest.java
+++ b/utils/yangutils/src/test/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGeneratorTest.java
@@ -16,16 +16,17 @@
 
 package org.onosproject.yangutils.translator.tojava.utils;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
 import org.junit.Test;
 import org.onosproject.yangutils.translator.GeneratedFileType;
 import org.onosproject.yangutils.translator.tojava.GeneratedMethodTypes;
 import org.onosproject.yangutils.translator.tojava.TraversalType;
 import org.onosproject.yangutils.utils.UtilConstants;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import static org.junit.Assert.assertNotNull;
 import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -36,17 +37,21 @@
     /**
      * Unit test for private constructor.
      *
-     * @throws SecurityException if any security violation is observed.
-     * @throws NoSuchMethodException if when the method is not found.
-     * @throws IllegalArgumentException if there is illegal argument found.
-     * @throws InstantiationException if instantiation is provoked for the private constructor.
-     * @throws IllegalAccessException if instance is provoked or a method is provoked.
-     * @throws InvocationTargetException when an exception occurs by the method or constructor.
+     * @throws SecurityException if any security violation is observed
+     * @throws NoSuchMethodException if when the method is not found
+     * @throws IllegalArgumentException if there is illegal argument found
+     * @throws InstantiationException if instantiation is provoked for the
+     *             private constructor
+     * @throws IllegalAccessException if instance is provoked or a method is
+     *             provoked
+     * @throws InvocationTargetException when an exception occurs by the method
+     *             or constructor
      */
     @Test
     public void callPrivateConstructors() throws SecurityException, NoSuchMethodException,
-    IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException {
-        Class<?>[] classesToConstruct = {ClassDefinitionGenerator.class };
+            IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException {
+        Class<?>[] classesToConstruct = {
+                ClassDefinitionGenerator.class };
         for (Class<?> clazz : classesToConstruct) {
             Constructor<?> constructor = clazz.getDeclaredConstructor();
             constructor.setAccessible(true);
@@ -61,7 +66,7 @@
     public void generateBuilderClassDefinitionTest() {
 
         String builderClassDefinition = ClassDefinitionGenerator
-                .generateClassDefinition(GeneratedFileType.BUILDER_CLASS, "BuilderClass");
+                .generateClassDefinition(GeneratedFileType.BUILDER_CLASS_MASK, "BuilderClass");
         assertThat(true, is(builderClassDefinition.contains(UtilConstants.BUILDER)));
         assertThat(true, is(builderClassDefinition.contains(UtilConstants.CLASS)));
     }
@@ -73,7 +78,7 @@
     public void generateBuilderInterfaceDefinitionTest() {
 
         String builderInterfaceDefinition = ClassDefinitionGenerator
-                .generateClassDefinition(GeneratedFileType.BUILDER_INTERFACE, "BuilderInterfaceClass");
+                .generateClassDefinition(GeneratedFileType.BUILDER_INTERFACE_MASK, "BuilderInterfaceClass");
         assertThat(true, is(builderInterfaceDefinition.contains(UtilConstants.BUILDER)));
     }
 
@@ -83,7 +88,8 @@
     @Test
     public void generateImplDefinitionTest() {
 
-        String implDefinition = ClassDefinitionGenerator.generateClassDefinition(GeneratedFileType.IMPL, "ImplClass");
+        String implDefinition = ClassDefinitionGenerator.generateClassDefinition(GeneratedFileType.IMPL_CLASS_MASK,
+                "ImplClass");
         assertThat(true, is(implDefinition.contains(UtilConstants.IMPL)));
     }
 
@@ -93,7 +99,7 @@
     @Test
     public void generateinterfaceDefinitionTest() {
 
-        String interfaceDefinition = ClassDefinitionGenerator.generateClassDefinition(GeneratedFileType.INTERFACE,
+        String interfaceDefinition = ClassDefinitionGenerator.generateClassDefinition(GeneratedFileType.INTERFACE_MASK,
                 "InterfaceClass");
         assertThat(true, is(interfaceDefinition.contains(UtilConstants.INTERFACE)));
     }
@@ -104,8 +110,9 @@
     @Test
     public void generateInvalidDefinitionTest() {
 
-        String invalidDefinition = ClassDefinitionGenerator.generateClassDefinition(GeneratedFileType.ALL, "invalid");
-        assertThat(true, is(invalidDefinition == null));
+        //        String invalidDefinition = ClassDefinitionGenerator
+        //                .generateClassDefinition(GeneratedFileType.GENERATE_INTERFACE_WITH_BUILDER, "invalid");
+        //        assertThat(true, is(invalidDefinition == null));
     }
 
     /**