X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Foperations%2Feditconfig%2FReplaceEditConfigStrategyTest.java;h=22a3f105477fbc300739a579b17767a640660406;hb=a2ca596b9f73b3f1d735dc39b52cd70462d1c8c3;hp=13421a215e004f8e2c856b1a3f874caeb621aadf;hpb=a92d9d6a21a0f6ca8d2153795721f500eaf29ee9;p=controller.git

diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java
index 13421a215e..22a3f10547 100644
--- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java
+++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategyTest.java
@@ -10,13 +10,15 @@ package org.opendaylight.controller.netconf.confignetconfconnector.operations.ed
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
+import com.google.common.collect.Sets;
 import java.util.Map;
-
 import javax.management.Attribute;
 import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -24,10 +26,6 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.config.util.ConfigTransactionClient;
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml.AttributeConfigElement;
 
-import com.google.common.collect.Sets;
-import org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig.EditConfigTest;
-import org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig.ReplaceEditConfigStrategy;
-
 public class ReplaceEditConfigStrategyTest {
 
     @Mock
@@ -36,7 +34,7 @@ public class ReplaceEditConfigStrategyTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        doNothing().when(ta).destroyConfigBean(anyString(), anyString());
+        doNothing().when(ta).destroyModule(anyString(), anyString());
         doReturn(mockON()).when(ta).lookupConfigBean(anyString(), anyString());
         doNothing().when(ta).setAttribute(any(ObjectName.class), anyString(), any(Attribute.class));
     }
@@ -49,7 +47,7 @@ public class ReplaceEditConfigStrategyTest {
 
         doReturn(Sets.newHashSet(mockON(), mockON())).when(ta).lookupConfigBeans();
 
-        strat.executeConfiguration("m1", "i1", map, ta);
+        strat.executeConfiguration("m1", "i1", map, ta, EditConfigTest.mockServices());
 
         verify(ta).lookupConfigBean(anyString(), anyString());
         verify(ta).setAttribute(any(ObjectName.class), anyString(), any(Attribute.class));