diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenParserTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenParserTest.kt index 3e1a288b693..958be7f1b54 100644 --- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenParserTest.kt +++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenParserTest.kt @@ -23,7 +23,6 @@ import okio.ByteString.Companion.encode import org.assertj.core.api.Assertions.assertThat import org.intellij.lang.annotations.Language import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.openrewrite.InMemoryExecutionContext import org.openrewrite.Issue @@ -1011,7 +1010,6 @@ class MavenParserTest { } @Issue("https://github.com/openrewrite/rewrite/issues/376") - @Disabled @Test fun dependencyManagementPropagatesToDependencies() { // a depends on b diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenSettingsTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenSettingsTest.kt index 8e765ac1008..0331489dbf3 100644 --- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenSettingsTest.kt +++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/MavenSettingsTest.kt @@ -58,7 +58,6 @@ class MavenSettingsTest { assertThat(ctx.repositories).hasSize(1) } - @Disabled @Issue("https://github.com/openrewrite/rewrite/issues/131") @Test fun defaultActiveWhenNoOthersAreActive() { diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradePluginVersionTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradePluginVersionTest.kt index 81a56f7f664..6eb0856b8dc 100755 --- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradePluginVersionTest.kt +++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradePluginVersionTest.kt @@ -214,7 +214,6 @@ class UpgradePluginVersionTest : MavenRecipeTest { ) @Test - @Disabled("not currently dealing with parents") // todo fun upgradeVersionIgnoringParent(@TempDir tempDir: Path) { val parent = tempDir.resolve("pom.xml") val server = tempDir.resolve("server/pom.xml") @@ -312,7 +311,7 @@ class UpgradePluginVersionTest : MavenRecipeTest { } @Test - @Disabled("not currently dealing with parents") // todo + @Disabled fun trustParent(@TempDir tempDir: Path) { val parent = tempDir.resolve("pom.xml") val server = tempDir.resolve("server/pom.xml") @@ -410,7 +409,7 @@ class UpgradePluginVersionTest : MavenRecipeTest { } @Test - @Disabled("not currently dealing with parents") // todo + @Disabled fun upgradePluginInParent(@TempDir tempDir: Path) { val parent = tempDir.resolve("pom.xml") val server = tempDir.resolve("server/pom.xml") diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt index 7173ad38e44..db03c2b9bf6 100755 --- a/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt +++ b/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt @@ -15,46 +15,16 @@ */ package org.openrewrite.maven -import io.micrometer.core.instrument.Metrics -import io.micrometer.core.instrument.config.MeterFilter import org.intellij.lang.annotations.Language -import org.junit.jupiter.api.AfterAll -import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.BeforeAll import org.openrewrite.ExecutionContext import org.openrewrite.Recipe import org.openrewrite.RecipeTest -import org.openrewrite.internal.LoggingMeterRegistry import org.openrewrite.xml.tree.Xml import java.io.File import java.nio.file.Path @Suppress("unused") interface MavenRecipeTest : RecipeTest { - companion object { - private val meterRegistry = LoggingMeterRegistry.builder().build() - - @BeforeAll - @JvmStatic - fun setMeterRegistry() { - meterRegistry.config() - .meterFilter(MeterFilter.acceptNameStartsWith("rewrite.maven")) - .meterFilter(MeterFilter.deny()) - .meterFilter(MeterFilter.ignoreTags("group.id", "artifact.id")) - Metrics.globalRegistry.add(meterRegistry) - } - - @AfterAll - @JvmStatic - fun unsetMeterRegistry() { - Metrics.globalRegistry.remove(meterRegistry) - } - } - - @AfterEach - fun printMetrics() { - meterRegistry.print() - } override val parser: MavenParser get() = MavenParser.builder().build()