Adjust to yangtools-2.0.0/odlparent-3.0.0 changes

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / NetconfToRpcRequestTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
index 10cb4e3236f4ca49a6f8da2de2b172432b87ad01..3f153d20a5e39998a893278e410642c1d5658981 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
@@ -14,10 +14,6 @@ import static org.junit.Assert.assertTrue;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toId;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toPath;
 
-import com.google.common.collect.Lists;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -56,16 +52,13 @@ public class NetconfToRpcRequestTest {
     static NetconfMessageTransformer messageTransformer;
 
     @BeforeClass
-    public static void setup() throws Exception {
-        List<InputStream> modelsToParse = Collections.singletonList(
-                NetconfToRpcRequestTest.class.getResourceAsStream("/schemas/rpc-notification-subscription.yang"));
-        final Set<Module> notifModules = YangParserTestUtils.parseYangStreams(modelsToParse).getModules();
+    public static void setup() {
+        final Set<Module> notifModules = YangParserTestUtils.parseYangResource(
+            "/schemas/rpc-notification-subscription.yang").getModules();
         assertTrue(!notifModules.isEmpty());
 
-        modelsToParse = Lists.newArrayList(
-                NetconfToRpcRequestTest.class.getResourceAsStream("/schemas/config-test-rpc.yang"),
-                NetconfToRpcRequestTest.class.getResourceAsStream("/schemas/rpc-notification-subscription.yang"));
-        cfgCtx = YangParserTestUtils.parseYangStreams(modelsToParse);
+        cfgCtx = YangParserTestUtils.parseYangResources(NetconfToRpcRequestTest.class,
+            "/schemas/config-test-rpc.yang", "/schemas/rpc-notification-subscription.yang");
         messageTransformer = new NetconfMessageTransformer(cfgCtx, true);
     }