From 3e969a42661a7536201a9ae2a86a84eb3d72fc12 Mon Sep 17 00:00:00 2001
From: Per Minborg <minborg@speedment.com>
Date: Tue, 1 Sep 2020 16:42:39 +0200
Subject: [PATCH] Cleanup test resources

---
 .../map/ConstantSizeBySampleTest.java         | 36 ++++++++++---------
 .../chronicle/map/MissSizedMapsTest.java      | 14 ++++----
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java b/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java
index 3a4d767ae..7f4f1ed73 100644
--- a/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ConstantSizeBySampleTest.java
@@ -31,22 +31,23 @@ import static org.junit.Assert.assertEquals;
 public class ConstantSizeBySampleTest {
 
     @Test
-    public void testConstantKeys() throws IOException {
-        ChronicleMap<byte[], Long> map = ChronicleMapBuilder.of(byte[].class, Long.class)
+    public void testConstantKeys() {
+        try (ChronicleMap<byte[], Long> map = ChronicleMapBuilder.of(byte[].class, Long.class)
                 .constantKeySizeBySample(new byte[8])
                 .entries(100)
-                .create();
+                .create()) {
 
-        byte[] zero = ByteBuffer.allocate(8).putLong(0L).array();
-        map.put(zero, 0L);
-        assertEquals(0L, (long) map.get(zero));
+            byte[] zero = ByteBuffer.allocate(8).putLong(0L).array();
+            map.put(zero, 0L);
+            assertEquals(0L, (long) map.get(zero));
 
-        byte[] one = ByteBuffer.allocate(8).putLong(1L).array();
-        map.put(one, 1L);
-        assertEquals(1L, (long) map.get(one));
+            byte[] one = ByteBuffer.allocate(8).putLong(1L).array();
+            map.put(one, 1L);
+            assertEquals(1L, (long) map.get(one));
 
-        map.put(one, 0L);
-        assertEquals(0L, (long) map.get(one));
+            map.put(one, 0L);
+            assertEquals(0L, (long) map.get(one));
+        }
     }
 
     @Test
@@ -96,9 +97,12 @@ public class ConstantSizeBySampleTest {
         }
     }
 
-    static class ExternalizableData implements Externalizable {
+    static final class ExternalizableData implements Externalizable {
         byte[] data = new byte[512 * 1024];
 
+        public ExternalizableData() {
+        }
+
         @Override
         public boolean equals(Object obj) {
             if (!(obj instanceof ExternalizableData))
@@ -117,7 +121,7 @@ public class ConstantSizeBySampleTest {
         }
     }
 
-    static class SerializableData implements Serializable {
+    static final class SerializableData implements Serializable {
         byte[] data = new byte[512 * 1024];
 
         @Override
@@ -128,7 +132,7 @@ public class ConstantSizeBySampleTest {
         }
     }
 
-    private static class ExternalizableDataDataAccess
+    private static final class ExternalizableDataDataAccess
             extends ExternalizableDataAccess<ExternalizableData> implements Serializable {
         public ExternalizableDataDataAccess() {
             super(ExternalizableData.class);
@@ -145,7 +149,7 @@ public class ConstantSizeBySampleTest {
         }
     }
 
-    private static class ExternalizableDataReader extends ExternalizableReader<ExternalizableData> {
+    private static final class ExternalizableDataReader extends ExternalizableReader<ExternalizableData> {
         public ExternalizableDataReader() {
             super(ExternalizableData.class);
         }
@@ -155,4 +159,4 @@ public class ConstantSizeBySampleTest {
             return new ExternalizableData();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/net/openhft/chronicle/map/MissSizedMapsTest.java b/src/test/java/net/openhft/chronicle/map/MissSizedMapsTest.java
index d8d0d4dd6..3bd3961c3 100755
--- a/src/test/java/net/openhft/chronicle/map/MissSizedMapsTest.java
+++ b/src/test/java/net/openhft/chronicle/map/MissSizedMapsTest.java
@@ -20,14 +20,15 @@ public class MissSizedMapsTest {
 
     @Test(timeout = 60000)
     public void testSmallEntries() throws IOException, URISyntaxException {
-        ChronicleMap<String, String> actual = ChronicleMapBuilder.of(String.class, String.class)
+
+        try (ChronicleMap<String, String> actual = ChronicleMapBuilder.of(String.class, String.class)
                 .averageKey("D-6.0149935894066442E18").averageValue("226|16533|4|1|1|testHarness").entries(150 << 10)
-                .createPersistedTo(File.createTempFile("chronicle", "cmap"));
-        check(actual);
+                .createPersistedTo(File.createTempFile("chronicle", "cmap"))) {
+            check(actual);
+        }
     }
 
-    private void check(final ChronicleMap<String, String> actual) throws
-            IOException, URISyntaxException {
+    private void check(final ChronicleMap<String, String> actual) throws IOException, URISyntaxException {
         URI uri = MissSizedMapsTest.class.getResource("/input.txt").toURI();
 
         List<String> strings = Files.readAllLines(Paths.get(uri));
@@ -59,5 +60,4 @@ public class MissSizedMapsTest {
             }
         }
     }
-
-}
+}
\ No newline at end of file