Change in sal.connectionservice.notifyNodeDisconnectFromMaster

[controller.git] / opendaylight / md-sal / clustered-data-store / implementation / src / test / java / org / opendaylight / controller / datastore / internal / ClusteredDataStoreImplTest.java

diff --git a/opendaylight/md-sal/clustered-data-store/implementation/src/test/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImplTest.java b/opendaylight/md-sal/clustered-data-store/implementation/src/test/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImplTest.java
index d7ae4bf2e5d18797f092acb274dab972bd90bbd1..4c97b19bacd831ddb01b23cebec8da803863d652 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/implementation/src/test/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImplTest.java
+++ b/opendaylight/md-sal/clustered-data-store/implementation/src/test/java/org/opendaylight/controller/datastore/internal/ClusteredDataStoreImplTest.java
@@ -1,3 +1,10 @@
+/*
+ * 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.controller.datastore.internal;
 
 import org.junit.Before;
@@ -9,7 +16,8 @@ import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
 import org.opendaylight.controller.clustering.services.IClusterServices;
 import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandler;
 import org.opendaylight.controller.md.sal.common.api.data.DataModification;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
 
 import java.util.EnumSet;
 import java.util.Map;
@@ -127,9 +135,9 @@ public class ClusteredDataStoreImplTest {
 
         IClusterGlobalServices mockClusterGlobalServices = createClusterGlobalServices();
 
-        ConcurrentMap mockOperationalDataCache = mock(ConcurrentMap.class);
+        ConcurrentMap<InstanceIdentifier, CompositeNode> mockOperationalDataCache = mock(ConcurrentMap.class);
 
-        Object valueObject = mock(Object.class);
+        CompositeNode valueObject = mock(CompositeNode.class);
 
         when(mockOperationalDataCache.get(path)).thenReturn(valueObject);
 
@@ -176,9 +184,9 @@ public class ClusteredDataStoreImplTest {
 
         IClusterGlobalServices mockClusterGlobalServices = createClusterGlobalServices();
 
-        ConcurrentMap mockConfigurationDataCache = mock(ConcurrentMap.class);
+        ConcurrentMap<InstanceIdentifier, CompositeNode> mockConfigurationDataCache = mock(ConcurrentMap.class);
 
-        Object valueObject = mock(Object.class);
+        CompositeNode valueObject = mock(CompositeNode.class);
 
         when(mockConfigurationDataCache.get(path)).thenReturn(valueObject);
 
@@ -223,7 +231,7 @@ public class ClusteredDataStoreImplTest {
         when(mockModification.getUpdatedConfigurationData()).thenReturn(configurationData);
         when(mockModification.getUpdatedOperationalData()).thenReturn(operationalData);
 
-        DataCommitHandler.DataCommitTransaction<InstanceIdentifier<? extends Object>, Object> transaction = store.requestCommit(mockModification);
+        DataCommitHandler.DataCommitTransaction<InstanceIdentifier, CompositeNode> transaction = store.requestCommit(mockModification);
 
         transaction.finish();
 
@@ -252,7 +260,7 @@ public class ClusteredDataStoreImplTest {
         when(mockModification.getUpdatedConfigurationData()).thenReturn(configurationData);
         when(mockModification.getUpdatedOperationalData()).thenReturn(operationalData);
 
-        DataCommitHandler.DataCommitTransaction<InstanceIdentifier<? extends Object>, Object> transaction = store.requestCommit(mockModification);
+        DataCommitHandler.DataCommitTransaction<InstanceIdentifier, CompositeNode> transaction = store.requestCommit(mockModification);
 
         transaction.rollback();