From fdcca49b958f47a4f2624dd14162f779a44a743e Mon Sep 17 00:00:00 2001 From: epickrram Date: Mon, 11 Dec 2017 11:59:41 +0000 Subject: [PATCH 1/5] remove debug logging from test --- src/test/java/eg/WordCountTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/eg/WordCountTest.java b/src/test/java/eg/WordCountTest.java index c54364188..3b7670a97 100644 --- a/src/test/java/eg/WordCountTest.java +++ b/src/test/java/eg/WordCountTest.java @@ -21,7 +21,6 @@ import com.google.common.io.ByteStreams; import net.openhft.chronicle.core.io.Closeable; import net.openhft.chronicle.core.values.IntValue; import net.openhft.chronicle.map.ChronicleMap; -import net.openhft.chronicle.map.MapDiagnostics; import net.openhft.chronicle.values.Values; import org.junit.Test; @@ -64,7 +63,6 @@ public class WordCountTest { v.addValue(1); } } - MapDiagnostics.printMapStats(map); } } } From f1d7f0277cd74c5f3d348c7ea0a88534cb39eaf4 Mon Sep 17 00:00:00 2001 From: epickrram Date: Mon, 11 Dec 2017 12:07:56 +0000 Subject: [PATCH 2/5] add test description and enable --- .../chronicle/map/MemoryLeaksTest.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java b/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java index f25894a16..64ab787c6 100644 --- a/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java +++ b/src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java @@ -24,7 +24,10 @@ import net.openhft.chronicle.core.values.IntValue; import net.openhft.chronicle.hash.serialization.impl.StringSizedReader; import net.openhft.chronicle.hash.serialization.impl.StringUtf8DataAccess; import net.openhft.chronicle.values.Values; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -37,22 +40,32 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; -@Ignore("flaky test") @RunWith(Parameterized.class) public class MemoryLeaksTest { - @Parameterized.Parameters + @Parameterized.Parameters(name = "{0}") public static Collection data() { List booleans = Arrays.asList(false, true); // Test with all possible combinations of three boolean parameters. return Lists.cartesianProduct(booleans, booleans, booleans) - .stream().map(List::toArray).collect(Collectors.toList()); + .stream().map(flags -> { + final ArrayList namedFlags = new ArrayList<>(Collections.singletonList(named(flags))); + namedFlags.addAll(flags); + return namedFlags; + }).map(List::toArray).collect(Collectors.toList()); + } + + private static String named(final List flags) { + return (!flags.get(0) ? "not " : "") + "replicated, " + + (!flags.get(1) ? "not " : "") + "persisted, " + + (!flags.get(2) ? "not " : "") + "closed within context"; } @Rule @@ -69,7 +82,7 @@ public class MemoryLeaksTest { private final AtomicInteger serializerCount = new AtomicInteger(); private final List> serializers = new ArrayList<>(); - public MemoryLeaksTest(boolean replicated, boolean persisted, boolean closeWithinContext) { + public MemoryLeaksTest(String testType, boolean replicated, boolean persisted, boolean closeWithinContext) { this.persisted = persisted; this.closeWithinContext = closeWithinContext; builder = ChronicleMap From 0e2e8d02e960c705acd268082f723f40f3dec5ea Mon Sep 17 00:00:00 2001 From: teamcity_hft Date: Wed, 3 Jan 2018 23:52:53 +0000 Subject: [PATCH 3/5] Updating to bom version 1.15.25 at 2018-01-03T23:52:53.637Z --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75cf15942..49bfde252 100755 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ net.openhft chronicle-bom - 1.14.127 + 1.15.25 pom import From 6a5cb65e0ea4089093ce988722eea98216b0bc40 Mon Sep 17 00:00:00 2001 From: teamcity_hft Date: Thu, 4 Jan 2018 01:16:50 +0000 Subject: [PATCH 4/5] [maven-release-plugin] prepare release chronicle-map-3.14.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 49bfde252..4d65efc4e 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 chronicle-map - 3.14.5-SNAPSHOT + 3.14.5 OpenHFT/Chronicle-Map Chronicle-Map bundle @@ -413,7 +413,7 @@ scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git - master + chronicle-map-3.14.5 From 9d3a1280abb664de411d208f1b51eb94c390861b Mon Sep 17 00:00:00 2001 From: teamcity_hft Date: Thu, 4 Jan 2018 01:16:56 +0000 Subject: [PATCH 5/5] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4d65efc4e..8242e6c81 100755 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 chronicle-map - 3.14.5 + 3.14.6-SNAPSHOT OpenHFT/Chronicle-Map Chronicle-Map bundle @@ -413,7 +413,7 @@ scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git - chronicle-map-3.14.5 + master