junit.framework.Assert has been deprecated in favor of org.junit.Assert.
Change-Id: I7507a55d596ad8c03c4c9777c05a78ab3ceda710
Signed-off-by: Robert Varga <rovarga@cisco.com>
*/
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;
*/
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;
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));
*/
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;
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);