Merge "Fixed incorrect test location."

diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java
similarity index 99%
rename from code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java
rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java
index 87fa00dea6e24e19b46440222433137772c06e6a..cc03ea4aafee6c38d503a5ca89668f2f16323604 100644 (file)
--- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.sal.java.api.generator.test;
+package org.opendaylight.yangtools.sal.binding.generator.impl;
 
 import static org.junit.Assert.assertTrue;
 

diff --git a/code-generator/binding-java-api-generator/src/test/resources/bit_and_union_in_leaf.yang b/code-generator/binding-generator-impl/src/test/resources/bit_and_union_in_leaf.yang
similarity index 100%
rename from code-generator/binding-java-api-generator/src/test/resources/bit_and_union_in_leaf.yang
rename to code-generator/binding-generator-impl/src/test/resources/bit_and_union_in_leaf.yang

diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java
index ca9c664e18fb4100864f89ae64da2fe0e7e93afc..9796a40cc36be6024a4cf189dad31f70613ff4e1 100644 (file)
--- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java
+++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java
@@ -7,9 +7,7 @@
  */
 package org.opendaylight.yangtools.sal.java.api.generator.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -99,9 +97,13 @@ public class ClassCodeGeneratorTest {
         assertEquals(2, genTOsCount);
     }
 
-    @Ignore
+    /**
+     * Test for testing of false scenario.
+     *
+     * Test tests value types. Value types are not allowed to have default constructor.
+     */
     @Test
-    public void defaultConstructorTest() {
+    public void defaultConstructorNotPresentInValueTypeTest() {
         final GeneratedTOBuilder toBuilder = new GeneratedTOBuilderImpl(
                 "simple.pack", "DefCtor");
 
@@ -119,7 +121,7 @@ public class ClassCodeGeneratorTest {
         final String outputStr = clsGen.generate(genTO);
 
         assertNotNull(outputStr);
-        assertTrue(outputStr.contains("public DefCtor()"));
+        assertFalse(outputStr.contains("public DefCtor()"));
     }
 
     @Test