From 21fbfe6724fc537e01b9cbe3f25628d211af8149 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 13 Dec 2019 11:29:20 +0100
Subject: [PATCH] Add checkTestsHaveRun task to check tests have run (#28350)

Extend JUnitSuite to make sure the test is included in the report.

After merging this, nothing would happen. We should then invoke
`checkTestsHaveRun` from the jenkins nightly builds. That should then
fail the build until we merge #28347 and switch the nightly builds
to run on JDK11.
---
 .../javadsl/JavaFlowSupportCompileTest.java      |  4 +++-
 project/TestExtras.scala                         | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/akka-stream-tests/src/test/java-jdk9-only/akka/stream/javadsl/JavaFlowSupportCompileTest.java b/akka-stream-tests/src/test/java-jdk9-only/akka/stream/javadsl/JavaFlowSupportCompileTest.java
index 3e1d70203f..53dc11db6c 100644
--- a/akka-stream-tests/src/test/java-jdk9-only/akka/stream/javadsl/JavaFlowSupportCompileTest.java
+++ b/akka-stream-tests/src/test/java-jdk9-only/akka/stream/javadsl/JavaFlowSupportCompileTest.java
@@ -10,7 +10,9 @@ import org.junit.Test;
 
 import java.util.concurrent.Flow;
 
-public class JavaFlowSupportCompileTest {
+import org.scalatest.junit.JUnitSuite;
+
+public class JavaFlowSupportCompileTest extends JUnitSuite {
   @Test
   public void shouldCompile() throws Exception {
     final Flow.Processor<String,String> processor = new Flow.Processor<String, String>() {
diff --git a/project/TestExtras.scala b/project/TestExtras.scala
index 5f084b1f23..409030ef1e 100644
--- a/project/TestExtras.scala
+++ b/project/TestExtras.scala
@@ -14,6 +14,8 @@ object TestExtras {
       val excludeTestNames = settingKey[Set[String]]("Names of tests to be excluded. Not supported by MultiJVM tests. Example usage: -Dakka.test.names.exclude=TimingSpec")
       val excludeTestTags = settingKey[Set[String]]("Tags of tests to be excluded. It will not be used if you specify -Dakka.test.tags.only. Example usage: -Dakka.test.tags.exclude=long-running")
       val onlyTestTags = settingKey[Set[String]]("Tags of tests to be ran. Example usage: -Dakka.test.tags.only=long-running")
+
+      val checkTestsHaveRun = taskKey[Unit]("Verify a number of notable tests have actually run");
     }
 
     import Keys._
@@ -46,7 +48,19 @@ object TestExtras {
         testOptions in Test ++= {
           val tags = onlyTestTags.value
           if (tags.isEmpty) Seq.empty else Seq(Tests.Argument("-n", tags.mkString(" ")))
-        })
+        },
+
+        checkTestsHaveRun := {
+          require(
+            file("akka-stream-tests/target/test-reports/TEST-akka.stream.scaladsl.FlowPublisherSinkSpec.xml").exists,
+            "The jdk9-only FlowPublisherSinkSpec.scala should be run as part of the build"
+          )
+          require(
+            file("akka-stream-tests/target/test-reports/TEST-akka.stream.javadsl.JavaFlowSupportCompileTest.xml").exists,
+            "The jdk9-only JavaFlowSupportCompileTest.java should be run as part of the build"
+          )
+        }
+      )
     }
 
     def containsOrNotExcludesTag(tag: String) = {