From cec3a817971f75595e23a729b2af81d61e0cf21c Mon Sep 17 00:00:00 2001
From: Norbert Schneider <norbert.schneider@code-intelligence.com>
Date: Tue, 14 Mar 2023 17:30:27 +0100
Subject: [PATCH] junit: Add transitive dependency on launcher

The transitive dependency on org.junit.platform:junit-platform-launcher
removes the requirement to specify it manually in every project.
---
 .../junit-spring-web/build-and-run-tests.sh   | 35 +++++++++++++++++--
 .../jazzer/junit/BUILD.bazel                  |  6 ++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/examples/junit-spring-web/build-and-run-tests.sh b/examples/junit-spring-web/build-and-run-tests.sh
index 264cea8be..a99028416 100755
--- a/examples/junit-spring-web/build-and-run-tests.sh
+++ b/examples/junit-spring-web/build-and-run-tests.sh
@@ -31,7 +31,6 @@ sed -i "/<artifactId>jazzer-junit<\/artifactId>/ {n;s/<version>.*<\/version>/<ve
 ./mvnw install:install-file -Dfile=../../bazel-bin/deploy/jazzer-project.jar       -DpomFile=../../bazel-bin/deploy/jazzer-pom.xml
 ./mvnw install:install-file -Dfile=../../bazel-bin/deploy/jazzer-api-project.jar   -DpomFile=../../bazel-bin/deploy/jazzer-api-pom.xml
 
-
 ## Regression and unit tests
 echo "[SPRINGBOOT-JUNIT]: These unit and regression fuzz tests should pass"
 ./mvnw test -Dtest="JunitSpringWebApplicationTests#unitTestShouldPass+fuzzTestShouldPass"
@@ -52,7 +51,6 @@ else
   exit 1
 fi
 
-
 ## Fuzz tests
 echo "[SPRINGBOOT-JUNIT]: This fuzz test should pass"
 JAZZER_FUZZ=1 ./mvnw test -Dtest="JunitSpringWebApplicationTests#fuzzTestShouldPass"
@@ -71,4 +69,37 @@ else
   exit 1
 fi
 
+## CLI tests
+## Assert transitive JUnit dependencies are specified
+assertDependency() {
+  if ./mvnw dependency:tree | grep -q "$1"
+  then
+    echo "[SPRINGBOOT-JUNIT]: Found $1 dependency in project"
+  else
+    echo "[SPRINGBOOT-JUNIT]: Did not find $1 dependency in project"
+    exit 1
+  fi
+}
+assertDependency "org.junit.jupiter:junit-jupiter-api"
+assertDependency "org.junit.jupiter:junit-jupiter-params"
+assertDependency "org.junit.platform:junit-platform-launcher"
+
+# Only build project and test jars, no need for a fat-jar or test execution
+./mvnw jar:jar
+./mvnw jar:test-jar
+
+# Extract dependency locations
+out=$(./mvnw dependency:build-classpath -DforceStdout)
+deps=$(echo "$out" | sed '/^\[/d')
+
+# Directly execute Jazzer without Maven
+echo "[SPRINGBOOT-JUNIT]: Direct Jazzer execution of fuzz test should pass"
+java -cp "target/*:${deps}" \
+  com.code_intelligence.jazzer.Jazzer \
+  --target_class=com.example.JunitSpringWebApplicationTests \
+  --target_method=fuzzTestShouldPass \
+  --instrumentation_includes=com.example.* \
+  --custom_hook_includes=com.example.*
+
+
 echo "[SPRINGBOOT-JUNIT]: All tests passed"
diff --git a/src/main/java/com/code_intelligence/jazzer/junit/BUILD.bazel b/src/main/java/com/code_intelligence/jazzer/junit/BUILD.bazel
index bba087da4..68e5c9896 100644
--- a/src/main/java/com/code_intelligence/jazzer/junit/BUILD.bazel
+++ b/src/main/java/com/code_intelligence/jazzer/junit/BUILD.bazel
@@ -29,6 +29,12 @@ java_library(
     visibility = [
         "//examples/junit/src/test/java/com/example:__pkg__",
     ],
+    runtime_deps = [
+        # The JUnit launcher that is part of the Jazzer driver needs this on the classpath
+        # to run an @FuzzTest with JUnit. This will also result in a transitive dependency
+        # in the generated pom file.
+        "@maven//:org_junit_platform_junit_platform_launcher",
+    ],
     deps = [
         ":agent_configurator",
         ":fuzz_test_executor",