From fc27e6b5ae7cc3279aa14160ff05dc3eea7863d4 Mon Sep 17 00:00:00 2001 From: Andrew Kent Date: Sun, 8 Apr 2018 10:10:12 -0700 Subject: [PATCH] Revert "Move play2.6 tests out of subproject and into sourceSet" This reverts commit 2a42f7dc7d5035efcc35fa0cfde0665396943990. --- .../instrumentation/play-2.4/play-2.4.gradle | 32 ------------------- .../play-2.6-testing/play-2.6-testing.gradle | 27 ++++++++++++++++ .../src/test}/groovy/Play26Test.groovy | 0 .../src/test}/scala/Play26TestUtils.scala | 0 settings.gradle | 1 + 5 files changed, 28 insertions(+), 32 deletions(-) create mode 100644 dd-java-agent/instrumentation/play-2.4/play-2.6-testing/play-2.6-testing.gradle rename dd-java-agent/instrumentation/play-2.4/{src/play26Test => play-2.6-testing/src/test}/groovy/Play26Test.groovy (100%) rename dd-java-agent/instrumentation/play-2.4/{src/play26Test => play-2.6-testing/src/test}/scala/Play26TestUtils.scala (100%) diff --git a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle index 74938a91e4..0549ddc228 100644 --- a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle +++ b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle @@ -1,28 +1,6 @@ -plugins { - id 'org.unbroken-dome.test-sets' version '1.4.4' -} apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/test-with-scala.gradle" -testSets { - play26Test -} - -compilePlay26TestGroovy { - classpath = classpath.plus(files(compilePlay26TestScala.destinationDir)) - dependsOn compilePlay26TestScala -} - -if (JavaVersion.current().isJava9Compatible()) { - // required to allow reflection into java9 for testing - play26Test { - jvmArgs '--add-opens' - jvmArgs 'java.base/jdk.internal.loader=ALL-UNNAMED' - } -} - -test.dependsOn play26Test - dependencies { compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0' @@ -39,16 +17,6 @@ dependencies { testCompile project(':dd-java-agent:instrumentation:java-concurrent') testCompile project(':dd-java-agent:instrumentation:trace-annotation') testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' - - - play26TestCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12' - play26TestCompile project(':dd-java-agent:instrumentation:play-2.4') - play26TestCompile group: 'com.typesafe.play', name: 'play_2.11', version: '2.6.0' - play26TestCompile group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.6.0' - play26TestCompile project(':dd-java-agent:testing') - play26TestCompile project(':dd-java-agent:instrumentation:java-concurrent') - play26TestCompile project(':dd-java-agent:instrumentation:trace-annotation') - play26TestCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' } test { diff --git a/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/play-2.6-testing.gradle b/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/play-2.6-testing.gradle new file mode 100644 index 0000000000..b5d93214f8 --- /dev/null +++ b/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/play-2.6-testing.gradle @@ -0,0 +1,27 @@ +apply from: "${rootDir}/gradle/java.gradle" +apply from: "${rootDir}/gradle/test-with-scala.gradle" + +dependencies { + compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.6.0' + + compile project(':dd-trace-api') + compile project(':dd-java-agent:agent-tooling') + compile deps.bytebuddy + compile deps.opentracing + compile deps.autoservice + + testCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12' + testCompile project(':dd-java-agent:instrumentation:play-2.4') + testCompile group: 'com.typesafe.play', name: 'play_2.11', version: '2.6.0' + testCompile group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.6.0' + testCompile project(':dd-java-agent:testing') + testCompile project(':dd-java-agent:instrumentation:java-concurrent') + testCompile project(':dd-java-agent:instrumentation:trace-annotation') + testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' +} + +test { + if (!JavaVersion.current().isJava8Compatible()) { + exclude '*Play*Test*' + } +} diff --git a/dd-java-agent/instrumentation/play-2.4/src/play26Test/groovy/Play26Test.groovy b/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/play-2.4/src/play26Test/groovy/Play26Test.groovy rename to dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy diff --git a/dd-java-agent/instrumentation/play-2.4/src/play26Test/scala/Play26TestUtils.scala b/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/scala/Play26TestUtils.scala similarity index 100% rename from dd-java-agent/instrumentation/play-2.4/src/play26Test/scala/Play26TestUtils.scala rename to dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/scala/Play26TestUtils.scala diff --git a/settings.gradle b/settings.gradle index 57a89e56e2..d04949daa8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -39,6 +39,7 @@ include ':dd-java-agent:instrumentation:trace-annotation' if (JavaVersion.current().isJava8Compatible()) { // java 8 only instrumentation include ':dd-java-agent:instrumentation:play-2.4' + include ':dd-java-agent:instrumentation:play-2.4:play-2.6-testing' // benchmark include ':dd-java-agent:benchmark'