Merge "BUG-981: remove deprecated elements"

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / util / BitImplTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/BitImplTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/BitImplTest.java
index d523a2eb778bcabdba7c2fdf25b2aa7e3b43db05..acbf81935946531b0425e3e73f3f4e04abf3fc60 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/BitImplTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/BitImplTest.java
@@ -1,6 +1,15 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.yang.parser.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -13,6 +22,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
 
 public class BitImplTest {
@@ -49,7 +59,7 @@ public class BitImplTest {
         List<QName> qnamesA = new ArrayList<>();
         qnamesA.add(qnameA1);
         qnamesA.add(qnameA2);
-        SchemaPath schemaPathA = new SchemaPath(qnamesA, true);
+        SchemaPath schemaPathA = SchemaPath.create(qnamesA, true);
 
         QName qnameB = new QName(uriB, new Date(5000000), "some name");
 
@@ -58,7 +68,7 @@ public class BitImplTest {
         List<QName> qnamesB = new ArrayList<>();
         qnamesB.add(qnameB1);
         qnamesB.add(qnameB2);
-        SchemaPath schemaPathB = new SchemaPath(qnamesB, true);
+        SchemaPath schemaPathB = SchemaPath.create(qnamesB, true);
 
         BitImpl biB = null;
         BitImpl biA = new BitImpl(55L, qnameA, schemaPathA, "description", "reference", Status.CURRENT, null);
@@ -103,7 +113,11 @@ public class BitImplTest {
         assertEquals("Incorrect hash code for biA.", 923522, biA.hashCode());
 
         List<UnknownSchemaNode> unknownNodes = new ArrayList<>();
-        UnknownSchemaNodeBuilder usnb = new UnknownSchemaNodeBuilder("module", 3, qnameB);
+        SchemaPath path = org.mockito.Mockito.mock(SchemaPath.class);
+        UnknownSchemaNodeBuilder usnb = new UnknownSchemaNodeBuilder("module", 3, qnameB, path);
+        ModuleBuilder parent = org.mockito.Mockito.mock(ModuleBuilder.class);
+        usnb.setParent(parent);
+
         unknownNodes.add(usnb.build());
 
         biA = new BitImpl(55L, qnameA, schemaPathA, "description", "reference", Status.CURRENT, unknownNodes);