Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use ControllerContext non-statically
[netconf.git]
/
restconf
/
restconf-nb-bierman02
/
src
/
test
/
java
/
org
/
opendaylight
/
netconf
/
sal
/
streams
/
listeners
/
NotificationListenerTest.java
diff --git
a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java
b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java
index 1edfecb32790d22ac45c8dd1b2cacae1af67c6cb..2f03868cadba57018b5a2c04f6dc3c33cd4d4101 100644
(file)
--- a/
restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java
+++ b/
restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java
@@
-14,6
+14,7
@@
import static org.mockito.Mockito.when;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import java.io.FileNotFoundException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
@@
-22,9
+23,11
@@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.junit.Before;
import java.util.Map;
import java.util.Optional;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.MockitoAnnotations;
import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
import org.junit.Test;
import org.mockito.MockitoAnnotations;
import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
+import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
import org.opendaylight.controller.sal.restconf.impl.test.TestUtils;
import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
import org.opendaylight.yang.gen.v1.urn.sal.restconf.event.subscription.rev140708.NotificationOutputTypeGrouping.NotificationOutputType;
import org.opendaylight.controller.sal.restconf.impl.test.TestUtils;
import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
import org.opendaylight.yang.gen.v1.urn.sal.restconf.event.subscription.rev140708.NotificationOutputTypeGrouping.NotificationOutputType;
@@
-48,13
+51,19
@@
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
public class NotificationListenerTest {
private static final QNameModule MODULE = QNameModule.create(URI.create("notifi:mod"), Revision.of("2016-11-23"));
public class NotificationListenerTest {
private static final QNameModule MODULE = QNameModule.create(URI.create("notifi:mod"), Revision.of("2016-11-23"));
- private SchemaContext schmeaCtx;
+ private static SchemaContext schemaContext;
+
+ private ControllerContext controllerContext;
+
+ @BeforeClass
+ public static void staticInit() throws FileNotFoundException {
+ schemaContext = TestUtils.loadSchemaContext("/notifications");
+ }
@Before
public void init() throws Exception {
MockitoAnnotations.initMocks(this);
@Before
public void init() throws Exception {
MockitoAnnotations.initMocks(this);
- ControllerContext.getInstance().setGlobalSchema(TestUtils.loadSchemaContext("/notifications"));
- this.schmeaCtx = ControllerContext.getInstance().getGlobalSchema();
+ controllerContext = TestRestconfUtils.newControllerContext(schemaContext);
}
@Test
}
@Test
@@
-222,10
+231,11
@@
public class NotificationListenerTest {
final List<SchemaPath> paths = new ArrayList<>();
paths.add(schemaPathNotifi);
final List<NotificationListenerAdapter> listNotifi =
final List<SchemaPath> paths = new ArrayList<>();
paths.add(schemaPathNotifi);
final List<NotificationListenerAdapter> listNotifi =
- Notificator.createNotificationListener(paths, "stream-name", NotificationOutputType.JSON.toString());
+ Notificator.createNotificationListener(paths, "stream-name", NotificationOutputType.JSON.toString(),
+ controllerContext);
final NotificationListenerAdapter notifi = listNotifi.get(0);
notifi.setNotification(notificationData);
final NotificationListenerAdapter notifi = listNotifi.get(0);
notifi.setNotification(notificationData);
- notifi.setSchemaContext(
this.schmeaCtx
);
+ notifi.setSchemaContext(
schemaContext
);
final String result = notifi.prepareJson();
return Preconditions.checkNotNull(result);
}
final String result = notifi.prepareJson();
return Preconditions.checkNotNull(result);
}