Merge remote-tracking branch 'origin/master'

src/test/java/eg/BigData.java

@@ -20,7 +20,6 @@ package eg;
 
 import net.openhft.affinity.AffinitySupport;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
-import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.lang.io.Bytes;
 
 import java.io.*;

src/test/java/eg/TestMain.java

@@ -1,7 +1,5 @@
 package eg;
 
-import com.sun.tools.internal.xjc.generator.bean.BeanGenerator;
-
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;

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

@@ -4,10 +4,8 @@ import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
-import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.values.LongValue;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;

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

@@ -1613,7 +1613,7 @@ public class ChronicleMapTest {
     }
 
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testPutLongValue() throws IOException {
         final ChronicleMapBuilder<CharSequence, LongValue> builder = ChronicleMapBuilder
                 .of(CharSequence.class, LongValue.class)
@@ -1623,7 +1623,14 @@ public class ChronicleMapTest {
         final ChronicleMap<CharSequence, LongValue> map = builder.create();
 
         LongValue value = nativeLongValue();
-        map.put("x", value);
+        try {
+            map.put("x", value);
+        } catch (IllegalStateException | NullPointerException e) {
+            // ok
+            return;
+        }
+        throw new AssertionError("Should throw either IllegalStateException or " +
+                "NullPointerException, but succeed");
     }
 
     @Test

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

@@ -19,7 +19,6 @@
 package net.openhft.chronicle.map;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.*;

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

@@ -18,8 +18,8 @@
 
 package net.openhft.chronicle.map;
 
- import org.junit.Assert;
 import net.openhft.lang.Jvm;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;

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

@@ -5,12 +5,17 @@ import net.openhft.lang.io.ByteBufferBytes;
 import net.openhft.lang.model.Byteable;
 import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.values.IntValue;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.Random;
+import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;

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

@@ -6,7 +6,10 @@ import net.openhft.lang.io.ByteBufferBytes;
 import net.openhft.lang.model.Byteable;
 import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.values.IntValue;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mockito;
 
 import java.io.Closeable;

src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface$$Heap.java

@@ -16,14 +16,13 @@
 
 package net.openhft.chronicle.map.fromdocs;
 
-import static net.openhft.lang.Compare.*;
-import java.io.IOException;
-import net.openhft.chronicle.map.fromdocs.BondVOInterface;
-import net.openhft.chronicle.map.fromdocs.BondVOInterface.MarketPx;
 import net.openhft.lang.io.Bytes;
 import net.openhft.lang.io.serialization.BytesMarshallable;
 import net.openhft.lang.model.Copyable;
 
+import static net.openhft.lang.Compare.calcLongHashCode;
+import static net.openhft.lang.Compare.isEqual;
+
 public class BondVOInterface$$Heap implements BondVOInterface, BytesMarshallable, Copyable<net.openhft.chronicle.map.fromdocs.BondVOInterface>  {
     private double _coupon;
     private long _issueDate;

src/test/java/net/openhft/chronicle/map/fromdocs/BondVOInterface$MarketPx$$Heap.java

@@ -16,13 +16,14 @@
 
 package net.openhft.chronicle.map.fromdocs;
 
-import static net.openhft.lang.Compare.*;
-import java.io.IOException;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface.MarketPx;
 import net.openhft.lang.io.Bytes;
 import net.openhft.lang.io.serialization.BytesMarshallable;
 import net.openhft.lang.model.Copyable;
 
+import static net.openhft.lang.Compare.calcLongHashCode;
+import static net.openhft.lang.Compare.isEqual;
+
 public class BondVOInterface$MarketPx$$Heap implements MarketPx, BytesMarshallable, Copyable<net.openhft.chronicle.map.fromdocs.BondVOInterface.MarketPx>  {
     private double _askPx;
     private double _bidPx;