X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FCopyUtilsTest.java;h=06a2af792885a5e0c353445d2609959845e514dc;hb=42abb28b99a02f9580f4676ce5c315628e5bcd24;hp=ace25d4ae5fef2ff6a2b10c54ed1aff6450f22b9;hpb=b401ea6d55a428bc5c90bad611ae675a0c92f765;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java
index ace25d4ae5..06a2af7928 100644
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/CopyUtilsTest.java
@@ -6,20 +6,26 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.impl;
 
-import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
-
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 import java.util.List;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
-import org.opendaylight.yangtools.yang.model.util.ExtendedType;
-import org.opendaylight.yangtools.yang.model.util.IdentityrefType;
 import org.opendaylight.yangtools.yang.model.util.Uint16;
-import org.opendaylight.yangtools.yang.parser.builder.api.*;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
+import org.opendaylight.yangtools.yang.parser.builder.api.ConstraintsBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 /**
@@ -28,7 +34,10 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException;
  * @see org.opendaylight.yangtools.yang.parser.builder.impl.CopyUtils
  *
  * @author Lukas Sedlak <lsedlak@cisco.com>
+ *
+ * @deprecated Pre-Beryllium implementation, scheduled for removal.
  */
+@Deprecated
 public class CopyUtilsTest extends AbstractBuilderTest {
 
     @Test(expected = YangParseException.class)
@@ -312,7 +321,6 @@ public class CopyUtilsTest extends AbstractBuilderTest {
         assertFalse(copy.getUnknownNodes().isEmpty());
     }
 
-    @Ignore
     @Test
     public void testCopyIdentityrefTypeBuilder() {
         final String typedefLocalName = "identity-ref-test-type";
@@ -321,14 +329,12 @@ public class CopyUtilsTest extends AbstractBuilderTest {
         final IdentityrefTypeBuilder typeBuilder = new IdentityrefTypeBuilder(module.getModuleName(), 12,
             "base:parent-identity", typedefPath);
 
-        //FIXME remove Ignore annotation once fix for bug 2219 will be resolved and merged
         final TypeDefinitionBuilder copy = CopyUtils.copy(typeBuilder, module, true);
         assertNotNull(copy);
 
         //TODO: add additional asserts
     }
 
-    @Ignore
     @Test
     public void testCopyTypeDefinitionBuilderWithUnknownNodes() {
         final String typedefLocalName = "test-typedef-with-ext";
@@ -341,114 +347,135 @@ public class CopyUtilsTest extends AbstractBuilderTest {
         typedefBuilder.addUnknownNodeBuilder(provideUnknownNodeBuilder());
 
         TypeDefinitionBuilder copy = CopyUtils.copy(typedefBuilder, module, true);
-        //FIXME: remove @Ignore annotation once bug 2220 will be resolved and merged
         assertNotNull(copy);
         assertFalse(copy.getUnknownNodes().isEmpty());
     }
 
+    // FIXME: Use Mockito instead of this monstrosity
     private static final class InvalidDataSchemaNodeBuilder implements DataSchemaNodeBuilder {
 
-        @Override public SchemaNodeBuilder getOriginal() {
+        @Override
+        public SchemaNodeBuilder getOriginal() {
             return null;
         }
 
-        @Override public void setOriginal(SchemaNodeBuilder original) {
+        @Override
+        public void setOriginal(final SchemaNodeBuilder original) {
 
         }
 
-        @Override public boolean isAugmenting() {
+        @Override
+        public boolean isAugmenting() {
             return false;
         }
 
-        @Override public void setAugmenting(boolean augmenting) {
+        @Override
+        public void setAugmenting(final boolean augmenting) {
 
         }
 
-        @Override public boolean isConfiguration() {
+        @Override
+        public boolean isConfiguration() {
             return false;
         }
 
-        @Override public void setConfiguration(boolean config) {
+        @Override
+        public void setConfiguration(final boolean config) {
 
         }
 
-        @Override public ConstraintsBuilder getConstraints() {
+        @Override
+        public ConstraintsBuilder getConstraints() {
             return null;
         }
 
-        @Override public QName getQName() {
+        @Override
+        public QName getQName() {
             return null;
         }
 
-        @Override public SchemaPath getPath() {
+        @Override
+        public SchemaPath getPath() {
             return null;
         }
 
-        @Override public void setPath(SchemaPath path) {
+        @Override
+        public void setPath(final SchemaPath path) {
 
         }
 
-        @Override public String getModuleName() {
+        @Override
+        public String getModuleName() {
             return null;
         }
 
-        @Override public void setModuleName(String moduleName) {
-
-        }
-
-        @Override public int getLine() {
+        @Override
+        public int getLine() {
             return 0;
         }
 
-        @Override public Builder getParent() {
+        @Override
+        public Builder getParent() {
             return null;
         }
 
-        @Override public void setParent(Builder parent) {
+        @Override
+        public void setParent(final Builder parent) {
 
         }
 
-        @Override public void addUnknownNodeBuilder(UnknownSchemaNodeBuilder unknownNode) {
+        @Override
+        public void addUnknownNodeBuilder(final UnknownSchemaNodeBuilder unknownNode) {
 
         }
 
-        @Override public List<UnknownSchemaNodeBuilder> getUnknownNodes() {
+        @Override
+        public List<UnknownSchemaNodeBuilder> getUnknownNodes() {
             return null;
         }
 
-        @Override public DataSchemaNode build() {
+        @Override
+        public DataSchemaNode build() {
             return null;
         }
 
-        @Override public String getDescription() {
+        @Override
+        public String getDescription() {
             return null;
         }
 
-        @Override public void setDescription(String description) {
+        @Override
+        public void setDescription(final String description) {
 
         }
 
-        @Override public String getReference() {
+        @Override
+        public String getReference() {
             return null;
         }
 
-        @Override public void setReference(String reference) {
+        @Override
+        public void setReference(final String reference) {
 
         }
 
-        @Override public Status getStatus() {
+        @Override
+        public Status getStatus() {
             return null;
         }
 
-        @Override public void setStatus(Status status) {
+        @Override
+        public void setStatus(final Status status) {
 
         }
 
-        @Override public boolean isAddedByUses() {
+        @Override
+        public boolean isAddedByUses() {
             return false;
         }
 
-        @Override public void setAddedByUses(boolean addedByUses) {
+        @Override
+        public void setAddedByUses(final boolean addedByUses) {
 
         }
     }