From 5e5eb76d092cf247893aeb565d0f33e8b6dc0bad Mon Sep 17 00:00:00 2001 From: Greg Oledzki Date: Wed, 29 Jan 2025 14:37:22 +0100 Subject: [PATCH] Reverting offline for some of the tests --- .../gradle/AddJUnitPlatformLauncherTest.java | 4 ++-- .../org/openrewrite/gradle/AddPropertyTest.java | 4 ++-- .../java/org/openrewrite/gradle/GradleSetup.java | 2 +- .../gradle/RemoveEnableFeaturePreviewTest.java | 4 ++-- .../RemoveRedundantDependencyVersionsTest.java | 4 ++-- .../openrewrite/gradle/RemoveRepositoryTest.java | 4 ++-- .../org/openrewrite/gradle/RewriteGradleTest.java | 3 +-- .../openrewrite/gradle/UpdateGradleWrapperTest.java | 13 ++++--------- .../gradle/plugins/AddBuildPluginTest.java | 5 +++-- .../plugins/AddDevelocityGradlePluginTest.java | 5 +++-- .../gradle/plugins/AddSettingsPluginTest.java | 5 +++-- .../gradle/plugins/ChangePluginVersionTest.java | 5 +++-- .../gradle/plugins/RemoveBuildPluginTest.java | 4 ++-- .../gradle/plugins/RemoveSettingsPluginTest.java | 4 ++-- .../gradle/search/DependencyInsightTest.java | 5 +++-- .../gradle/search/FindDependencyHandlerTest.java | 4 ++-- .../gradle/search/FindDependencyTest.java | 4 ++-- .../gradle/search/FindGradleProjectTest.java | 5 +++-- .../gradle/search/FindGradleWrapperTest.java | 4 ++-- .../security/UseHttpsForRepositoriesTest.java | 4 ++-- .../openrewrite/gradle/style/AutodetectTest.java | 4 ++-- .../gradle/trait/GradleDependencyTest.java | 4 ++-- .../openrewrite/gradle/tree/BuildscriptTest.java | 4 ++-- .../java/org/openrewrite/gradle/tree/ExtTest.java | 4 ++-- .../org/openrewrite/gradle/tree/PluginsTest.java | 4 ++-- .../org/openrewrite/gradle/tree/RepositoryTest.java | 4 ++-- 26 files changed, 58 insertions(+), 58 deletions(-) diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddJUnitPlatformLauncherTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddJUnitPlatformLauncherTest.java index 1a42b8b23c9..e1893b421f9 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddJUnitPlatformLauncherTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddJUnitPlatformLauncherTest.java @@ -19,14 +19,14 @@ import org.openrewrite.DocumentExample; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; import static org.openrewrite.java.Assertions.*; -class AddJUnitPlatformLauncherTest extends RewriteGradleTest { +class AddJUnitPlatformLauncherTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddPropertyTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddPropertyTest.java index d45facea7b8..4fefed7ccdd 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddPropertyTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddPropertyTest.java @@ -17,13 +17,13 @@ import org.junit.jupiter.api.Test; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.properties.Assertions.properties; import static org.openrewrite.test.SourceSpecs.dir; -class AddPropertyTest extends RewriteGradleTest { +class AddPropertyTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/GradleSetup.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/GradleSetup.java index a61801b1cd4..240af55f95e 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/GradleSetup.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/GradleSetup.java @@ -20,7 +20,7 @@ import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi; -public class GradleSetup extends RewriteGradleTest { +public class GradleSetup extends RewriteGradleTest implements RewriteTest { private static Boolean alreadySetUp = false; // This is a one-time initialization of Gradle dependencies for the tests. It wouldn't be needed diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java index 8f741840cd9..7ce2d694290 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java @@ -19,11 +19,11 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.settingsGradle; -class RemoveEnableFeaturePreviewTest extends RewriteGradleTest { +class RemoveEnableFeaturePreviewTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java index 4fd8649b2a8..37a7b8074f4 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java @@ -18,12 +18,12 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; -class RemoveRedundantDependencyVersionsTest extends RewriteGradleTest { +class RemoveRedundantDependencyVersionsTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.beforeRecipe(withOfflineToolingApi()) diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRepositoryTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRepositoryTest.java index 6de8ad83fa9..7e834e976a1 100755 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRepositoryTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRepositoryTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; -class RemoveRepositoryTest extends RewriteGradleTest { +class RemoveRepositoryTest implements RewriteTest { @DocumentExample @Test diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RewriteGradleTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RewriteGradleTest.java index 7738323e485..76c01ae75c9 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RewriteGradleTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RewriteGradleTest.java @@ -16,9 +16,8 @@ package org.openrewrite.gradle; import org.junit.jupiter.api.BeforeAll; -import org.openrewrite.test.RewriteTest; -public class RewriteGradleTest implements RewriteTest { +public class RewriteGradleTest { @BeforeAll static void makeSureArtifactsAreDownloaded() { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpdateGradleWrapperTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpdateGradleWrapperTest.java index 791b73e3f44..337c56745b5 100755 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpdateGradleWrapperTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpdateGradleWrapperTest.java @@ -25,7 +25,7 @@ import org.openrewrite.properties.tree.Properties; import org.openrewrite.remote.Remote; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import org.openrewrite.test.SourceSpecs; import org.openrewrite.text.PlainText; @@ -43,17 +43,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; -import static org.openrewrite.gradle.util.GradleWrapper.WRAPPER_BATCH_LOCATION; -import static org.openrewrite.gradle.util.GradleWrapper.WRAPPER_JAR_LOCATION; -import static org.openrewrite.gradle.util.GradleWrapper.WRAPPER_PROPERTIES_LOCATION; -import static org.openrewrite.gradle.util.GradleWrapper.WRAPPER_SCRIPT_LOCATION; +import static org.openrewrite.gradle.util.GradleWrapper.*; import static org.openrewrite.properties.Assertions.properties; -import static org.openrewrite.test.SourceSpecs.dir; -import static org.openrewrite.test.SourceSpecs.other; -import static org.openrewrite.test.SourceSpecs.text; +import static org.openrewrite.test.SourceSpecs.*; @SuppressWarnings("UnusedProperty") -class UpdateGradleWrapperTest extends RewriteGradleTest { +class UpdateGradleWrapperTest extends RewriteGradleTest implements RewriteTest { private final UnaryOperator<@Nullable String> notEmpty = actual -> { assertThat(actual).isNotNull(); return actual + "\n"; diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java index 13ba30b6ddd..d798a93f84f 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java @@ -17,15 +17,16 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.gradle.RewriteGradleTest; import org.openrewrite.marker.BuildTool; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.Tree.randomId; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; -class AddBuildPluginTest extends RewriteGradleTest { +class AddBuildPluginTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.beforeRecipe(withOfflineToolingApi()); diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePluginTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePluginTest.java index 271237ce50a..ce3fb9b2688 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePluginTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePluginTest.java @@ -18,12 +18,13 @@ import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.Test; import org.openrewrite.Issue; +import org.openrewrite.gradle.RewriteGradleTest; import org.openrewrite.groovy.tree.G.CompilationUnit; import org.openrewrite.marker.BuildTool; import org.openrewrite.semver.Semver; import org.openrewrite.semver.VersionComparator; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import org.openrewrite.test.SourceSpec; import java.util.function.Consumer; @@ -38,7 +39,7 @@ import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; import static org.openrewrite.test.SourceSpecs.dir; -class AddDevelocityGradlePluginTest extends RewriteGradleTest { +class AddDevelocityGradlePluginTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java index 74fcce06fd1..18a9ae2249b 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java @@ -17,9 +17,10 @@ import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.Test; +import org.openrewrite.gradle.RewriteGradleTest; import org.openrewrite.groovy.tree.G; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import org.openrewrite.test.SourceSpec; import java.util.function.Consumer; @@ -30,7 +31,7 @@ import static org.openrewrite.gradle.Assertions.settingsGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; -class AddSettingsPluginTest extends RewriteGradleTest { +class AddSettingsPluginTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.beforeRecipe(withOfflineToolingApi()) diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/ChangePluginVersionTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/ChangePluginVersionTest.java index b4380a487a7..532c19f957c 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/ChangePluginVersionTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/ChangePluginVersionTest.java @@ -17,13 +17,14 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; -import org.openrewrite.test.RecipeSpec; import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RecipeSpec; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.settingsGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; -class ChangePluginVersionTest extends RewriteGradleTest { +class ChangePluginVersionTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveBuildPluginTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveBuildPluginTest.java index 4d345d01ee2..5e240a06f5d 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveBuildPluginTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveBuildPluginTest.java @@ -17,12 +17,12 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.Assertions.settingsGradle; -class RemoveBuildPluginTest extends RewriteGradleTest { +class RemoveBuildPluginTest implements RewriteTest { @DocumentExample @Test void removePlugin() { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveSettingsPluginTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveSettingsPluginTest.java index c1589b58abe..933f3ccd68c 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveSettingsPluginTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveSettingsPluginTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.settingsGradle; -class RemoveSettingsPluginTest extends RewriteGradleTest { +class RemoveSettingsPluginTest implements RewriteTest { @DocumentExample @Test void removePlugin() { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/DependencyInsightTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/DependencyInsightTest.java index eab1fd39261..f8bf5e947c8 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/DependencyInsightTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/DependencyInsightTest.java @@ -17,16 +17,17 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.gradle.RewriteGradleTest; import org.openrewrite.maven.table.DependenciesInUse; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.assertj.core.api.Assertions.assertThat; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; import static org.openrewrite.groovy.Assertions.groovy; -class DependencyInsightTest extends RewriteGradleTest { +class DependencyInsightTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyHandlerTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyHandlerTest.java index afae0d4d94e..31207309f20 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyHandlerTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyHandlerTest.java @@ -17,12 +17,12 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.test.RewriteTest.fromRuntimeClasspath; -class FindDependencyHandlerTest extends RewriteGradleTest { +class FindDependencyHandlerTest implements RewriteTest { @DocumentExample @Test void findDependenciesBlock() { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyTest.java index 4d5ddbba668..ee9a607830f 100755 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindDependencyTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; -class FindDependencyTest extends RewriteGradleTest { +class FindDependencyTest implements RewriteTest { @DocumentExample @Test diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleProjectTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleProjectTest.java index e480a86fb1a..821ecdc31bf 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleProjectTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleProjectTest.java @@ -19,15 +19,16 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.openrewrite.DocumentExample; -import org.openrewrite.test.RecipeSpec; import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RecipeSpec; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; import static org.openrewrite.maven.Assertions.pomXml; import static org.openrewrite.test.SourceSpecs.text; -class FindGradleProjectTest extends RewriteGradleTest { +class FindGradleProjectTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleWrapperTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleWrapperTest.java index 0498a08f73a..049117d3a32 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleWrapperTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/search/FindGradleWrapperTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.properties.Assertions.properties; -class FindGradleWrapperTest extends RewriteGradleTest { +class FindGradleWrapperTest implements RewriteTest { @DocumentExample @Test void findGradleWrapperVersion() { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/security/UseHttpsForRepositoriesTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/security/UseHttpsForRepositoriesTest.java index 308a0cfb677..954cc5d68dc 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/security/UseHttpsForRepositoriesTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/security/UseHttpsForRepositoriesTest.java @@ -18,12 +18,12 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; @SuppressWarnings("HttpUrlsUsage") -class UseHttpsForRepositoriesTest extends RewriteGradleTest { +class UseHttpsForRepositoriesTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/style/AutodetectTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/style/AutodetectTest.java index 5a28dcd0897..1f82193ede9 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/style/AutodetectTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/style/AutodetectTest.java @@ -20,7 +20,7 @@ import org.openrewrite.groovy.GroovyParser; import org.openrewrite.java.style.TabsAndIndentsStyle; import org.openrewrite.style.NamedStyles; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import java.util.stream.Stream; @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings({"ConstantConditions"}) -class AutodetectTest extends RewriteGradleTest { +class AutodetectTest implements RewriteTest { @Test void gradleTabsAndIndents() { Stream parse = GroovyParser.builder().build() diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/GradleDependencyTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/GradleDependencyTest.java index dc396265118..cafdf164c2b 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/GradleDependencyTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/GradleDependencyTest.java @@ -17,16 +17,16 @@ import org.junit.jupiter.api.Test; import org.openrewrite.DocumentExample; +import org.openrewrite.gradle.RewriteGradleTest; import org.openrewrite.marker.SearchResult; import org.openrewrite.test.RecipeSpec; -import org.openrewrite.gradle.RewriteGradleTest; import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; import static org.openrewrite.gradle.toolingapi.Assertions.withOfflineToolingApi; import static org.openrewrite.gradle.trait.Traits.gradleDependency; -class GradleDependencyTest extends RewriteGradleTest { +class GradleDependencyTest extends RewriteGradleTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/BuildscriptTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/BuildscriptTest.java index 7f2f55aaa9d..3fa9a2c8102 100755 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/BuildscriptTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/BuildscriptTest.java @@ -16,11 +16,11 @@ package org.openrewrite.gradle.tree; import org.junit.jupiter.api.Test; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; -class BuildscriptTest extends RewriteGradleTest { +class BuildscriptTest implements RewriteTest { @Test void buildscriptWithDependencies() { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/ExtTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/ExtTest.java index 317604a862d..b2c6501960d 100755 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/ExtTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/ExtTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; import org.openrewrite.Issue; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; -class ExtTest extends RewriteGradleTest { +class ExtTest implements RewriteTest { @Issue("https://github.com/openrewrite/rewrite/issues/1236") @Test diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/PluginsTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/PluginsTest.java index f86e39c249a..60e6d922fbc 100755 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/PluginsTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/PluginsTest.java @@ -16,11 +16,11 @@ package org.openrewrite.gradle.tree; import org.junit.jupiter.api.Test; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; -class PluginsTest extends RewriteGradleTest { +class PluginsTest implements RewriteTest { @Test void applySomePlugins() { diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/RepositoryTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/RepositoryTest.java index 8a7d52c4aac..7d340703343 100755 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/RepositoryTest.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/tree/RepositoryTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; import org.openrewrite.Issue; -import org.openrewrite.gradle.RewriteGradleTest; +import org.openrewrite.test.RewriteTest; import static org.openrewrite.gradle.Assertions.buildGradle; -class RepositoryTest extends RewriteGradleTest { +class RepositoryTest implements RewriteTest { @Test void builtInFunctions() {