Migrate users of Optional.get()

[yangtools.git] / parser / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / stmt / RpcStmtTest.java

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
index 3d8104c678f8bca6c6ccf8232ac13f0461e928b1..e6c9daee4da74a422dbd3ddc81c37b759c5e7413 100644 (file)
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
@@ -7,71 +7,54 @@
  */
 package org.opendaylight.yangtools.yang.stmt;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource;
-
-import java.util.Collection;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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 org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.InputSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.OutputSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
-import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
-public class RpcStmtTest extends AbstractYangTest {
+class RpcStmtTest extends AbstractYangTest {
     @Test
-    public void rpcTest() throws ReactorException {
-        final EffectiveModelContext result = RFC7950Reactors.defaultReactor().newBuild()
-                .addSource(sourceForResource("/model/baz.yang"))
-                .addSource(sourceForResource("/model/bar.yang"))
-                .addSource(sourceForResource("/rpc-stmt-test/foo.yang"))
-                .buildEffective();
-        assertNotNull(result);
-
-        final Module testModule = result.findModules("baz").iterator().next();
+    void rpcTest() {
+        final var result = assertEffectiveModel("/model/baz.yang", "/model/bar.yang", "/rpc-stmt-test/foo.yang");
+
+        final var testModule = result.findModules("baz").iterator().next();
         assertEquals(1, testModule.getRpcs().size());
 
-        final RpcDefinition rpc = testModule.getRpcs().iterator().next();
+        final var rpc = testModule.getRpcs().iterator().next();
         assertEquals("get-config", rpc.getQName().getLocalName());
 
-        final InputSchemaNode input = rpc.getInput();
-        assertNotNull(input);
+        final var input = rpc.getInput();
         assertEquals(2, input.getChildNodes().size());
 
-        final ContainerSchemaNode container = (ContainerSchemaNode) input.getDataChildByName(
-            QName.create(testModule.getQNameModule(), "source"));
-        assertNotNull(container);
-        AnyxmlSchemaNode anyXml = (AnyxmlSchemaNode) input.getDataChildByName(
-            QName.create(testModule.getQNameModule(), "filter"));
-        assertNotNull(anyXml);
+        assertInstanceOf(ContainerSchemaNode.class,
+            input.getDataChildByName(QName.create(testModule.getQNameModule(), "source")));
+        assertInstanceOf(AnyxmlSchemaNode.class,
+            input.getDataChildByName(QName.create(testModule.getQNameModule(), "filter")));
 
-        final OutputSchemaNode output = rpc.getOutput();
+        final var output = rpc.getOutput();
         assertNotNull(output);
         assertEquals(1, output.getChildNodes().size());
 
-        anyXml = (AnyxmlSchemaNode) output.getDataChildByName(QName.create(testModule.getQNameModule(), "data"));
-        assertNotNull(anyXml);
+        assertInstanceOf(AnyxmlSchemaNode.class,
+            output.getDataChildByName(QName.create(testModule.getQNameModule(), "data")));
 
-        final Module fooModule = result.findModule("foo", Revision.of("2016-09-23")).get();
-        final Collection<? extends RpcDefinition> rpcs = fooModule.getRpcs();
+        final var fooModule = result.findModule("foo", Revision.of("2016-09-23")).orElseThrow();
+        final var rpcs = fooModule.getRpcs();
         assertEquals(2, rpcs.size());
 
         RpcDefinition fooRpc1 = null;
         RpcDefinition fooRpc2 = null;
 
-        for (RpcDefinition rpcDefinition : rpcs) {
+        for (var rpcDefinition : rpcs) {
             if ("foo-rpc-1".equals(rpcDefinition.getQName().getLocalName())) {
                 fooRpc1 = rpcDefinition;
             } else if ("foo-rpc-2".equals(rpcDefinition.getQName().getLocalName())) {
@@ -79,41 +62,39 @@ public class RpcStmtTest extends AbstractYangTest {
             }
         }
 
-        assertFalse(fooRpc1.equals(null));
-        assertFalse(fooRpc1.equals("str"));
-        assertFalse(fooRpc1.equals(fooRpc2));
+        assertNotEquals(null, fooRpc1);
+        assertNotEquals("str", fooRpc1);
+        assertNotEquals(fooRpc1, fooRpc2);
 
         assertNotEquals(fooRpc1.getInput().hashCode(), fooRpc2.getInput().hashCode());
         assertNotEquals(fooRpc1.getOutput().hashCode(), fooRpc2.getOutput().hashCode());
 
-        assertTrue(fooRpc1.getInput().equals(fooRpc1.getInput()));
-        assertFalse(fooRpc1.getInput().equals(null));
-        assertFalse(fooRpc1.getInput().equals("str"));
-        assertFalse(fooRpc1.getInput().equals(fooRpc2.getInput()));
+        assertEquals(fooRpc1.getInput(), fooRpc1.getInput());
+        assertNotEquals(null, fooRpc1.getInput());
+        assertNotEquals("str", fooRpc1.getInput());
+        assertNotEquals(fooRpc1.getInput(), fooRpc2.getInput());
 
-        assertTrue(fooRpc1.getOutput().equals(fooRpc1.getOutput()));
-        assertFalse(fooRpc1.getOutput().equals(null));
-        assertFalse(fooRpc1.getOutput().equals("str"));
-        assertFalse(fooRpc1.getOutput().equals(fooRpc2.getOutput()));
+        assertEquals(fooRpc1.getOutput(), fooRpc1.getOutput());
+        assertNotEquals(null, fooRpc1.getOutput());
+        assertNotEquals("str", fooRpc1.getOutput());
+        assertNotEquals(fooRpc1.getOutput(), fooRpc2.getOutput());
     }
 
     @Test
-    public void testImplicitInputAndOutput() {
+    void testImplicitInputAndOutput() {
         final var context = assertEffectiveModel("/rpc-stmt-test/bar.yang");
 
-        final Module barModule = context.findModule("bar", Revision.of("2016-11-25")).get();
-        final Collection<? extends RpcDefinition> rpcs = barModule.getRpcs();
+        final var barModule = context.findModule("bar", Revision.of("2016-11-25")).orElseThrow();
+        final var rpcs = barModule.getRpcs();
         assertEquals(1, rpcs.size());
 
-        final RpcDefinition barRpc = rpcs.iterator().next();
+        final var barRpc = rpcs.iterator().next();
 
-        final InputSchemaNode input = barRpc.getInput();
-        assertNotNull(input);
+        final var input = barRpc.getInput();
         assertEquals(2, input.getChildNodes().size());
         assertEquals(StatementOrigin.CONTEXT, ((EffectiveStatement<?, ?>) input).statementOrigin());
 
-        final OutputSchemaNode output = barRpc.getOutput();
-        assertNotNull(output);
+        final var output = barRpc.getOutput();
         assertEquals(2, output.getChildNodes().size());
         assertEquals(StatementOrigin.CONTEXT, ((EffectiveStatement<?, ?>) output).statementOrigin());
     }