[code healthy] junit 5.x, code cleanup.

w.vela · w.vela · commit d8d95c1c326a · 2017-11-01T17:42:09.000+08:00
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ A local data buffer with customizable data trigger
 <dependency>
     <groupId>com.github.phantomthief</groupId>
     <artifactId>buffer-trigger</artifactId>
-    <version>0.2.8-SNAPSHOT</version>
+    <version>0.2.9-SNAPSHOT</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -8,6 +8,20 @@
         <maven>3.0.4</maven>
     </prerequisites>
 
+    <properties>
+        <junit-jupiter.version>5.0.1</junit-jupiter.version>
+        <logback-classic.version>1.1.8</logback-classic.version>
+        <junit-platform.version>1.0.1</junit-platform.version>
+
+        <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
+        <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+    </properties>
+
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
@@ -58,25 +72,41 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.7</version>
+            <version>${logback-classic.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>${junit-platform.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-jupiter.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -92,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>${maven-source-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -105,7 +135,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>${maven-javadoc-plugin.version}</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
@@ -121,7 +151,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
+                <version>${nexus-staging-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>sonatype-nexus-staging</serverId>
@@ -132,7 +162,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.7.201606060606</version>
+                <version>${jacoco-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -145,7 +175,7 @@
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.2.0</version>
+                <version>${coveralls-maven-plugin.version}</version>
             </plugin>
         </plugins>
     </build>
diff --git a/src/main/java/com/github/phantomthief/collection/BufferTrigger.java b/src/main/java/com/github/phantomthief/collection/BufferTrigger.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.github.phantomthief.collection;
 
 import com.github.phantomthief.collection.impl.BatchConsumeBlockingQueueTrigger;
diff --git a/src/main/java/com/github/phantomthief/collection/impl/BatchConsumeBlockingQueueTrigger.java b/src/main/java/com/github/phantomthief/collection/impl/BatchConsumeBlockingQueueTrigger.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.github.phantomthief.collection.impl;
 
 import static com.github.phantomthief.util.MoreLocks.runWithLock;
diff --git a/src/main/java/com/github/phantomthief/collection/impl/BatchConsumerTriggerBuilder.java b/src/main/java/com/github/phantomthief/collection/impl/BatchConsumerTriggerBuilder.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.github.phantomthief.collection.impl;
 
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/src/main/java/com/github/phantomthief/collection/impl/GenericBatchConsumerTriggerBuilder.java b/src/main/java/com/github/phantomthief/collection/impl/GenericBatchConsumerTriggerBuilder.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.github.phantomthief.collection.impl;
 
 import java.time.Duration;
diff --git a/src/main/java/com/github/phantomthief/collection/impl/GenericSimpleBufferTriggerBuilder.java b/src/main/java/com/github/phantomthief/collection/impl/GenericSimpleBufferTriggerBuilder.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.github.phantomthief.collection.impl;
 
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/src/main/java/com/github/phantomthief/collection/impl/LazyBufferTrigger.java b/src/main/java/com/github/phantomthief/collection/impl/LazyBufferTrigger.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.github.phantomthief.collection.impl;
 
 import static com.github.phantomthief.util.MoreSuppliers.lazy;
diff --git a/src/main/java/com/github/phantomthief/collection/impl/MultiIntervalTriggerStrategy.java b/src/main/java/com/github/phantomthief/collection/impl/MultiIntervalTriggerStrategy.java
@@ -4,6 +4,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.Math.abs;
 import static java.lang.Math.min;
+import static java.lang.System.*;
 
 import java.util.Map.Entry;
 import java.util.SortedMap;
@@ -70,7 +71,7 @@ public TriggerResult canTrigger(long lastConsumeTimestamp, long changedCount) {
 
         boolean doConsumer = false;
 
-        long now = System.currentTimeMillis();
+        long now = currentTimeMillis();
 
         for (Entry<Long, Long> entry : triggerMap.entrySet()) {
             if (now - lastConsumeTimestamp < entry.getKey()) {
diff --git a/src/main/java/com/github/phantomthief/collection/impl/SimpleBufferTrigger.java b/src/main/java/com/github/phantomthief/collection/impl/SimpleBufferTrigger.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package com.github.phantomthief.collection.impl;
 
 import static java.lang.System.currentTimeMillis;
diff --git a/src/main/java/com/github/phantomthief/collection/impl/SimpleBufferTriggerBuilder.java b/src/main/java/com/github/phantomthief/collection/impl/SimpleBufferTriggerBuilder.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.github.phantomthief.collection.impl;
 
 import static com.github.phantomthief.collection.impl.SimpleBufferTrigger.TriggerResult.empty;
diff --git a/src/test/java/com/github/phantomthief/collection/impl/MultiIntervalTriggerStrategyTest.java b/src/test/java/com/github/phantomthief/collection/impl/MultiIntervalTriggerStrategyTest.java
@@ -2,18 +2,18 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author w.vela
  * Created on 05/08/2016.
  */
-public class MultiIntervalTriggerStrategyTest {
+class MultiIntervalTriggerStrategyTest {
 
     @Test
-    public void test() {
+    void test() {
         MultiIntervalTriggerStrategy multiIntervalTriggerStrategy = new MultiIntervalTriggerStrategy();
         multiIntervalTriggerStrategy.on(5, SECONDS, 10);
         multiIntervalTriggerStrategy.on(6, SECONDS, 8);
diff --git a/src/test/java/com/github/phantomthief/test/ConflictReadWriteTest.java b/src/test/java/com/github/phantomthief/test/ConflictReadWriteTest.java
@@ -1,36 +1,34 @@
 package com.github.phantomthief.test;
 
+import static com.google.common.util.concurrent.MoreExecutors.shutdownAndAwaitTermination;
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.phantomthief.collection.BufferTrigger;
 import com.github.phantomthief.collection.impl.SimpleBufferTrigger;
-import com.google.common.util.concurrent.MoreExecutors;
 
 /**
  * @author w.vela
  * Created on 16/5/7.
  */
-public class ConflictReadWriteTest {
+class ConflictReadWriteTest {
 
     private final Map<Object, AtomicInteger> counter = new IdentityHashMap<>();
 
-    @Ignore
     @Test
-    public void test() {
+    void test() {
         Random random = new Random();
         BufferTrigger<Integer> bufferTrigger = SimpleBufferTrigger
                 .<Integer, AtomicInteger> newGenericBuilder().on(5, SECONDS, 1) //
@@ -66,10 +64,10 @@ public void test() {
                             "end consume:" + container.hashCode() + ", size:" + container.get());
                 }) //
                 .build();
-        ExecutorService executorService = Executors.newFixedThreadPool(20);
+        ExecutorService executorService = newFixedThreadPool(20);
         for (int i = 0; i < 100000; i++) {
             executorService.execute(() -> bufferTrigger.enqueue(1));
         }
-        MoreExecutors.shutdownAndAwaitTermination(executorService, 1, DAYS);
+        shutdownAndAwaitTermination(executorService, 1, DAYS);
     }
 }
diff --git a/src/test/java/com/github/phantomthief/test/LongConsumerTest.java b/src/test/java/com/github/phantomthief/test/LongConsumerTest.java
@@ -5,11 +5,11 @@
 import static java.lang.System.out;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.phantomthief.collection.BufferTrigger;
 import com.github.phantomthief.collection.impl.SimpleBufferTrigger;
@@ -18,10 +18,10 @@
  * @author w.vela
  * Created on 09/08/2016.
  */
-public class LongConsumerTest {
+class LongConsumerTest {
 
     @Test
-    public void testShort() {
+    void testShort() {
         AtomicInteger counter = new AtomicInteger();
         BufferTrigger<Long> bufferTrigger = SimpleBufferTrigger.newBuilder() //
                 .interval(1, SECONDS) //
@@ -41,7 +41,7 @@ public void testShort() {
     }
 
     @Test
-    public void testLong() {
+    void testLong() {
         AtomicInteger counter = new AtomicInteger();
         BufferTrigger<Long> bufferTrigger = SimpleBufferTrigger.newBuilder() //
                 .interval(1, SECONDS) //
diff --git a/src/test/java/com/github/phantomthief/test/MultiIntervalTriggerTest.java b/src/test/java/com/github/phantomthief/test/MultiIntervalTriggerTest.java
@@ -2,14 +2,13 @@
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.phantomthief.collection.BufferTrigger;
 import com.github.phantomthief.collection.impl.MultiIntervalTriggerStrategy;
@@ -20,10 +19,10 @@
  * @author w.vela
  * Created on 15/07/2016.
  */
-public class MultiIntervalTriggerTest {
+class MultiIntervalTriggerTest {
 
     @Test
-    public void test() {
+    void test() {
         AtomicInteger assertSize = new AtomicInteger();
         BufferTrigger<Integer> bufferTrigger = SimpleBufferTrigger
                 .<Integer, Set<Interner>> newGenericBuilder() //
@@ -52,19 +51,14 @@ public void test() {
     }
 
     @Test
-    public void testInvalidBuild() {
-        try {
-            SimpleBufferTrigger.<Integer, Set<Interner>> newGenericBuilder() //
-                    .triggerStrategy(new MultiIntervalTriggerStrategy() //
-                            .on(1, SECONDS, 1) //
-                            .on(2, SECONDS, 2) //
-                    ) //
-                    .consumer(set -> System.out.println("size:" + set.size())) //
-                    .build();
-            fail();
-        } catch (IllegalArgumentException e) {
-            assertTrue(true);
-        }
+    void testInvalidBuild() {
+        assertThrows(IllegalArgumentException.class,
+                () -> SimpleBufferTrigger.<Integer, Set<Interner>> newGenericBuilder() //
+                        .triggerStrategy(new MultiIntervalTriggerStrategy() //
+                                .on(1, SECONDS, 1) //
+                                .on(2, SECONDS, 2) //
+                        ).consumer(set -> System.out.println("size:" + set.size())) //
+                        .build());
     }
 
     private void enqueue(BufferTrigger<Integer> trigger, int size) {
diff --git a/src/test/java/com/github/phantomthief/test/MultiThreadBufferTriggerTest.java b/src/test/java/com/github/phantomthief/test/MultiThreadBufferTriggerTest.java
diff --git a/src/test/java/com/github/phantomthief/test/MultiThreadQueueTriggerTest.java b/src/test/java/com/github/phantomthief/test/MultiThreadQueueTriggerTest.java
diff --git a/src/test/java/com/github/phantomthief/test/TickerBatchInvokerTest.java b/src/test/java/com/github/phantomthief/test/TickerBatchInvokerTest.java
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml

-Original file line number
+Diff line change
@@ @@ -1,6 +1,3 @@ @@
 -/**
 - *
 - */
 package com.github.phantomthief.collection;
 import com.github.phantomthief.collection.impl.BatchConsumeBlockingQueueTrigger;