Fix a few warnings

Use of raw type and use of deprecated junit methods.

Change-Id: Iafd1c515eb2b1598e56a0d4e4f19b459fce47aab
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java
index 127dcf713c39086cd146a1fe1dbea4188572b460..1477d5ce68b251a78a69e1f13aa1215c990c3047 100644 (file)
--- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java
+++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.data.api.schema.tree.spi;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
-
 import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -22,7 +21,7 @@ public class DuplicityTest {
 
     @Test
     public void testDuplicate() {
-        final LeafNode leafNode = mock(LeafNode.class);
+        final LeafNode<?> leafNode = mock(LeafNode.class);
         final ContainerNode containerNode = mock(ContainerNode.class);
         final Map<NormalizedNode<?, ?>, DuplicateEntry> normalizedNodeDuplicateEntryMapNode = NormalizedNodes
                 .findDuplicates(leafNode);

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeCandidatesTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeCandidatesTest.java
index 124ba790fdac6e6fc83de42d9a3acc67c99b6fdd..24ffd77f7b0f036d3387355948447249c8160dea 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeCandidatesTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeCandidatesTest.java
@@ -8,9 +8,8 @@
 
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.TestCase.fail;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;