From cca2cd77e07f0637756c445a86cfc767d7d4ec60 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Mon, 2 Feb 2015 16:53:18 +0000 Subject: [PATCH] removed unnessasary persistant file --- .../net/openhft/chronicle/map/ReplicatedChronicleMap.java | 3 ++- .../net/openhft/chronicle/map/DemoChronicleMapTest.java | 4 +++- .../java/net/openhft/chronicle/map/EntryCountMapTest.java | 8 ++++++-- .../openhft/chronicle/map/TimeBasedReplicationTest.java | 7 ------- .../net/openhft/chronicle/map/jsr166/map/MapCheck.java | 6 ------ 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java index 4c1aef4df..b033d5f8d 100644 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -29,6 +29,7 @@ import net.openhft.chronicle.hash.serialization.internal.MetaBytesWriter; import net.openhft.lang.Maths; import net.openhft.lang.collection.ATSDirectBitSet; import net.openhft.lang.io.Bytes; +import net.openhft.lang.io.CheckedBytes; import net.openhft.lang.io.MultiStoreBytes; import net.openhft.lang.io.NativeBytesI; import net.openhft.lang.threadlocal.ThreadLocalCopies; @@ -188,7 +189,7 @@ final class ReplicatedChronicleMap map = getSharedMap(minSize, segments, maxKeySize); - testEntriesMaxSize0(segments, minSize, maxSize, counter, stride, map); + File file; + try (ChronicleMap map = getSharedMap(minSize, segments, maxKeySize)) { + file = map.file(); + testEntriesMaxSize0(segments, minSize, maxSize, counter, stride, map); + } + file.delete(); } void testEntriesMaxSize0(int segments, int minSize, int maxSize, int counter, int stride, diff --git a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java index 1bee40e87..6d91c0fc9 100644 --- a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java @@ -25,7 +25,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import java.io.File; import java.io.IOException; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -39,12 +38,6 @@ public class TimeBasedReplicationTest extends JSR166TestCase { public static final byte IDENTIFIER = 1; - private static File getPersistenceFile() { - String TMP = System.getProperty("java.io.tmpdir"); - File file = new File(TMP + "/chm-test" + System.nanoTime()); - file.deleteOnExit(); - return file; - } Set threads; diff --git a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java index 9682814f7..6e1b035c3 100644 --- a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java +++ b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java @@ -111,12 +111,6 @@ public class MapCheck { serTest(size); } - private static File getPersistenceFile() { - String TMP = System.getProperty("java.io.tmpdir"); - File file = new File(TMP + "/chm-test" + System.nanoTime()); - file.deleteOnExit(); - return file; - } static Map newMap() { try {