Skip to content

Commit a2aba82

Browse files
committed
refactor: share Muzzle report test setup
1 parent 77a7371 commit a2aba82

3 files changed

Lines changed: 24 additions & 38 deletions

File tree

‎buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzlePluginTestFixture.kt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,30 @@ open class MuzzlePluginTestFixture : GradleFixture() {
4141
addSubproject("dd-java-agent:instrumentation:demo", instrumentationBuildScript)
4242
}
4343

44+
/** Writes an aggregation project with optional instrumentation report producers. */
45+
fun writeAggregationProject(vararg producers: String) {
46+
addSubproject("dd-java-agent:instrumentation",
47+
"""
48+
plugins {
49+
id("java")
50+
id("dd-trace-java.muzzle-report-aggregation")
51+
}
52+
layout.buildDirectory.set(layout.projectDirectory.dir("relocated/build"))
53+
muzzleReports.reportFile.set(layout.buildDirectory.file("muzzle-deps-results/dd-java-agent_instrumentation.csv"))
54+
dependencies {
55+
${producers.joinToString("\n") { "implementation(project(\":dd-java-agent:instrumentation:$it\"))" }}
56+
}
57+
tasks.register("muzzleInstrumentationReport") { dependsOn(tasks.named("aggregateMuzzleReports")) }
58+
"""
59+
)
60+
writeRootProject(
61+
"""
62+
plugins { id("dd-trace-java.muzzle-report-aggregation") apply false }
63+
layout.buildDirectory.set(layout.projectDirectory.dir("relocated/build"))
64+
"""
65+
)
66+
}
67+
4468
/**
4569
* Writes a muzzle scan plugin that always passes.
4670
*/

‎buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzleReportAggregationTest.kt‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -391,28 +391,6 @@ class MuzzleReportAggregationTest : MuzzlePluginTestFixture() {
391391
)
392392
}
393393

394-
private fun writeAggregationProject() {
395-
addSubproject("dd-java-agent:instrumentation",
396-
"""
397-
plugins {
398-
id("java")
399-
id("dd-trace-java.muzzle-report-aggregation")
400-
}
401-
layout.buildDirectory.set(layout.projectDirectory.dir("relocated/build"))
402-
muzzleReports {
403-
reportFile.set(layout.buildDirectory.file("muzzle-deps-results/dd-java-agent_instrumentation.csv"))
404-
}
405-
tasks.register("muzzleInstrumentationReport") { dependsOn(tasks.named("aggregateMuzzleReports")) }
406-
"""
407-
)
408-
writeRootProject(
409-
"""
410-
plugins { id("dd-trace-java.muzzle-report-aggregation") apply false }
411-
layout.buildDirectory.set(layout.projectDirectory.dir("relocated/build"))
412-
"""
413-
)
414-
}
415-
416394
private fun addAggregationInput(projectPath: String, script: String) {
417395
addSubproject(projectPath, script)
418396
writeFile("dd-java-agent/instrumentation/build.gradle.kts",

‎buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzleReportConfigurationCacheTest.kt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -271,22 +271,6 @@ class MuzzleReportConfigurationCacheTest : MuzzlePluginTestFixture() {
271271
assertThat(reused.output).contains("Reusing configuration cache")
272272
}
273273

274-
private fun writeAggregationProject(vararg producers: String) {
275-
writeFile("dd-java-agent/instrumentation/build.gradle.kts",
276-
"""
277-
plugins {
278-
id("java")
279-
id("dd-trace-java.muzzle-report-aggregation")
280-
}
281-
layout.buildDirectory.set(layout.projectDirectory.dir("relocated/build"))
282-
muzzleReports.reportFile.set(layout.buildDirectory.file("muzzle-deps-results/dd-java-agent_instrumentation.csv"))
283-
dependencies {
284-
${producers.joinToString("\n") { "implementation(project(\":dd-java-agent:instrumentation:$it\"))" }}
285-
}
286-
"""
287-
)
288-
}
289-
290274
// Model local report producers without Maven so mutations test the aggregation pipeline alone.
291275
private val reportProducerScript = """
292276
import org.gradle.api.attributes.Category

0 commit comments

Comments
 (0)