Fix messed up test, also cleanup imports

kay · Jan 31, 2019 · 639c6df · 639c6df
1 parent 061fce0
commit 639c6df
Show file tree

Hide file tree

Showing 68 changed files with 371 additions and 352 deletions.
diff --git a/...nchmarks/src/main/java/org/jctools/jmh/throughput/channels/SpscChannelThroughputTest.java b/...nchmarks/src/main/java/org/jctools/jmh/throughput/channels/SpscChannelThroughputTest.java
@@ -13,11 +13,11 @@
  */
 package org.jctools.jmh.throughput.channels;
 
-import org.jctools.channels.Channel;
-import org.jctools.channels.ChannelConsumer;
-import org.jctools.channels.ChannelProducer;
-import org.jctools.channels.ChannelReceiver;
+import org.jctools.channels.*;
 import org.jctools.channels.spsc.SpscChannel;
+import org.jctools.util.PortableJvmInfo;
+import org.jctools.util.Pow2;
+import org.jctools.util.UnsafeDirectByteBuffer;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.infra.Control;
@@ -37,8 +37,9 @@
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @Threads(2)
+@Fork(1)
 @Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
 public class SpscChannelThroughputTest {
 
 	@Param({"32000"})
@@ -61,7 +62,8 @@ public void accept(Ping element) {
                 blackhole.consume(element.getValue());
             }
         };
-        buffer = ByteBuffer.allocateDirect(capacity*(8+1)*3);
+        int requiredBufferSize = OffHeapFixedMessageSizeRingBuffer.getRequiredBufferSize(capacity, PortableJvmInfo.CACHE_LINE_SIZE);
+        buffer = UnsafeDirectByteBuffer.allocateAlignedByteBuffer(requiredBufferSize, PortableJvmInfo.CACHE_LINE_SIZE);
         channel = new SpscChannel<Ping>(buffer, capacity, Ping.class);
         producer = channel.producer();
         consumer = channel.consumer(receiver);

diff --git a/jctools-core/src/test/java/org/jctools/maps/KeyAtomicityTest.java b/jctools-core/src/test/java/org/jctools/maps/KeyAtomicityTest.java
@@ -1,11 +1,11 @@
 package org.jctools.maps;
 
-import org.junit.Test;
-
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class KeyAtomicityTest

diff --git a/jctools-core/src/test/java/org/jctools/maps/NonBlockingHashMapTest.java b/jctools-core/src/test/java/org/jctools/maps/NonBlockingHashMapTest.java
@@ -1,19 +1,20 @@
 package org.jctools.maps;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.collect.testing.*;
 import com.google.common.collect.testing.features.CollectionFeature;
 import com.google.common.collect.testing.features.CollectionSize;
 import com.google.common.collect.testing.features.MapFeature;
 import com.google.common.collect.testing.testers.MapReplaceEntryTester;
 import com.google.common.collect.testing.testers.MapReplaceTester;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author Tolstopyatov Vsevolod
  * @since 04/06/17

diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHMID_Tester2.java b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHMID_Tester2.java
@@ -13,14 +13,15 @@
  */
 package org.jctools.maps.nbhm_test;
 
-import org.jctools.maps.NonBlockingIdentityHashMap;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import org.jctools.maps.NonBlockingIdentityHashMap;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;

diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHML_Tester2.java b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHML_Tester2.java
@@ -13,14 +13,15 @@
  */
 package org.jctools.maps.nbhm_test;
 
-import org.jctools.maps.NonBlockingHashMapLong;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import org.jctools.maps.NonBlockingHashMapLong;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;

diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHM_Tester2.java b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHM_Tester2.java
@@ -13,14 +13,15 @@
  */
 package org.jctools.maps.nbhm_test;
 
-import org.jctools.maps.NonBlockingHashMap;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import org.jctools.maps.NonBlockingHashMap;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;

diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbhs_tester.java b/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbhs_tester.java
@@ -1,12 +1,13 @@
 package org.jctools.maps.nbhs_test;
 
-import org.jctools.maps.NonBlockingHashSet;
+import java.io.*;
+import java.util.Iterator;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.Iterator;
+import org.jctools.maps.NonBlockingHashSet;
 
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;

diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbsi_tester.java b/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbsi_tester.java
@@ -1,12 +1,13 @@
 package org.jctools.maps.nbhs_test;
 
-import org.jctools.maps.NonBlockingSetInt;
+import java.io.*;
+import java.util.Iterator;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.Iterator;
+import org.jctools.maps.NonBlockingSetInt;
 
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTest.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTest.java
@@ -1,19 +1,18 @@
 package org.jctools.queues;
 
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.After;
+import org.junit.Test;
+
 import org.jctools.queues.atomic.AtomicQueueFactory;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
 import org.jctools.queues.spec.Preference;
 import org.jctools.util.Pow2;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Queue;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeThat;
 

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpmcArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpmcArray extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscArray extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscChunked.java
@@ -1,13 +1,14 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscChunked extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscCompound.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscCompound.java
@@ -1,14 +1,14 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.jctools.util.Pow2;
-import org.junit.Ignore;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+import org.jctools.util.Pow2;
 
 import static org.jctools.util.PortableJvmInfo.CPUs;
 

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscGrowable.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscGrowable extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscLinked.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscLinked extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscUnbounded.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscUnbounded.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscUnbounded extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpmcArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpmcArray extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscArray extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscChunked.java
@@ -1,13 +1,14 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscChunked extends MpqSanityTest

diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscGrowable.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscGrowable extends MpqSanityTest