Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Do not use deprecated destroyConfigBean in config tests"
[controller.git]
/
opendaylight
/
netconf
/
config-netconf-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
confignetconfconnector
/
operations
/
editconfig
/
ReplaceEditConfigStrategyTest.java
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 13421a215e004f8e2c856b1a3f874caeb621aadf..22a3f105477fbc300739a579b17767a640660406 100644
(file)
--- 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.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 java.util.Map;
-
import javax.management.Attribute;
import javax.management.ObjectName;
import javax.management.Attribute;
import javax.management.ObjectName;
-
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
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 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
public class ReplaceEditConfigStrategyTest {
@Mock
@@
-36,7
+34,7
@@
public class ReplaceEditConfigStrategyTest {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- doNothing().when(ta).destroy
ConfigBean
(anyString(), anyString());
+ doNothing().when(ta).destroy
Module
(anyString(), anyString());
doReturn(mockON()).when(ta).lookupConfigBean(anyString(), anyString());
doNothing().when(ta).setAttribute(any(ObjectName.class), anyString(), any(Attribute.class));
}
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();
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));
verify(ta).lookupConfigBean(anyString(), anyString());
verify(ta).setAttribute(any(ObjectName.class), anyString(), any(Attribute.class));