From 80bec5e53fa8de2cb19f8c4042291c1dc356469f Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 29 Apr 2022 12:29:43 -0700 Subject: [PATCH] Convert ApacheIOUtilsUseExplicitCharsetTest from a JavaRecipeTest to RewriteTest --- .../io/ApacheIOUtilsUseExplicitCharsetTest.kt | 190 +++++++++--------- 1 file changed, 98 insertions(+), 92 deletions(-) diff --git a/src/test/kotlin/org/openrewrite/java/migrate/apache/commons/io/ApacheIOUtilsUseExplicitCharsetTest.kt b/src/test/kotlin/org/openrewrite/java/migrate/apache/commons/io/ApacheIOUtilsUseExplicitCharsetTest.kt index d27aa9e31f..501b1c9b02 100644 --- a/src/test/kotlin/org/openrewrite/java/migrate/apache/commons/io/ApacheIOUtilsUseExplicitCharsetTest.kt +++ b/src/test/kotlin/org/openrewrite/java/migrate/apache/commons/io/ApacheIOUtilsUseExplicitCharsetTest.kt @@ -16,107 +16,113 @@ package org.openrewrite.java.migrate.apache.commons.io import org.junit.jupiter.api.Test -import org.openrewrite.Recipe + import org.openrewrite.java.JavaParser -import org.openrewrite.java.JavaRecipeTest +import org.openrewrite.test.RecipeSpec +import org.openrewrite.test.RewriteTest @Suppress("deprecation", "resource", "ResultOfMethodCallIgnored") -class ApacheIOUtilsUseExplicitCharsetTest : JavaRecipeTest { - - override val recipe: Recipe - get() = ApacheIOUtilsUseExplicitCharset(null) +class ApacheIOUtilsUseExplicitCharsetTest : RewriteTest { - override val parser: JavaParser - get() = JavaParser.fromJavaVersion().classpath("commons-io").build() + override fun defaults(spec: RecipeSpec) { + spec.recipe(ApacheIOUtilsUseExplicitCharset(null)) + spec.parser( + JavaParser.fromJavaVersion().classpath("commons-io").build() + ) + } @Test - fun useCharset() = assertChanged( - before = """ - import org.apache.commons.io.IOUtils; - import java.io.InputStream; - import java.io.OutputStream; - import java.io.Reader; - import java.io.Writer; - import java.net.URI; - import java.net.URL; - - class T { - InputStream inputStream; - OutputStream outputStream; - Reader reader; - Writer writer; - CharSequence charSequence; - String someString; - byte[] bytes; - URI uri; - URL url; - char[] chars; - StringBuffer stringBuffer; + fun useCharset() = rewriteRun( + srcMainJava( + java( + """ + import org.apache.commons.io.IOUtils; + import java.io.InputStream; + import java.io.OutputStream; + import java.io.Reader; + import java.io.Writer; + import java.net.URI; + import java.net.URL; - void flex() { - IOUtils.copy(inputStream, writer); - IOUtils.copy(reader, outputStream); - IOUtils.readLines(inputStream); - IOUtils.toByteArray(someString); - IOUtils.toByteArray(reader); - IOUtils.toCharArray(inputStream); - IOUtils.toInputStream(charSequence); - IOUtils.toInputStream("Test"); - IOUtils.toString("Test".getBytes()); - IOUtils.toString(inputStream); - IOUtils.toString(uri); - IOUtils.toString(url); - IOUtils.write(bytes, writer); - IOUtils.write(chars, outputStream); - IOUtils.write(charSequence, outputStream); - IOUtils.write(someString, outputStream); - IOUtils.write(stringBuffer, outputStream); + class T { + InputStream inputStream; + OutputStream outputStream; + Reader reader; + Writer writer; + CharSequence charSequence; + String someString; + byte[] bytes; + URI uri; + URL url; + char[] chars; + StringBuffer stringBuffer; + + void flex() { + IOUtils.copy(inputStream, writer); + IOUtils.copy(reader, outputStream); + IOUtils.readLines(inputStream); + IOUtils.toByteArray(someString); + IOUtils.toByteArray(reader); + IOUtils.toCharArray(inputStream); + IOUtils.toInputStream(charSequence); + IOUtils.toInputStream("Test"); + IOUtils.toString("Test".getBytes()); + IOUtils.toString(inputStream); + IOUtils.toString(uri); + IOUtils.toString(url); + IOUtils.write(bytes, writer); + IOUtils.write(chars, outputStream); + IOUtils.write(charSequence, outputStream); + IOUtils.write(someString, outputStream); + IOUtils.write(stringBuffer, outputStream); + } } - } - """, - after = """ - import org.apache.commons.io.IOUtils; - import java.io.InputStream; - import java.io.OutputStream; - import java.io.Reader; - import java.io.Writer; - import java.net.URI; - import java.net.URL; - import java.nio.charset.StandardCharsets; - - class T { - InputStream inputStream; - OutputStream outputStream; - Reader reader; - Writer writer; - CharSequence charSequence; - String someString; - byte[] bytes; - URI uri; - URL url; - char[] chars; - StringBuffer stringBuffer; + """, + """ + import org.apache.commons.io.IOUtils; + import java.io.InputStream; + import java.io.OutputStream; + import java.io.Reader; + import java.io.Writer; + import java.net.URI; + import java.net.URL; + import java.nio.charset.StandardCharsets; - void flex() { - IOUtils.copy(inputStream, writer, StandardCharsets.UTF_8); - IOUtils.copy(reader, outputStream, StandardCharsets.UTF_8); - IOUtils.readLines(inputStream, StandardCharsets.UTF_8); - someString.getBytes(StandardCharsets.UTF_8); - IOUtils.toByteArray(reader, StandardCharsets.UTF_8); - IOUtils.toCharArray(inputStream, StandardCharsets.UTF_8); - IOUtils.toInputStream(charSequence, StandardCharsets.UTF_8); - IOUtils.toInputStream("Test", StandardCharsets.UTF_8); - IOUtils.toString("Test".getBytes(), StandardCharsets.UTF_8); - IOUtils.toString(inputStream, StandardCharsets.UTF_8); - IOUtils.toString(uri, StandardCharsets.UTF_8); - IOUtils.toString(url, StandardCharsets.UTF_8); - IOUtils.write(bytes, writer, StandardCharsets.UTF_8); - IOUtils.write(chars, outputStream, StandardCharsets.UTF_8); - IOUtils.write(charSequence, outputStream, StandardCharsets.UTF_8); - IOUtils.write(someString, outputStream, StandardCharsets.UTF_8); - IOUtils.write(stringBuffer, outputStream, StandardCharsets.UTF_8); + class T { + InputStream inputStream; + OutputStream outputStream; + Reader reader; + Writer writer; + CharSequence charSequence; + String someString; + byte[] bytes; + URI uri; + URL url; + char[] chars; + StringBuffer stringBuffer; + + void flex() { + IOUtils.copy(inputStream, writer, StandardCharsets.UTF_8); + IOUtils.copy(reader, outputStream, StandardCharsets.UTF_8); + IOUtils.readLines(inputStream, StandardCharsets.UTF_8); + someString.getBytes(StandardCharsets.UTF_8); + IOUtils.toByteArray(reader, StandardCharsets.UTF_8); + IOUtils.toCharArray(inputStream, StandardCharsets.UTF_8); + IOUtils.toInputStream(charSequence, StandardCharsets.UTF_8); + IOUtils.toInputStream("Test", StandardCharsets.UTF_8); + IOUtils.toString("Test".getBytes(), StandardCharsets.UTF_8); + IOUtils.toString(inputStream, StandardCharsets.UTF_8); + IOUtils.toString(uri, StandardCharsets.UTF_8); + IOUtils.toString(url, StandardCharsets.UTF_8); + IOUtils.write(bytes, writer, StandardCharsets.UTF_8); + IOUtils.write(chars, outputStream, StandardCharsets.UTF_8); + IOUtils.write(charSequence, outputStream, StandardCharsets.UTF_8); + IOUtils.write(someString, outputStream, StandardCharsets.UTF_8); + IOUtils.write(stringBuffer, outputStream, StandardCharsets.UTF_8); + } } - } - """ + """ + ) + ) ) }