Merge remote-tracking branch 'origin/master'

src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java

@@ -64,7 +64,7 @@ public class CHMUseCasesTest {
 
 
     private static class PrefixStingFunction implements Function<String, String> {
-        private String prefix;
+        private final String prefix;
 
         public PrefixStingFunction(@NotNull String prefix) {
             this.prefix = prefix;
@@ -74,6 +74,17 @@ public class CHMUseCasesTest {
         public String apply(String s) {
             return prefix + s;
         }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof PrefixStingFunction &&
+                    prefix.equals(((PrefixStingFunction) obj).prefix);
+        }
+
+        @Override
+        public String toString() {
+            return prefix;
+        }
     }
 
 
@@ -98,7 +109,6 @@ public class CHMUseCasesTest {
     }
 
 
-    @Ignore("HCOLL-257 Object serialization is failing when calling writeObject() / readObject()")
     @Test
     public void testPrefixStingFunctionSerialization() throws ExecutionException,
             InterruptedException, IOException {
@@ -114,7 +124,6 @@ public class CHMUseCasesTest {
 
     }
 
-    @Ignore("HCOLL-257 Object serialization is failing when calling writeObject() / readObject()")
     @Test
     public void testStringStringMap() throws ExecutionException, InterruptedException, IOException {
 

src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java

@@ -735,8 +735,7 @@ public class ChronicleMapTest {
                     .of(LongValue.class, LongValue.class)
                     .entries(entries)
                     .entryAndValueAlignment(OF_8_BYTES)
-                    .actualSegments(8 * 1024)
-                    .entrySize(16);
+                    .actualSegments(8 * 1024);
 
             File tmpFile = File.createTempFile("testAcquirePerf", ".deleteme");
             tmpFile.deleteOnExit();

src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java

@@ -60,6 +60,7 @@ public class EntryCountMapTest {
         return mapBuilder.createPersistedTo(getPersistenceFile());
     }
 
+    @Ignore("HCOLL-251 Investigate test failure of net.openhft.chronicle.map.EntryCountMapTest")
     @Test
     public void testVerySmall() throws Exception {
         for (int t = 0; t < 5; t++) {
@@ -108,6 +109,7 @@ public class EntryCountMapTest {
         System.out.printf("Score: %.2f%n", scoreCount / score);
     }
 
+    @Ignore("HCOLL-251 Investigate test failure of net.openhft.chronicle.map.EntryCountMapTest")
     @Test
     public void testSmall() throws Exception {
         for (int i = 0; i < 5; i++) {