Migrate common/util to JUnit5

[yangtools.git] / common / util / src / test / java / org / opendaylight / yangtools / util / ReadWriteTrieMapTest.java

diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java
index c78b1d7f6047b01559c4ba743ae7316c83da0464..dd79d79d7fde709e4b1f285204f688fd900b971b 100644 (file)
--- a/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java
+++ b/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java
@@ -7,69 +7,67 @@
  */
 package org.opendaylight.yangtools.util;
 
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import org.junit.Test;
-import tech.pantheon.triemap.MutableTrieMap;
+import org.junit.jupiter.api.Test;
 import tech.pantheon.triemap.TrieMap;
 
-public class ReadWriteTrieMapTest {
+class ReadWriteTrieMapTest {
 
     @Test
-    public void testMethodsOfReadWriteTrieMap() {
-        final MutableTrieMap<String, String> trieMap = TrieMap.create();
+    void testMethodsOfReadWriteTrieMap() {
+        final var trieMap = TrieMap.<String, String>create();
         trieMap.put("0", "zero");
         trieMap.put("1", "one");
 
-        final ReadWriteTrieMap<String, String> readWriteTrieMap = new ReadWriteTrieMap<>(trieMap, 5);
+        final var readWriteTrieMap = new ReadWriteTrieMap<>(trieMap, 5);
 
-        assertNotNull("Object readOnlyTrieMap shouldn't be 'null'.", readWriteTrieMap);
+        assertNotNull(readWriteTrieMap, "Object readOnlyTrieMap shouldn't be 'null'.");
 
-        assertEquals("Size of readOnlyTrieMap should be '5'.", 5, readWriteTrieMap.size());
-        assertFalse("Object readOnlyTrieMap shouldn't be empty.", readWriteTrieMap.isEmpty());
+        assertEquals(5, readWriteTrieMap.size(), "Size of readOnlyTrieMap should be '5'.");
+        assertFalse(readWriteTrieMap.isEmpty(), "Object readOnlyTrieMap shouldn't be empty.");
 
-        assertTrue("Object readOnlyTrieMap should have key '0'.", readWriteTrieMap.containsKey("0"));
-        assertTrue("Object readOnlyTrieMap should have value 'zero'.", readWriteTrieMap.containsValue("zero"));
-        assertEquals("Object readOnlyTrieMap should have value 'zero'.", "zero", readWriteTrieMap.get("0"));
+        assertTrue(readWriteTrieMap.containsKey("0"), "Object readOnlyTrieMap should have key '0'.");
+        assertTrue(readWriteTrieMap.containsValue("zero"), "Object readOnlyTrieMap should have value 'zero'.");
+        assertEquals("zero", readWriteTrieMap.get("0"), "Object readOnlyTrieMap should have value 'zero'.");
 
-        final Map<String, String> rwMap = readWriteTrieMap;
+        final var rwMap = readWriteTrieMap;
         rwMap.put("2", "two");
         rwMap.put("3", "three");
 
-        assertEquals("Removed value from readOnlyTrieMap should be 'one'.", "one", rwMap.remove("1"));
+        assertEquals("one", rwMap.remove("1"), "Removed value from readOnlyTrieMap should be 'one'.");
 
-        final Set<String> trieMapKeySet = readWriteTrieMap.keySet();
-        assertEquals("Size of keySet should be '3'.", 3, trieMapKeySet.size());
+        final var trieMapKeySet = readWriteTrieMap.keySet();
+        assertEquals(3, trieMapKeySet.size(), "Size of keySet should be '3'.");
 
-        final Collection<String> trieMapValues = readWriteTrieMap.values();
-        assertEquals("Size of values should be '3'.", 3, trieMapValues.size());
+        final var trieMapValues = readWriteTrieMap.values();
+        assertEquals(3, trieMapValues.size(), "Size of values should be '3'.");
 
         assertEquals(convertSetEntryToMap(readWriteTrieMap.entrySet()), trieMap);
 
         trieMap.put("2", "two");
-        final ReadWriteTrieMap<String, String> readWriteTrieMap2 = new ReadWriteTrieMap<>(trieMap, 4);
+        final var readWriteTrieMap2 = new ReadWriteTrieMap<>(trieMap, 4);
 
         assertNotEquals(readWriteTrieMap, readWriteTrieMap2);
         assertEquals(readWriteTrieMap.hashCode(), readWriteTrieMap2.hashCode());
 
-        final Map<String, String> readOnlyTrieMap = readWriteTrieMap.toReadOnly();
+        final var readOnlyTrieMap = readWriteTrieMap.toReadOnly();
         readWriteTrieMap.clear();
         assertEquals(0, readWriteTrieMap.size());
         assertEquals(6, readOnlyTrieMap.size());
     }
 
     private static Map<String, String> convertSetEntryToMap(final Set<Entry<String, String>> input) {
-        Map<String, String> resultMap = new HashMap<>();
-        for (Entry<String, String> entry : input) {
+        final var resultMap = new HashMap<String, String>();
+        for (var entry : input) {
             resultMap.put(entry.getKey(), entry.getValue());
         }
         return resultMap;