X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-bierman02%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FTestUtils.java;h=d96cc770d5d7f2a05a48237c75a175b56f8e00ea;hb=09c1d18add7cfc310f3d190a1a02a523159162ce;hp=ffd4ae3632325cfe4ba2f8135622ee928f1a57a6;hpb=c9e58b14754cdc059ef63f870f74de65a5e0a15d;p=netconf.git diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java index ffd4ae3632..d96cc770d5 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.sal.restconf.impl.test; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; import static org.junit.Assert.assertNotNull; -import com.google.common.base.Preconditions; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; @@ -18,16 +19,13 @@ 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.sql.Date; import java.text.ParseException; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.xml.transform.OutputKeys; @@ -38,17 +36,18 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; 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.DataContainerNodeAttrBuilder; +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.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,8 +58,11 @@ public final class TestUtils { private static final Logger LOG = LoggerFactory.getLogger(TestUtils.class); - public static SchemaContext loadSchemaContext(final String... yangPath) - throws FileNotFoundException, ReactorException { + private TestUtils() { + + } + + public static EffectiveModelContext loadSchemaContext(final String... yangPath) throws FileNotFoundException { final List files = new ArrayList<>(); for (final String path : yangPath) { final String pathToFile = TestUtils.class.getResource(path).getPath(); @@ -78,10 +80,10 @@ public final class TestUtils { } } - return YangParserTestUtils.parseYangSources(files); + return YangParserTestUtils.parseYangFiles(files); } - public static Module findModule(final Set modules, final String moduleName) { + public static Module findModule(final Collection modules, final String moduleName) { for (final Module module : modules) { if (module.getName().equals(moduleName)) { return module; @@ -100,7 +102,6 @@ public final class TestUtils { } public static String getDocumentInPrintableForm(final Document doc) { - Preconditions.checkNotNull(doc); try { final ByteArrayOutputStream out = new ByteArrayOutputStream(); final TransformerFactory tf = TransformerFactory.newInstance(); @@ -111,7 +112,7 @@ public final class TestUtils { transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); - transformer.transform(new DOMSource(doc), new StreamResult(new OutputStreamWriter(out, + transformer.transform(new DOMSource(requireNonNull(doc)), new StreamResult(new OutputStreamWriter(out, StandardCharsets.UTF_8))); final byte[] charData = out.toByteArray(); return new String(charData, StandardCharsets.UTF_8); @@ -128,7 +129,7 @@ public final class TestUtils { * module set has only one element then this element is returned. * */ - public static Module resolveModule(final String searchedModuleName, final Set modules) { + public static Module resolveModule(final String searchedModuleName, final Collection modules) { assertNotNull("Modules can't be null.", modules); if (searchedModuleName != null) { for (final Module m : modules) { @@ -158,16 +159,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); - Date dt = null; - if (date != null) { - dt = Date.valueOf(date); - } - return QName.create(u, dt, 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) { @@ -179,7 +171,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; @@ -220,13 +212,12 @@ public final class TestUtils { predicate.put(QName.create(namespace, revision, key), keys.get(key)); } - return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate); + return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate); } public static NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName, final String namespace, final String revision, final String... keysAndValues) throws ParseException { - Preconditions.checkArgument(keysAndValues.length % 2 == 0, - "number of keys argument have to be divisible by 2 (map)"); + checkArgument(keysAndValues.length % 2 == 0, "number of keys argument have to be divisible by 2 (map)"); final Map predicate = new HashMap<>(); int index = 0; @@ -234,13 +225,13 @@ public final class TestUtils { predicate.put(QName.create(namespace, revision, keysAndValues[index++]), keysAndValues[index++]); } - return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate); + 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 DataContainerNodeAttrBuilder mapEntryNode = + final DataContainerNodeBuilder mapEntryNode = ImmutableMapEntryNodeBuilder.create(); final Map predicates = new HashMap<>();