Reverting offline for some of the tests

openrewrite · Jan 29, 2025 · 5e5eb76 · 5e5eb76
1 parent 320dde6
commit 5e5eb76
Show file tree

Hide file tree

Showing 26 changed files with 58 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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/...te-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java b/...te-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
@@ -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
@@ -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
@@ -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
@@ -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/...te-gradle/src/test/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePluginTest.java b/...te-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ite-gradle/src/test/java/org/openrewrite/gradle/security/UseHttpsForRepositoriesTest.java b/...ite-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
@@ -20,15 +20,15 @@
 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;
 
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SuppressWarnings({"ConstantConditions"})
-class AutodetectTest extends RewriteGradleTest {
+class AutodetectTest implements RewriteTest {
     @Test
     void gradleTabsAndIndents() {
         Stream<SourceFile> 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
@@ -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
@@ -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
@@ -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