Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Decouple config and netconf subsystems.
[controller.git]
/
opendaylight
/
netconf
/
netconf-util
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
util
/
mapping
/
AbstractLastNetconfOperationTest.java
diff --git
a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/mapping/AbstractLastNetconfOperationTest.java
b/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/mapping/AbstractLastNetconfOperationTest.java
index 62633dd3f25c45d704ab624f5e8d161ecc99c9f5..5fca285719d3beea809dae687efa68abec0c2ce0 100644
(file)
--- a/
opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/mapping/AbstractLastNetconfOperationTest.java
+++ b/
opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/mapping/AbstractLastNetconfOperationTest.java
@@
-8,20
+8,20
@@
package org.opendaylight.controller.netconf.util.mapping;
package org.opendaylight.controller.netconf.util.mapping;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
+import org.opendaylight.controller.config.util.xml.DocumentedException;
+import org.opendaylight.controller.config.util.xml.XmlElement;
import org.opendaylight.controller.netconf.mapping.api.HandlingPriority;
import org.opendaylight.controller.netconf.mapping.api.NetconfOperationChainedExecution;
import org.opendaylight.controller.netconf.mapping.api.HandlingPriority;
import org.opendaylight.controller.netconf.mapping.api.NetconfOperationChainedExecution;
-import org.opendaylight.controller.netconf.util.xml.XmlElement;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
public class AbstractLastNetconfOperationTest {
class LastNetconfOperationImplTest extends AbstractLastNetconfOperation {
public class AbstractLastNetconfOperationTest {
class LastNetconfOperationImplTest extends AbstractLastNetconfOperation {
@@
-33,7
+33,7
@@
public class AbstractLastNetconfOperationTest {
}
@Override
}
@Override
- protected Element handleWithNoSubsequentOperations(Document document, XmlElement operationElement) throws
NetconfDocumentedException
{
+ protected Element handleWithNoSubsequentOperations(Document document, XmlElement operationElement) throws
DocumentedException
{
handleWithNoSubsequentOperationsRun = true;
return null;
}
handleWithNoSubsequentOperationsRun = true;
return null;
}
@@
-58,7
+58,7
@@
public class AbstractLastNetconfOperationTest {
assertEquals(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY, netconfOperation.getHandlingPriority());
}
assertEquals(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY, netconfOperation.getHandlingPriority());
}
- @Test(expected =
Netconf
DocumentedException.class)
+ @Test(expected = DocumentedException.class)
public void testHandle() throws Exception {
NetconfOperationChainedExecution operation = mock(NetconfOperationChainedExecution.class);
doReturn("").when(operation).toString();
public void testHandle() throws Exception {
NetconfOperationChainedExecution operation = mock(NetconfOperationChainedExecution.class);
doReturn("").when(operation).toString();