Migrate yang-data-tree-ri to JUnit5

[yangtools.git] / data / yang-data-tree-ri / src / test / java / org / opendaylight / yangtools / yang / data / tree / impl / CaseAugmentTest.java

diff --git a/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseAugmentTest.java b/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseAugmentTest.java
index 331bb39d2a6ecc502db98281454e019b9e4c08ff..8473d30d1ef98742b29e4a3ebea2a840b31ba122 100644 (file)
--- a/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseAugmentTest.java
+++ b/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseAugmentTest.java
@@ -7,28 +7,25 @@
  */
 package org.opendaylight.yangtools.yang.data.tree.impl;
 
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.leafNode;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTree;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration;
-import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException;
 import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
-public class CaseAugmentTest {
+class CaseAugmentTest {
     private static final QName CHOICE1_QNAME = QName.create(TestModel.TEST_QNAME, "choice1");
     private static final QName C1L2_QNAME = QName.create(TestModel.TEST_QNAME, "case1-leaf2");
     private static final QName C1L3_QNAME = QName.create(TestModel.TEST_QNAME, "case1-leaf3");
@@ -36,8 +33,8 @@ public class CaseAugmentTest {
 
     private static EffectiveModelContext SCHEMA_CONTEXT;
 
-    @BeforeClass
-    public static void beforeClass() {
+    @BeforeAll
+    static void beforeClass() {
         SCHEMA_CONTEXT = YangParserTestUtils.parseYang("""
             module case-augment-test {
               yang-version 1;
@@ -74,42 +71,41 @@ public class CaseAugmentTest {
             }""");
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @AfterAll
+    static void afterClass() {
         SCHEMA_CONTEXT = null;
     }
 
     private static DataTree initDataTree() {
-        DataTree inMemoryDataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION,
+        return new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION,
             SCHEMA_CONTEXT);
-        return inMemoryDataTree;
     }
 
     @Test
-    public void testWriteAugment() throws DataValidationFailedException {
-        final DataTree inMemoryDataTree = initDataTree();
+    void testWriteAugment() throws DataValidationFailedException {
+        final var inMemoryDataTree = initDataTree();
 
-        final ContainerNode container = Builders.containerBuilder()
+        final var container = Builders.containerBuilder()
             .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME))
             .withChild(Builders.choiceBuilder()
                 .withNodeIdentifier(CHOICE_ID)
                 .withChild(leafNode(C1L2_QNAME, "leaf-value"))
                 .build())
             .build();
-        final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
+        final var modificationTree = inMemoryDataTree.takeSnapshot().newModification();
         modificationTree.write(TestModel.TEST_PATH, container);
         modificationTree.ready();
 
         inMemoryDataTree.validate(modificationTree);
-        final DataTreeCandidate prepare = inMemoryDataTree.prepare(modificationTree);
+        final var prepare = inMemoryDataTree.prepare(modificationTree);
         inMemoryDataTree.commit(prepare);
     }
 
     @Test
-    public void testWriteCase1All() throws DataValidationFailedException {
-        final DataTree inMemoryDataTree = initDataTree();
+    void testWriteCase1All() throws DataValidationFailedException {
+        final var inMemoryDataTree = initDataTree();
 
-        final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification();
+        final var modificationTree = inMemoryDataTree.takeSnapshot().newModification();
         modificationTree.write(TestModel.TEST_PATH, Builders.containerBuilder()
             .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME))
             .withChild(Builders.choiceBuilder()
@@ -127,8 +123,8 @@ public class CaseAugmentTest {
     }
 
     @Test
-    public void testWriteConflict() throws DataValidationFailedException {
-        final DataTreeModification modificationTree = initDataTree().takeSnapshot().newModification();
+    void testWriteConflict() throws DataValidationFailedException {
+        final var modificationTree = initDataTree().takeSnapshot().newModification();
         modificationTree.write(TestModel.TEST_PATH, Builders.containerBuilder()
             .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME))
             .withChild(Builders.choiceBuilder()
@@ -138,7 +134,7 @@ public class CaseAugmentTest {
                 .build())
             .build());
 
-        final IllegalArgumentException e = assertThrows(IllegalArgumentException.class, modificationTree::ready);
-        assertThat(e.getMessage(), containsString(" implies non-presence of child "));
+        final var e = assertThrows(IllegalArgumentException.class, modificationTree::ready);
+        assertTrue(e.getMessage().contains(" implies non-presence of child "));
     }
 }