Don't spin up a whole node to unit test some data structures (#61923)

BytesRefHashTests and LongObjectHashMapTests currently extend ESSingleNodeTestCase,
which builds an entire node just to run some unit tests over entirely in-memory data
structures. This commit converts them both to extend ESTestCase.

Author: romseygeek

server/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java

@@ -27,20 +27,19 @@
 import org.apache.lucene.util.TestUtil;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
-import org.elasticsearch.test.ESSingleNodeTestCase;
+import org.elasticsearch.test.ESTestCase;
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-public class BytesRefHashTests extends ESSingleNodeTestCase {
+public class BytesRefHashTests extends ESTestCase {
 
     BytesRefHash hash;
 
-    private BigArrays randombigArrays() {
+    private BigArrays randomBigArrays() {
         return new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService());
     }
 
@@ -50,7 +49,7 @@ private void newHash() {
         }
         // Test high load factors to make sure that collision resolution works fine
         final float maxLoadFactor = 0.6f + randomFloat() * 0.39f;
-        hash = new BytesRefHash(randomIntBetween(0, 100), maxLoadFactor, randombigArrays());
+        hash = new BytesRefHash(randomIntBetween(0, 100), maxLoadFactor, randomBigArrays());
     }
 
     @Override
@@ -59,7 +58,7 @@ public void setUp() throws Exception {
         newHash();
     }
 
-    public void testDuell() {
+    public void testDuel() {
         final int len = randomIntBetween(1, 100000);
         final BytesRef[] values = new BytesRef[len];
         for (int i = 0; i < values.length; ++i) {
@@ -80,8 +79,7 @@ public void testDuell() {
         }
 
         assertEquals(valueToId.size(), hash.size());
-        for (Iterator<ObjectLongCursor<BytesRef>> iterator = valueToId.iterator(); iterator.hasNext(); ) {
-            final ObjectLongCursor<BytesRef> next = iterator.next();
+        for (final ObjectLongCursor<BytesRef> next : valueToId) {
             assertEquals(next.value, hash.find(next.key, next.key.hashCode()));
         }
 
@@ -147,7 +145,7 @@ public void testGet() {
                 long count = hash.size();
                 long key = hash.add(ref.get());
                 if (key >= 0) {
-                    assertNull(strings.put(str, Long.valueOf(key)));
+                    assertNull(strings.put(str, key));
                     assertEquals(uniqueCount, key);
                     uniqueCount++;
                     assertEquals(hash.size(), count + 1);
@@ -158,7 +156,7 @@ public void testGet() {
             }
             for (Entry<String, Long> entry : strings.entrySet()) {
                 ref.copyChars(entry.getKey());
-                assertEquals(ref.get(), hash.get(entry.getValue().longValue(), scratch));
+                assertEquals(ref.get(), hash.get(entry.getValue(), scratch));
             }
             newHash();
         }
@@ -205,7 +203,7 @@ public void testAdd() {
         hash.close();
     }
 
-    public void testFind() throws Exception {
+    public void testFind() {
         BytesRefBuilder ref = new BytesRefBuilder();
         BytesRef scratch = new BytesRef();
         int num = scaledRandomIntBetween(2, 20);

server/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java

@@ -22,18 +22,18 @@
 import com.carrotsearch.hppc.LongObjectHashMap;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
-import org.elasticsearch.test.ESSingleNodeTestCase;
+import org.elasticsearch.test.ESTestCase;
 
-public class LongObjectHashMapTests extends ESSingleNodeTestCase {
+public class LongObjectHashMapTests extends ESTestCase {
 
-    private BigArrays randombigArrays() {
+    private BigArrays randomBigArrays() {
         return new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService());
     }
 
     public void testDuel() {
         final LongObjectHashMap<Object> map1 = new LongObjectHashMap<>();
         final LongObjectPagedHashMap<Object> map2 =
-            new LongObjectPagedHashMap<>(randomInt(42), 0.6f + randomFloat() * 0.39f, randombigArrays());
+            new LongObjectPagedHashMap<>(randomInt(42), 0.6f + randomFloat() * 0.39f, randomBigArrays());
         final int maxKey = randomIntBetween(1, 10000);
         final int iters = scaledRandomIntBetween(10000, 100000);
         for (int i = 0; i < iters; ++i) {