*/
package org.opendaylight.yangtools.binding.data.codec.impl;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.BeforeEach;
import org.opendaylight.yangtools.binding.DataObject;
*/
package org.opendaylight.yangtools.binding.data.codec.impl;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.junit.jupiter.api.Test;
import org.opendaylight.yang.gen.v1.urn.yang.foo.rev160101.BooleanContainer;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.ArrayList;
import java.util.List;
*/
package org.opendaylight.yangtools.binding.data.codec.impl;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
}
final byte[] bytes = baos.toByteArray();
- Assert.assertEquals(expectedSize, bytes.length);
+ Assertions.assertEquals(expectedSize, bytes.length);
final NormalizedNode deser;
try {
} catch (IOException e) {
throw new AssertionError("Failed to deserialize", e);
}
- Assert.assertEquals(node, deser);
+ Assertions.assertEquals(node, deser);
return node;
}
}
final byte[] bytes = baos.toByteArray();
- Assert.assertEquals(expectedSize, bytes.length);
+ Assertions.assertEquals(expectedSize, bytes.length);
final PathArgument deser;
try {
} catch (IOException e) {
throw new AssertionError("Failed to deserialize", e);
}
- Assert.assertEquals(arg, deser);
+ Assertions.assertEquals(arg, deser);
return (T) deser;
}
}
final byte[] bytes = baos.toByteArray();
- Assert.assertEquals(expectedSize, bytes.length);
+ Assertions.assertEquals(expectedSize, bytes.length);
try {
final var in = NormalizedNodeDataInput.newDataInput(ByteStreams.newDataInput(bytes));
- Assert.assertEquals(arg, in.readPathArgument());
- Assert.assertEquals(arg, in.readPathArgument());
+ Assertions.assertEquals(arg, in.readPathArgument());
+ Assertions.assertEquals(arg, in.readPathArgument());
} catch (IOException e) {
throw new AssertionError("Failed to deserialize", e);
}
static final void assertSame(final NormalizedNodeStreamVersion version, final Object value,
final int expectedSize) {
- Assert.assertSame(value, assertEquals(version, value, expectedSize));
+ Assertions.assertSame(value, assertEquals(version, value, expectedSize));
}
static final void assertSame(final NormalizedNodeStreamVersion version, final PathArgument arg,
final int expectedSize) {
- Assert.assertSame(arg, assertEquals(version, arg, expectedSize));
+ Assertions.assertSame(arg, assertEquals(version, arg, expectedSize));
}
static final List<QName> generateQNames(final int size) {
*/
package org.opendaylight.yangtools.yang.data.codec.binfmt;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.common.io.ByteStreams;
import java.io.ByteArrayInputStream;
final var nnin = NormalizedNodeDataInput.newDataInput(ByteStreams.newDataInput(bytes));
- final var deserialized = (ContainerNode)nnin.readNormalizedNode();
+ final var deserialized = assertInstanceOf(ContainerNode.class, nnin.readNormalizedNode());
final var child = deserialized.findChildByArg(new NodeIdentifier(TestModel.ANY_XML_QNAME));
- assertEquals("AnyXml child present", true, child.isPresent());
+ assertTrue(child.isPresent());
final var xmlOutput = new StreamResult(new StringWriter());
final var transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
transformer.transform(((DOMSourceAnyxmlNode)child.orElseThrow()).body(), xmlOutput);
- assertEquals("XML", xml, xmlOutput.getWriter().toString());
+ assertEquals(xml, xmlOutput.getWriter().toString());
assertEquals("http://www.w3.org/TR/html4/",
((DOMSourceAnyxmlNode)child.orElseThrow()).body().getNode().getNamespaceURI());
}
*/
package org.opendaylight.yangtools.yang.data.codec.xml;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.io.StringWriter;
import javax.xml.stream.XMLOutputFactory;
final var xmlParser = XmlParserStream.create(streamWriter, Inference.ofDataTreePath(SCHEMA_CONTEXT, FOO_QNAME));
xmlParser.parse(reader);
- final var transformedInput = result.getResult().data();
- assertThat(transformedInput, instanceOf(AnydataNode.class));
- final var anydataNode = (AnydataNode<?>) transformedInput;
+ final var anydataNode = assertInstanceOf(AnydataNode.class, result.getResult().data());
// serialization
final var writer = new StringWriter();
final var xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(xmlStreamWriter,
SCHEMA_CONTEXT);
final var normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(xmlNormalizedNodeStreamWriter);
- normalizedNodeWriter.write(transformedInput);
+ normalizedNodeWriter.write(anydataNode);
normalizedNodeWriter.flush();
final String serializedXml = writer.toString();
- final String deserializeXml = getXmlFromDOMSource(((DOMSourceAnydata) anydataNode.body()).getSource());
+ final String deserializeXml = getXmlFromDOMSource(assertInstanceOf(DOMSourceAnydata.class, anydataNode.body())
+ .getSource());
assertFalse(serializedXml.isEmpty());
// Check if is Serialize Node same as Deserialize Node
xmlParser.flush();
//Get Result
- final var node = normalizedResult.getResult().data();
- assertThat(node, instanceOf(AnydataNode.class));
- final var anydataResult = (AnydataNode<?>) node;
+ final var anydataResult = assertInstanceOf(AnydataNode.class, normalizedResult.getResult().data());
//Get Result in formatted String
- assertThat(anydataResult.body(), instanceOf(DOMSourceAnydata.class));
- final String serializedXml = getXmlFromDOMSource(((DOMSourceAnydata)anydataResult.body()).getSource());
+ final String serializedXml = getXmlFromDOMSource(assertInstanceOf(DOMSourceAnydata.class, anydataResult.body())
+ .getSource());
final String expectedXml = toString(doc.getDocumentElement());
//Looking for difference in Serialized xml and in Loaded XML
*/
package org.opendaylight.yangtools.yang.common;
-import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.lessThan;
-import static org.junit.Assert.assertSame;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
*/
package org.opendaylight.yangtools.yang.common;
-import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
*/
package org.opendaylight.yangtools.yang.parser.rfc7950.antlr;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
import org.junit.jupiter.api.Test;
*/
package org.opendaylight.yangtools.yang.stmt;
-import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.common.collect.Iterables;
Code Review / yangtools.git / commitdiff