From 6a09f6e2b9e65bd11cd383bfab8ce7a0d9fad53f Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 3 Jan 2019 15:04:52 -0800 Subject: [PATCH] Moves all ittests to be tests under dd-java-agent. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was weird having it as a separate project. Reduces the number of top level directories. There weren’t any existing tests in dd-java-agent’s test directory, so this seemed like a good place to put them. --- .../dd-java-agent-ittests.gradle | 56 ------------------- .../src/test/resources/logback.xml | 16 ------ dd-java-agent/dd-java-agent.gradle | 48 +++++++++++++++- .../trace/agent/CustomLogManagerTest.groovy | 0 .../datadog/trace/agent/DDInfoTest.groovy | 0 .../datadog/trace/agent/JMXFetchTest.groovy | 0 .../classloading/ClassLoadingTest.groovy | 0 .../ShadowPackageRenamingTest.groovy | 0 .../muzzle/MuzzleBytecodeTransformTest.groovy | 0 .../java/datadog/test/ClassToInstrument.java | 0 .../datadog/test/ClassToInstrumentChild.java | 0 .../MongoAsyncClientInstrumentationTest.java | 0 .../MongoClientInstrumentationTest.java | 0 .../OkHTTPInstrumentationTest.java | 0 .../agent/test/IntegrationTestUtils.java | 0 .../jvmbootstraptest/CustomLogManager.java | 0 .../jvmbootstraptest/LogManagerSetter.java | 0 settings.gradle | 1 - 18 files changed, 46 insertions(+), 75 deletions(-) delete mode 100644 dd-java-agent-ittests/dd-java-agent-ittests.gradle delete mode 100644 dd-java-agent-ittests/src/test/resources/logback.xml rename {dd-java-agent-ittests => dd-java-agent}/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/groovy/datadog/trace/agent/DDInfoTest.groovy (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/groovy/datadog/trace/agent/integration/muzzle/MuzzleBytecodeTransformTest.groovy (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/datadog/test/ClassToInstrument.java (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/datadog/test/ClassToInstrumentChild.java (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/jvmbootstraptest/CustomLogManager.java (100%) rename {dd-java-agent-ittests => dd-java-agent}/src/test/java/jvmbootstraptest/LogManagerSetter.java (100%) diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle deleted file mode 100644 index 4f2c031dbc..0000000000 --- a/dd-java-agent-ittests/dd-java-agent-ittests.gradle +++ /dev/null @@ -1,56 +0,0 @@ -// Set properties before any plugins get loaded -project.ext { - // Execute tests on all JVMs, even rare and outdated ones - integrationTests = true -} - -apply from: "${rootDir}/gradle/java.gradle" - -description = 'dd-java-agent-ittests' - -evaluationDependsOn(':dd-java-agent:agent-tooling') -compileTestJava.dependsOn tasks.getByPath(':dd-java-agent:agent-tooling:testClasses') - -dependencies { - testCompile project(':dd-trace-api') - testCompile project(':dd-trace-ot') - - testCompile deps.opentracingMock - testCompile deps.testLogging - testCompile deps.guava - testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+' - testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0' - - testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' - testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2' - // run embeded mongodb for integration testing - testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5' - - testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3' - testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' -} - -tasks.withType(Test) { - jvmArgs "-Ddd.writer.type=LogWriter", "-Ddd.service.name=java-app" - jvmArgs "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug" - jvmArgs "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug" - - doFirst { - // Defining here to allow jacoco to be first on the command line. - jvmArgs "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}" - } - - testLogging { - events "started" - } - - if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) { - exclude 'datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.class' - } - - dependsOn project(':dd-java-agent').shadowJar -} - -parent.subprojects.collect { it.tasks.withType(Test) } each { - test.shouldRunAfter it -} diff --git a/dd-java-agent-ittests/src/test/resources/logback.xml b/dd-java-agent-ittests/src/test/resources/logback.xml deleted file mode 100644 index 75a1c06e16..0000000000 --- a/dd-java-agent-ittests/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle index c770668d38..7693176618 100644 --- a/dd-java-agent/dd-java-agent.gradle +++ b/dd-java-agent/dd-java-agent.gradle @@ -2,13 +2,17 @@ plugins { id "com.github.johnrengelman.shadow" version "4.0.1" } +// Set properties before any plugins get loaded +project.ext { + // Execute tests on all JVMs, even rare and outdated ones + integrationTests = true +} + description = 'dd-java-agent' apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/publish.gradle" -jacocoTestReport.dependsOn ':dd-java-agent-ittests:test' - /* * Include subproject's shadowJar in the dd-java-agent jar. * Note jarname must end in .zip, or its classes will be on the classpath of @@ -84,3 +88,43 @@ shadowJar { modifyPom { dependencies.removeAll { true } } + +dependencies { + testCompile project(':dd-trace-api') + testCompile project(':dd-trace-ot') + + testCompile deps.opentracingMock + testCompile deps.testLogging + testCompile deps.guava + testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+' + testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0' + + testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' + testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2' + // run embeded mongodb for integration testing + testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5' + + testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3' + testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' +} + +tasks.withType(Test) { + jvmArgs "-Ddd.writer.type=LogWriter", "-Ddd.service.name=java-app" + jvmArgs "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug" + jvmArgs "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug" + + doFirst { + // Defining here to allow jacoco to be first on the command line. + jvmArgs "-javaagent:${shadowJar.archivePath}" + } + + testLogging { + events "started" + } + + if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) { + exclude 'datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.class' + } + + dependsOn shadowJar +} diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy similarity index 100% rename from dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy rename to dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/DDInfoTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/DDInfoTest.groovy similarity index 100% rename from dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/DDInfoTest.groovy rename to dd-java-agent/src/test/groovy/datadog/trace/agent/DDInfoTest.groovy diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy similarity index 100% rename from dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy rename to dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy similarity index 100% rename from dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy rename to dd-java-agent/src/test/groovy/datadog/trace/agent/integration/classloading/ClassLoadingTest.groovy diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy similarity index 100% rename from dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy rename to dd-java-agent/src/test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/muzzle/MuzzleBytecodeTransformTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/integration/muzzle/MuzzleBytecodeTransformTest.groovy similarity index 100% rename from dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/muzzle/MuzzleBytecodeTransformTest.groovy rename to dd-java-agent/src/test/groovy/datadog/trace/agent/integration/muzzle/MuzzleBytecodeTransformTest.groovy diff --git a/dd-java-agent-ittests/src/test/java/datadog/test/ClassToInstrument.java b/dd-java-agent/src/test/java/datadog/test/ClassToInstrument.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/datadog/test/ClassToInstrument.java rename to dd-java-agent/src/test/java/datadog/test/ClassToInstrument.java diff --git a/dd-java-agent-ittests/src/test/java/datadog/test/ClassToInstrumentChild.java b/dd-java-agent/src/test/java/datadog/test/ClassToInstrumentChild.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/datadog/test/ClassToInstrumentChild.java rename to dd-java-agent/src/test/java/datadog/test/ClassToInstrumentChild.java diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java b/dd-java-agent/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java rename to dd-java-agent/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java b/dd-java-agent/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java rename to dd-java-agent/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java b/dd-java-agent/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java rename to dd-java-agent/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java b/dd-java-agent/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java rename to dd-java-agent/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java diff --git a/dd-java-agent-ittests/src/test/java/jvmbootstraptest/CustomLogManager.java b/dd-java-agent/src/test/java/jvmbootstraptest/CustomLogManager.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/jvmbootstraptest/CustomLogManager.java rename to dd-java-agent/src/test/java/jvmbootstraptest/CustomLogManager.java diff --git a/dd-java-agent-ittests/src/test/java/jvmbootstraptest/LogManagerSetter.java b/dd-java-agent/src/test/java/jvmbootstraptest/LogManagerSetter.java similarity index 100% rename from dd-java-agent-ittests/src/test/java/jvmbootstraptest/LogManagerSetter.java rename to dd-java-agent/src/test/java/jvmbootstraptest/LogManagerSetter.java diff --git a/settings.gradle b/settings.gradle index a929ca2413..1784c11142 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,7 +16,6 @@ include ':dd-java-agent:agent-jmxfetch' // misc include ':dd-java-agent:testing' -include ':dd-java-agent-ittests' // instrumentation: include ':dd-java-agent:instrumentation:akka-http-10.0'