X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-rfc8040%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Frestconf%2Fnb%2Frfc8040%2FTestUtils.java;h=3829ad0ac1a3a6337dbf679340974c5dbc72d447;hb=refs%2Fchanges%2F03%2F101003%2F5;hp=4a6f7607a6538f05a40f12034a9b3a1c78f0f1a6;hpb=f272d576a810e186759669e97f9f5b860e43d643;p=netconf.git

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java
index 4a6f7607a6..3829ad0ac1 100644
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java
@@ -10,7 +10,6 @@ package org.opendaylight.restconf.nb.rfc8040;
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
@@ -22,8 +21,6 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -39,27 +36,25 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import org.mockito.Mockito;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 import org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.nb.rfc8040.handlers.TransactionChainHandler;
 import org.opendaylight.yangtools.util.xml.UntrustedXML;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,7 +69,7 @@ public final class TestUtils {
 
     }
 
-    public static SchemaContext loadSchemaContext(final String... yangPath)
+    public static EffectiveModelContext loadSchemaContext(final String... yangPath)
             throws FileNotFoundException {
         final List<File> files = new ArrayList<>();
         for (final String path : yangPath) {
@@ -172,12 +167,7 @@ public final class TestUtils {
     }
 
     public static QName buildQName(final String name, final String uri, final String date, final String prefix) {
-        try {
-            final URI u = new URI(uri);
-            return QName.create(u, Revision.ofNullable(date), name);
-        } catch (final URISyntaxException e) {
-            return null;
-        }
+        return QName.create(XMLNamespace.of(uri), Revision.ofNullable(date), name);
     }
 
     public static QName buildQName(final String name, final String uri, final String date) {
@@ -189,7 +179,7 @@ public final class TestUtils {
     }
 
     public static String loadTextFile(final String filePath) throws IOException {
-        final FileReader fileReader = new FileReader(filePath);
+        final FileReader fileReader = new FileReader(filePath, StandardCharsets.UTF_8);
         final BufferedReader bufReader = new BufferedReader(fileReader);
 
         String line = null;
@@ -246,7 +236,7 @@ public final class TestUtils {
         return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate);
     }
 
-    public static NormalizedNode<?, ?> prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException {
+    public static NormalizedNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException {
         final String ietfInterfacesDate = "2013-07-04";
         final String namespace = "urn:ietf:params:xml:ns:yang:ietf-interfaces";
         final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryNode =
@@ -274,17 +264,15 @@ public final class TestUtils {
         return mapEntryNode.build();
     }
 
-    public static SchemaContextHandler newSchemaContextHandler(final SchemaContext schemaContext) {
+    public static SchemaContextHandler newSchemaContextHandler(final EffectiveModelContext schemaContext) {
         DOMDataBroker mockDataBroker = mock(DOMDataBroker.class);
-        DOMTransactionChain mockChain = mock(DOMTransactionChain.class);
         DOMDataTreeWriteTransaction mockTx = mock(DOMDataTreeWriteTransaction.class);
         doReturn(CommitInfo.emptyFluentFuture()).when(mockTx).commit();
-        doReturn(mockTx).when(mockChain).newWriteOnlyTransaction();
+        doReturn(mockTx).when(mockDataBroker).newWriteOnlyTransaction();
 
-        doReturn(mockChain).when(mockDataBroker).createTransactionChain(any());
-        SchemaContextHandler schemaContextHandler = SchemaContextHandler.newInstance(
-                new TransactionChainHandler(mockDataBroker), Mockito.mock(DOMSchemaService.class));
-        schemaContextHandler.onGlobalContextUpdated(schemaContext);
+        SchemaContextHandler schemaContextHandler = new SchemaContextHandler(mockDataBroker,
+            mock(DOMSchemaService.class));
+        schemaContextHandler.onModelContextUpdated(schemaContext);
         return schemaContextHandler;
     }
 }