Remove java agent from test run classpath

Author: bantonsson

src/main/scala/com/lightbend/sbt/javaagent/JavaAgent.scala

@@ -64,7 +64,8 @@ object JavaAgent extends AutoPlugin {
     fork in run := enableFork(fork in run, _.scope.run).value,
     fork in Test := enableFork(fork in Test, _.scope.test).value,
     javaOptions in run ++= agentOptions(_.agent.scope.run).value,
-    javaOptions in Test ++= agentOptions(_.agent.scope.test).value
+    javaOptions in Test ++= agentOptions(_.agent.scope.test).value,
+    fullClasspath in Test := filterAgents((fullClasspath in Test).value, resolvedJavaAgents.value)
   )
 
   private def resolveAgents = Def.task[Seq[ResolvedAgent]] {
@@ -93,4 +94,8 @@ object JavaAgent extends AutoPlugin {
     }
   }
 
+  def filterAgents(classpath: Classpath, resolvedAgents: Seq[ResolvedAgent]): Classpath = {
+    val agents = resolvedAgents.map(resolved => resolved.artifact.absolutePath)
+    classpath.filter(aFile => !agents.contains(aFile.data.getAbsolutePath))
+  }
 }

src/sbt-test/agent/compile/test

@@ -4,3 +4,4 @@
 > check-log
 > stage
 > check-dist
+> check-test-and-run-paths

src/sbt-test/agent/compile/test.sbt

@@ -19,3 +19,18 @@ TaskKey[Unit]("check-dist") := {
   expect("dist run", output, "Agent 86")
   expect("dist run", output, "class maxwell.Maxwell")
 }
+
+TaskKey[Unit]("check-test-and-run-paths") := {
+  assert(
+    !((dependencyClasspath in Runtime).value exists (f => f.data.name.contains("maxwell"))),
+    "maxwell test agent is available on the runtime class path"
+  )
+  assert(
+    (dependencyClasspath in Test).value exists (f => f.data.name.contains("maxwell")),
+    "maxwell test agent is not available on the test compile class path"
+  )
+  assert(
+    !((fullClasspath in Test).value exists (f => f.data.name.contains("maxwell"))),
+    "maxwell test agent is available on the test run class path"
+  )
+}

src/sbt-test/agent/test/test.sbt

@@ -9,6 +9,11 @@ TaskKey[Unit]("check") := {
     "javaOptions in Test do not contain 'maxwell' agent"
   )
 
+  assert(
+    !((fullClasspath in Test).value exists (f => f.data.name.contains("maxwell"))),
+    "maxwell test agent is available on the test run class path"
+  )
+
   val testLog = IO.read(BuiltinCommands.lastLogFile(state.value).get)
 
   assert(