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 "BUG-614: migrate RuntimeGeneratedInvoker"
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-dom-it
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
sal
/
binding
/
test
/
bugfix
/
DOMCodecBug03Test.java
diff --git
a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java
b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java
index 6a050efb35679af9ef283bbef313a09cc92b24d9..ccbd52fc77ea27711c19c934fb2109a3991343d6 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java
+++ b/
opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java
@@
-14,6
+14,7
@@
import static org.junit.Assert.assertNull;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
import org.junit.Test;
import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
@@
-43,6
+44,8
@@
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.data.api.CompositeNode;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import com.google.common.util.concurrent.SettableFuture;
+
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataChangeListener {
private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id");
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataChangeListener {
private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id");
@@
-57,13
+60,11
@@
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh
.toInstance();
.toInstance();
- private static final InstanceIdentifier<Node> NODE_INSTANCE_ID_BA = InstanceIdentifier//
- .builder(NODES_INSTANCE_ID_BA) //
- .child(Node.class, NODE_KEY).toInstance();
+ private static final InstanceIdentifier<Node> NODE_INSTANCE_ID_BA = NODES_INSTANCE_ID_BA.child(Node.class, NODE_KEY);
- private static final InstanceIdentifier<SupportedActions> SUPPORTED_ACTIONS_INSTANCE_ID_BA =
InstanceIdentifier
//
-
.builder(NODES_INSTANCE_ID_BA
) //
+ private static final InstanceIdentifier<SupportedActions> SUPPORTED_ACTIONS_INSTANCE_ID_BA = //
+
NODES_INSTANCE_ID_BA.builder(
) //
.child(Node.class, NODE_KEY) //
.augmentation(FlowCapableNode.class) //
.child(SupportedActions.class)
.child(Node.class, NODE_KEY) //
.augmentation(FlowCapableNode.class) //
.child(SupportedActions.class)
@@
-85,7
+86,7
@@
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh
.node(SUPPORTED_ACTIONS_QNAME) //
.toInstance();
.node(SUPPORTED_ACTIONS_QNAME) //
.toInstance();
- private
DataChangeEvent<InstanceIdentifier<?>, DataObject> receivedChangeEvent
;
+ private
final SettableFuture<DataChangeEvent<InstanceIdentifier<?>, DataObject>> receivedChangeEvent = SettableFuture.create()
;
@@
-120,9
+121,10
@@
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh
RpcResult<TransactionStatus> result = transaction.commit().get();
assertEquals(TransactionStatus.COMMITED, result.getResult());
RpcResult<TransactionStatus> result = transaction.commit().get();
assertEquals(TransactionStatus.COMMITED, result.getResult());
- assertNotNull(receivedChangeEvent);
+ DataChangeEvent<InstanceIdentifier<?>, DataObject> potential = receivedChangeEvent.get(1000,TimeUnit.MILLISECONDS);
+ assertNotNull(potential);
- verifyNodes((Nodes)
receivedChangeEvent
.getUpdatedOperationalSubtree(),original);
+ verifyNodes((Nodes)
potential
.getUpdatedOperationalSubtree(),original);
assertBindingIndependentVersion(NODE_INSTANCE_ID_BI);
Nodes nodes = checkForNodes();
verifyNodes(nodes,original);
assertBindingIndependentVersion(NODE_INSTANCE_ID_BI);
Nodes nodes = checkForNodes();
verifyNodes(nodes,original);
@@
-159,7
+161,7
@@
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh
NodeConnectorId ncId = new NodeConnectorId("openflow:1:bar");
NodeConnectorKey nodeKey = new NodeConnectorKey(ncId );
NodeConnectorId ncId = new NodeConnectorId("openflow:1:bar");
NodeConnectorKey nodeKey = new NodeConnectorKey(ncId );
- InstanceIdentifier<NodeConnector> ncInstanceId =
InstanceIdentifier.builder(NODE_INSTANCE_ID_BA).child(NodeConnector.class, nodeKey).toInstance(
);
+ InstanceIdentifier<NodeConnector> ncInstanceId =
NODE_INSTANCE_ID_BA.child(NodeConnector.class, nodeKey
);
NodeConnectorBuilder ncBuilder = new NodeConnectorBuilder();
ncBuilder.setId(ncId);
ncBuilder.setKey(nodeKey);
NodeConnectorBuilder ncBuilder = new NodeConnectorBuilder();
ncBuilder.setId(ncId);
ncBuilder.setKey(nodeKey);
@@
-186,7
+188,7
@@
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh
assertNull(node);
}
assertNull(node);
}
- private void verifyNodes(
Nodes nodes,
Node original) {
+ private void verifyNodes(
final Nodes nodes,final
Node original) {
assertNotNull(nodes);
assertNotNull(nodes.getNode());
assertEquals(1, nodes.getNode().size());
assertNotNull(nodes);
assertNotNull(nodes.getNode());
assertEquals(1, nodes.getNode().size());
@@
-203,7
+205,7
@@
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh
}
private void assertBindingIndependentVersion(
}
private void assertBindingIndependentVersion(
- org.opendaylight.yangtools.yang.data.api.InstanceIdentifier nodeId) {
+
final
org.opendaylight.yangtools.yang.data.api.InstanceIdentifier nodeId) {
CompositeNode node = biDataService.readOperationalData(nodeId);
assertNotNull(node);
}
CompositeNode node = biDataService.readOperationalData(nodeId);
assertNotNull(node);
}
@@
-213,8
+215,8
@@
public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh
}
@Override
}
@Override
- public void onDataChanged(DataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
- receivedChangeEvent
= change
;
+ public void onDataChanged(
final
DataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
+ receivedChangeEvent
.set(change)
;
}
}
}
}