From 1f7a928af4920690256cdd0d104efedd12215a0b Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Sun, 20 Nov 2016 19:37:51 -0600
Subject: [PATCH] Fix testChronicleMapCollectedAndDirectMemoryReleased()

---
 .../net/openhft/chronicle/map/MemoryResourcesTest.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/net/openhft/chronicle/map/MemoryResourcesTest.java b/src/test/java/net/openhft/chronicle/map/MemoryResourcesTest.java
index 5b47b87b9..f5d704f99 100644
--- a/src/test/java/net/openhft/chronicle/map/MemoryResourcesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/MemoryResourcesTest.java
@@ -62,8 +62,9 @@ public class MemoryResourcesTest {
         Assert.assertNotEquals(0, NoBytesStore.NO_PAGE);
     }
 
-    @Test(timeout = 60_000)
-    public void testChronicleMapCollectedAndDirectMemoryReleased() throws IOException {
+    @Test
+    public void testChronicleMapCollectedAndDirectMemoryReleased()
+            throws IOException, InterruptedException {
         long nativeMemoryUsedBeforeMap = nativeMemoryUsed();
         WeakReference<ChronicleMap<IntValue, String>> ref = new WeakReference<>(getMap());
         Assert.assertNotNull(ref.get());
@@ -75,11 +76,12 @@ public class MemoryResourcesTest {
             Thread.yield();
         }
         // Wait until Cleaner is called and memory is returned to the system
-        while (nativeMemoryUsedBeforeMap != nativeMemoryUsed()) {
+        for (int i = 0; nativeMemoryUsedBeforeMap != nativeMemoryUsed() && i < 60_000_000; i++) {
             System.gc();
             byte[] garbage = new byte[1_000_000];
-            Thread.yield();
+            Thread.sleep(1);
         }
+        Assert.assertEquals(nativeMemoryUsedBeforeMap, nativeMemoryUsed());
     }
 
     private long nativeMemoryUsed() {