From ea3378934f2ee90a062c8f9ca492c1d8bf6432be Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 9 Sep 2016 22:29:46 +0200 Subject: [PATCH] Fix deprecated Assert imports junit.framework.Assert has been deprecated in favor of org.junit.Assert. Change-Id: I7507a55d596ad8c03c4c9777c05a78ab3ceda710 Signed-off-by: Robert Varga --- .../mdsal/dom/spi/AbstractRegistrationTreeTest.java | 2 +- .../mdsal/dom/spi/RegistrationTreeNodeTest.java | 10 +++++----- .../mdsal/dom/spi/SimpleDOMMountPointTest.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) 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 530359f7c2..c6270e870f 100644 --- 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 c6a4926e34..079798075a 100644 --- 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 d08a2d8768..71707309a9 100644 --- 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 classToInstanceMap = + ImmutableClassToInstanceMap.builder().put(DOMService.class, domService).build(); final SimpleDOMMountPoint simpleDOMMountPoint = SimpleDOMMountPoint.create(yangInstanceIdentifier, classToInstanceMap, schemaContext); -- 2.36.6