From 13fc38aa49594a4db1b10dbd2b6be8570430131b Mon Sep 17 00:00:00 2001 From: Peter Lawrey Date: Mon, 2 Nov 2020 13:36:07 +0000 Subject: [PATCH] Add a utility to make unique files/dirs easier, closes https://github.com/OpenHFT/Chronicle-Core/issues/149 --- .../java/net/openhft/chronicle/map/AcquireGetUsingMain.java | 1 + src/test/java/net/openhft/chronicle/map/ArrayTest.java | 1 + .../openhft/chronicle/map/ChronicleMapImportExportTest.java | 2 ++ .../net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java | 2 ++ src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java | 2 ++ src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java | 2 +- .../java/net/openhft/chronicle/map/ForEachSegmentTest.java | 1 + src/test/java/net/openhft/chronicle/map/Issue125Test.java | 3 ++- .../java/net/openhft/chronicle/map/Issue62ChronicleServer.java | 2 ++ src/test/java/net/openhft/chronicle/map/Issue63Test.java | 2 ++ src/test/java/net/openhft/chronicle/map/MarkTest.java | 1 + .../net/openhft/chronicle/map/ProcessInstanceLimiterMain.java | 1 + .../net/openhft/chronicle/map/RecursiveRefereneChMapTest.java | 2 ++ .../java/net/openhft/chronicle/map/WriteThroughputTest.java | 1 + .../net/openhft/chronicle/map/example/LotsOfEntriesMain.java | 1 + .../chronicle/map/externalizable/ExternalizableTest.java | 1 + .../chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java | 2 ++ .../net/openhft/chronicle/map/ipc/StateMachineTutorial.java | 1 + .../openhft/chronicle/map/utility/ProcessInstanceLimiter.java | 1 + src/test/java/net/openhft/lang/values/ArrayTest.java | 1 + 20 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java b/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java index 685f817cf..3f951e848 100644 --- a/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java +++ b/src/test/java/net/openhft/chronicle/map/AcquireGetUsingMain.java @@ -17,6 +17,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.bytes.Byteable; +import net.openhft.chronicle.core.OS; import net.openhft.chronicle.values.Array; import net.openhft.chronicle.values.Values; diff --git a/src/test/java/net/openhft/chronicle/map/ArrayTest.java b/src/test/java/net/openhft/chronicle/map/ArrayTest.java index f056683d7..461bfc7f0 100644 --- a/src/test/java/net/openhft/chronicle/map/ArrayTest.java +++ b/src/test/java/net/openhft/chronicle/map/ArrayTest.java @@ -17,6 +17,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import org.junit.Test; import java.io.File; diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java index fff81c80f..65fc9ae26 100644 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java @@ -18,7 +18,9 @@ package net.openhft.chronicle.map; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver; +import net.openhft.chronicle.core.OS; import net.openhft.chronicle.core.io.Closeable; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.core.values.LongValue; import net.openhft.chronicle.map.fromdocs.BondVOInterface; import net.openhft.chronicle.values.Values; diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java index 167416ac5..007b16de3 100644 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java @@ -17,6 +17,8 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.core.Jvm; +import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.threads.NamedThreadFactory; import org.junit.Test; diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java index 8cbc04e34..1ab5c6b10 100755 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java @@ -20,6 +20,8 @@ import com.google.common.collect.HashBiMap; import com.google.common.primitives.Ints; import net.openhft.chronicle.bytes.BytesMarshallable; import net.openhft.chronicle.bytes.BytesStore; +import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.core.values.IntValue; import net.openhft.chronicle.core.values.LongValue; import net.openhft.chronicle.set.Builder; diff --git a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java index 0cac1a96a..412565016 100644 --- a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java @@ -16,6 +16,7 @@ package net.openhft.chronicle.map; +import net.openhft.chronicle.core.OS; import net.openhft.chronicle.core.values.LongValue; import net.openhft.chronicle.threads.NamedThreadFactory; import org.junit.Ignore; @@ -36,7 +37,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class EntryCountMapTest { - static final String TMP = OS.getTarget(); static final int ecmTests = Integer.getInteger("ecm.tests", 5); double score = 0; int scoreCount = 0; diff --git a/src/test/java/net/openhft/chronicle/map/ForEachSegmentTest.java b/src/test/java/net/openhft/chronicle/map/ForEachSegmentTest.java index 254d37444..33071a07a 100644 --- a/src/test/java/net/openhft/chronicle/map/ForEachSegmentTest.java +++ b/src/test/java/net/openhft/chronicle/map/ForEachSegmentTest.java @@ -3,6 +3,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.core.Jvm; import net.openhft.chronicle.core.OS; import net.openhft.chronicle.core.pool.ClassAliasPool; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.wire.AbstractBytesMarshallable; import org.junit.Test; diff --git a/src/test/java/net/openhft/chronicle/map/Issue125Test.java b/src/test/java/net/openhft/chronicle/map/Issue125Test.java index b4520a9de..a818f527f 100644 --- a/src/test/java/net/openhft/chronicle/map/Issue125Test.java +++ b/src/test/java/net/openhft/chronicle/map/Issue125Test.java @@ -17,6 +17,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import org.junit.Test; import java.io.File; @@ -28,7 +29,7 @@ import java.io.IOException; public class Issue125Test { @Test public void test() throws IOException { - final File cacheRoot = new File(OS.getTarget() + "/test-" + Time.unqiueId + ".cm3"); + final File cacheRoot = new File(OS.getTarget() + "/test-" + Time.uniqueId() + ".cm3"); ChronicleMapBuilder shaToNodeBuilder = ChronicleMapBuilder.of(byte[].class, byte[].class) // .name("bytes-to-bytes") diff --git a/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java b/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java index e45178cb6..e839ffc7d 100644 --- a/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java +++ b/src/test/java/net/openhft/chronicle/map/Issue62ChronicleServer.java @@ -17,6 +17,8 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.core.Jvm; +import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.hash.ChronicleHashBuilderPrivateAPI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/net/openhft/chronicle/map/Issue63Test.java b/src/test/java/net/openhft/chronicle/map/Issue63Test.java index 06f98bb5e..c90784d85 100644 --- a/src/test/java/net/openhft/chronicle/map/Issue63Test.java +++ b/src/test/java/net/openhft/chronicle/map/Issue63Test.java @@ -16,6 +16,8 @@ package net.openhft.chronicle.map; +import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.hash.Data; import net.openhft.chronicle.hash.serialization.ListMarshaller; import net.openhft.chronicle.hash.serialization.impl.CharSequenceBytesReader; diff --git a/src/test/java/net/openhft/chronicle/map/MarkTest.java b/src/test/java/net/openhft/chronicle/map/MarkTest.java index b1f6ebd5d..10d147387 100644 --- a/src/test/java/net/openhft/chronicle/map/MarkTest.java +++ b/src/test/java/net/openhft/chronicle/map/MarkTest.java @@ -17,6 +17,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.algo.MemoryUnit; +import net.openhft.chronicle.core.OS; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java index 628a675d6..c6e277690 100644 --- a/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java +++ b/src/test/java/net/openhft/chronicle/map/ProcessInstanceLimiterMain.java @@ -17,6 +17,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.core.Jvm; +import net.openhft.chronicle.core.OS; import net.openhft.chronicle.map.utility.ProcessInstanceLimiter; import java.io.File; diff --git a/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java b/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java index 63cc1bea6..dd8db1b81 100644 --- a/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/RecursiveRefereneChMapTest.java @@ -16,6 +16,8 @@ package net.openhft.chronicle.map; +import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import org.junit.Test; import java.io.*; diff --git a/src/test/java/net/openhft/chronicle/map/WriteThroughputTest.java b/src/test/java/net/openhft/chronicle/map/WriteThroughputTest.java index 07c51693d..7c04848e6 100644 --- a/src/test/java/net/openhft/chronicle/map/WriteThroughputTest.java +++ b/src/test/java/net/openhft/chronicle/map/WriteThroughputTest.java @@ -16,6 +16,7 @@ package net.openhft.chronicle.map; +import net.openhft.chronicle.core.util.Time; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java b/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java index 48648ce8e..001ed128f 100755 --- a/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java +++ b/src/test/java/net/openhft/chronicle/map/example/LotsOfEntriesMain.java @@ -16,6 +16,7 @@ package net.openhft.chronicle.map.example; +import net.openhft.chronicle.core.OS; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import net.openhft.chronicle.threads.NamedThreadFactory; diff --git a/src/test/java/net/openhft/chronicle/map/externalizable/ExternalizableTest.java b/src/test/java/net/openhft/chronicle/map/externalizable/ExternalizableTest.java index 6893f5743..50f52fe5b 100755 --- a/src/test/java/net/openhft/chronicle/map/externalizable/ExternalizableTest.java +++ b/src/test/java/net/openhft/chronicle/map/externalizable/ExternalizableTest.java @@ -17,6 +17,7 @@ package net.openhft.chronicle.map.externalizable; import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import org.junit.Test; diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java index 21b2ba6cb..c9ac77186 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java @@ -16,6 +16,8 @@ package net.openhft.chronicle.map.fromdocs; +import net.openhft.chronicle.core.OS; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import net.openhft.chronicle.map.ExternalMapQueryContext; diff --git a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java index bfce30183..5653dcf78 100644 --- a/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java +++ b/src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java @@ -16,6 +16,7 @@ package net.openhft.chronicle.map.ipc; +import net.openhft.chronicle.core.OS; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import org.slf4j.Logger; diff --git a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java index 0d295eb44..0252b4bf6 100644 --- a/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java +++ b/src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java @@ -23,6 +23,7 @@ import net.openhft.chronicle.algo.locks.TryAcquireOperations; import net.openhft.chronicle.algo.locks.VanillaReadWriteWithWaitsLockingStrategy; import net.openhft.chronicle.bytes.Byteable; import net.openhft.chronicle.core.Jvm; +import net.openhft.chronicle.core.OS; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import net.openhft.chronicle.values.Array; diff --git a/src/test/java/net/openhft/lang/values/ArrayTest.java b/src/test/java/net/openhft/lang/values/ArrayTest.java index 815b2414d..cdcf91d08 100644 --- a/src/test/java/net/openhft/lang/values/ArrayTest.java +++ b/src/test/java/net/openhft/lang/values/ArrayTest.java @@ -18,6 +18,7 @@ package net.openhft.lang.values; import net.openhft.chronicle.core.OS; import net.openhft.chronicle.core.pool.ClassAliasPool; +import net.openhft.chronicle.core.util.Time; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.map.ChronicleMapBuilder; import org.json.JSONException;