Adopt odlparent-10.0.0/yangtools-8.0.0-SNAPSHOT
[mdsal.git] / dom / mdsal-dom-spi / src / test / java / org / opendaylight / mdsal / dom / spi / store / AbstractDOMStoreTreeChangePublisherTest.java
index e665ff41b8c5a212fd57aeab8f5c281edec9dc57..d0d4611ad041cddbc1f26a0f1f1604816d28e1aa 100644 (file)
@@ -13,18 +13,15 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
 import com.google.common.collect.ImmutableList;
-import java.lang.reflect.Field;
-import java.util.Collection;
-import org.junit.Assert;
+import java.util.List;
 import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.spi.AbstractDOMDataTreeChangeListenerRegistration;
-import org.opendaylight.yangtools.concepts.AbstractRegistration;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.tree.api.ModificationType;
 
 public class AbstractDOMStoreTreeChangePublisherTest extends AbstractDOMStoreTreeChangePublisher {
 
@@ -61,16 +58,12 @@ public class AbstractDOMStoreTreeChangePublisherTest extends AbstractDOMStoreTre
         assertTrue(removeInvoked);
         assertTrue(notifyInvoked);
 
-        final Field closedField = AbstractRegistration.class.getDeclaredField("closed");
-        closedField.setAccessible(true);
-
-        final int closed = (int) closedField.get(abstractDOMDataTreeChangeListenerRegistration);
-        Assert.assertEquals(1, closed);
+        assertTrue(abstractDOMDataTreeChangeListenerRegistration.isClosed());
     }
 
     @Override
     protected void notifyListener(final AbstractDOMDataTreeChangeListenerRegistration<?> registration,
-            final Collection<DataTreeCandidate> changes) {
+            final List<DataTreeCandidate> changes) {
         notifyInvoked = true;
     }