Exclude tests where TestPlan is empty

surefire-junit5/src/main/java/org/junit/gen5/surefire/JUnitGen5Provider.java

@@ -48,21 +48,27 @@ public RunResult invoke(Object forkTestSet)
 			throw new UnsupportedOperationException("Not yet supported.");
 		}
 
-		TestsToRun testsToRun = scanClasspath();
-		return invoke(testsToRun);
+		Launcher launcher = new Launcher();
+		TestsToRun testsToRun = scanClasspath(launcher);
+		return invokeAllTests(testsToRun, launcher);
 	}
 
-	private RunResult invoke(TestsToRun testsToRun) {
+	private TestsToRun scanClasspath(Launcher launcher) {
+		TestsToRun scannedClasses = parameters.getScanResult().applyFilter(new TestPlanScannerFilter(launcher),
+			parameters.getTestClassLoader());
+		TestsToRun orderedClasses = parameters.getRunOrderCalculator().orderTestClasses(scannedClasses);
+		return orderedClasses;
+	}
+
+	private RunResult invokeAllTests(TestsToRun testsToRun, Launcher launcher) {
 		RunResult runResult;
 		ReporterFactory reporterFactory = parameters.getReporterFactory();
 		try {
 			RunListener runListener = reporterFactory.createReporter();
-
-			Launcher launcher = new Launcher();
 			launcher.registerTestPlanExecutionListeners(new RunListenerAdapter(runListener));
 
 			for (Class<?> testClass : testsToRun) {
-				invoke(testClass, launcher, runListener);
+				invokeSingleClass(testClass, launcher, runListener);
 			}
 		}
 		finally {
@@ -71,14 +77,7 @@ private RunResult invoke(TestsToRun testsToRun) {
 		return runResult;
 	}
 
-	private TestsToRun scanClasspath() {
-		TestsToRun scannedClasses = parameters.getScanResult().applyFilter(new AcceptAllClassesScannerFilter(),
-			parameters.getTestClassLoader());
-		TestsToRun orderedClasses = parameters.getRunOrderCalculator().orderTestClasses(scannedClasses);
-		return orderedClasses;
-	}
-
-	private void invoke(Class<?> testClass, Launcher launcher, RunListener runListener) {
+	private void invokeSingleClass(Class<?> testClass, Launcher launcher, RunListener runListener) {
 		SimpleReportEntry classEntry = new SimpleReportEntry(getClass().getName(), testClass.getName());
 		runListener.testSetStarting(classEntry);
 

surefire-junit5/src/main/java/org/junit/gen5/surefire/TestPlanScannerFilter.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.junit.gen5.surefire;
+
+import static org.junit.gen5.engine.TestPlanSpecification.build;
+
+import org.apache.maven.surefire.util.ScannerFilter;
+import org.junit.gen5.engine.TestPlanSpecification;
+import org.junit.gen5.launcher.Launcher;
+import org.junit.gen5.launcher.TestPlan;
+
+final class TestPlanScannerFilter implements ScannerFilter {
+
+	private final Launcher launcher;
+
+	public TestPlanScannerFilter(Launcher launcher) {
+		this.launcher = launcher;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public boolean accept(Class testClass) {
+		TestPlanSpecification specification = build(TestPlanSpecification.forClass(testClass));
+		TestPlan testPlan = launcher.discover(specification);
+		return testPlan.hasTests();
+	}
+}