Set junit includes

pom.xml

@@ -16,18 +16,20 @@
     <profile>
       <id>jdk7</id>
       <activation>
-        <jdk>[1.6,1.7)</jdk>
+        <jdk>[1.6,1.8)</jdk>
       </activation>
       <properties>
+        <junitincludes>**/jdk7/*Test.class</junitincludes>
         <javadocparam />
       </properties>
     </profile>
     <profile>
       <id>jdk8</id>
       <activation>
-        <jdk>1.8</jdk>
+        <jdk>[1.8,)</jdk>
       </activation>
       <properties>
+        <junitincludes>**/*Test.class</junitincludes>
         <javadocparam>-Xdoclint:none</javadocparam>
       </properties>
     </profile>
@@ -95,7 +97,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -161,6 +163,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19</version>
+        <configuration>
+          <includes>
+            <include>${junitincludes}</include>
+          </includes>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>

src/test/java/com/spotify/futures/AsyncRetrierTest.java → src/test/java/com/spotify/futures/jdk7/AsyncRetrierTest.java

@@ -14,11 +14,12 @@
  * the License.
  */
 
-package com.spotify.futures;
+package com.spotify.futures.jdk7;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.spotify.futures.AsyncRetrier;
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;

src/test/java/com/spotify/futures/FuturesExtraTest.java → src/test/java/com/spotify/futures/jdk7/FuturesExtraTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.spotify.futures;
+package com.spotify.futures.jdk7;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
@@ -22,7 +22,9 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import com.spotify.futures.FuturesExtra;
 import com.spotify.futures.FuturesExtra.Consumer;
+import com.spotify.futures.Validator;
 import org.junit.Test;
 
 import java.util.Arrays;

src/test/java/com/spotify/futures/JoinedResultsTest.java → src/test/java/com/spotify/futures/jdk7/JoinedResultsTest.java

@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.spotify.futures;
+package com.spotify.futures.jdk7;
 
-import static org.junit.Assert.assertEquals;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.spotify.futures.FuturesExtra;
+import com.spotify.futures.JoinedResults;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.google.common.collect.Lists;
-import org.junit.Test;
-
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
+import static org.junit.Assert.assertEquals;
 
 public class JoinedResultsTest {
   @Test

src/test/java/com/spotify/futures/TimeoutFutureTest.java → src/test/java/com/spotify/futures/jdk7/TimeoutFutureTest.java

@@ -13,10 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.spotify.futures;
+package com.spotify.futures.jdk7;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.spotify.futures.FuturesExtra;
 import org.jmock.lib.concurrent.DeterministicScheduler;
 import org.junit.Before;
 import org.junit.Test;

src/test/java/com/spotify/futures/CompletableFuturesExtraTest.java → src/test/java/com/spotify/futures/jdk8/CompletableFuturesExtraTest.java

@@ -1,16 +1,15 @@
-package com.spotify.futures;
+package com.spotify.futures.jdk8;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import com.spotify.futures.CompletableFuturesExtra;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.Mockito;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -26,26 +25,25 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
 public class CompletableFuturesExtraTest {
 
   @Rule
   public ExpectedException exception = ExpectedException.none();
 
-  @Mock FutureCallback<String> callback;
-
-  private final SettableFuture<String> settable = SettableFuture.create();
-  private final ListenableFuture<String> listenable = settable;
+  FutureCallback<String> callback;
 
   @Before
-  public void setup() {
-    assumeThat(hasCompletableFuture(), is(true));
+  public void setUp() throws Exception {
+    callback = Mockito.mock(FutureCallback.class);
+
   }
 
+  private final SettableFuture<String> settable = SettableFuture.create();
+  private final ListenableFuture<String> listenable = settable;
+
   @Test
   public void testToCompletableFutureUnwrap() {
     final CompletableFuture<String> wrapped = toCompletableFuture(listenable);
@@ -115,15 +113,6 @@ public void testToListenableFutureFailure() throws ExecutionException, Interrupt
     wrapped.get();
   }
 
-  private static boolean hasCompletableFuture() {
-    try {
-      Class.forName("java.util.concurrent.CompletableFuture");
-      return true;
-    } catch (ClassNotFoundException e) {
-      return false;
-    }
-  }
-
   @Test(expected = IllegalArgumentException.class)
   public void testImmediateFailed() throws Exception {
     final CompletionStage<Object> future = CompletableFuturesExtra.exceptionallyCompletedFuture(new IllegalArgumentException());