Skip to content

Commit 6bbe053

Browse files
Fixed tests in buildSrc folder. (#10021)
* Fixed CallSiteInstrumentationPluginTest by fixing test `build.gradle` and copy jar file to test build path. * Fixed InstrumentPluginTest by addin missing `instrumentPluginClasspath` config to the test `build.gradle` * Introduced `check_build_src` job to run test in `buildSrc` folder on CI.
1 parent 591ad7c commit 6bbe053

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

.gitlab-ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,11 @@ test_published_artifacts:
435435
- scheduler_failure
436436
- data_integrity_failure
437437

438+
check_build_src:
439+
extends: .check_job
440+
variables:
441+
GRADLE_TARGET: ":buildSrc:build"
442+
438443
check_base:
439444
extends: .check_job
440445
variables:

buildSrc/src/main/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationExtension.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ abstract class CallSiteInstrumentationExtension @Inject constructor(
5050
*/
5151
val reporters: ListProperty<String> = objectFactory.listProperty<String>().convention(
5252
listOf(
53+
CALL_SITE_CONSOLE_REPORTER,
5354
CALL_SITE_ERROR_CONSOLE_REPORTER
5455
)
5556
)

buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import java.nio.file.Files
12
import org.gradle.testkit.runner.BuildResult
23
import org.gradle.testkit.runner.GradleRunner
34
import org.gradle.testkit.runner.UnexpectedBuildFailure
@@ -10,15 +11,14 @@ class CallSiteInstrumentationPluginTest extends Specification {
1011
plugins {
1112
id 'java'
1213
id 'call-site-instrumentation'
13-
id 'com.diffplug.spotless' version '6.13.0'
1414
}
1515
1616
sourceCompatibility = JavaVersion.VERSION_1_8
1717
targetCompatibility = JavaVersion.VERSION_1_8
1818
1919
csi {
2020
suffix = 'CallSite'
21-
targetFolder = 'csi'
21+
targetFolder = project.layout.buildDirectory.dir('csi')
2222
rootFolder = file('$$ROOT_FOLDER$$')
2323
}
2424
@@ -89,7 +89,15 @@ class CallSiteInstrumentationPluginTest extends Specification {
8989

9090
private static void createGradleProject(final File buildDir, final String gradleFile, final String advice) {
9191
final projectFolder = new File(System.getProperty('user.dir')).parentFile
92-
final callSiteJar = resolve(projectFolder, 'buildSrc', 'call-site-instrumentation-plugin')
92+
final callSiteJar = resolve(projectFolder, 'buildSrc', 'call-site-instrumentation-plugin', 'build', 'libs', 'call-site-instrumentation-plugin-all.jar')
93+
final testCallSiteJarDir = resolve(buildDir, 'buildSrc', 'call-site-instrumentation-plugin', 'build', 'libs')
94+
testCallSiteJarDir.mkdirs()
95+
96+
Files.copy(
97+
callSiteJar.toPath(),
98+
testCallSiteJarDir.toPath().resolve(callSiteJar.name)
99+
)
100+
93101
final gradleFileContent = gradleFile.replace('$$ROOT_FOLDER$$', projectFolder.toString().replace("\\","\\\\"))
94102

95103
final buildGradle = resolve(buildDir, 'build.gradle')

buildSrc/src/test/groovy/InstrumentPluginTest.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ class InstrumentPluginTest extends Specification {
2626
compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.18.1' // just to build TestPlugin
2727
}
2828
29-
apply plugin: 'instrument'
29+
configurations {
30+
instrumentPluginClasspath {
31+
canBeResolved = true
32+
}
33+
}
3034
3135
instrument.plugins = [
3236
'TestPlugin'

0 commit comments

Comments
 (0)