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 changes Ic434bf4a,I05a3fb18,I47a3783d,I8234bbfd
[controller.git]
/
opendaylight
/
netconf
/
config-netconf-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
confignetconfconnector
/
osgi
/
NetconfOperationServiceImplTest.java
diff --git
a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java
b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java
index b051c6c1c6237bb3d4816adbd6f86aa8b329487d..03bf4e3b328408de2ebb0beb923419ab4e623a26 100644
(file)
--- a/
opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java
+++ b/
opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImplTest.java
@@
-14,14
+14,12
@@
import static org.mockito.Mockito.mock;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-
import java.net.URI;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import java.util.Set;
import java.net.URI;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import java.util.Set;
-
import org.junit.Assert;
import org.junit.Test;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
import org.hamcrest.CoreMatchers;