Fix deprecated Assert imports

junit.framework.Assert has been deprecated in favor of org.junit.Assert.

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

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java
index 530359f7c244a2c386d4e6a02905acfd62da3c0b..c6270e870f4c0f1c775ffdc3bd1ad1decf79cad5 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTreeTest.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import com.google.common.collect.ImmutableList;

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java
index c6a4926e34de032782628f0bddc69e345d8dee79..079798075a09d919798f05f3fed0d065b69392a3 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNodeTest.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
@@ -43,7 +43,7 @@ public class RegistrationTreeNodeTest {
         assertNotNull(registrationTreeNode.ensureChild(pathArgument));
         assertNotNull(registrationTreeNode.getExactChild(pathArgument));
 
-        final NodeWithValue nodeWithValue = new NodeWithValue<>(QName.create("testNode"), new Object());
+        final NodeWithValue<?> nodeWithValue = new NodeWithValue<>(QName.create("testNode"), new Object());
         assertEquals(Collections.EMPTY_LIST, registrationTreeNode.getInexactChildren(nodeWithValue));
         assertEquals(Collections.EMPTY_LIST, registrationTreeNode.getInexactChildren(pathArgument));
 

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPointTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPointTest.java
index d08a2d876858a59d90c171ebec9802c59d5f585c..71707309a9a65f9e6ac35074e05d00542e1d42b5 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPointTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPointTest.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
@@ -26,8 +26,8 @@ public class SimpleDOMMountPointTest {
         final YangInstanceIdentifier yangInstanceIdentifier = mock(YangInstanceIdentifier.class);
         final SchemaContext schemaContext = mock(SchemaContext.class);
         final DOMService domService = mock(DOMService.class);
-        final ClassToInstanceMap classToInstanceMap =
-                ImmutableClassToInstanceMap.builder().put(DOMService.class, domService).build();
+        final ClassToInstanceMap<DOMService> classToInstanceMap =
+                ImmutableClassToInstanceMap.<DOMService>builder().put(DOMService.class, domService).build();
 
         final SimpleDOMMountPoint simpleDOMMountPoint =
                 SimpleDOMMountPoint.create(yangInstanceIdentifier, classToInstanceMap, schemaContext);