From f916eace7108a69d444d00ccb85926e73ae8cff3 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Thu, 11 Jan 2024 20:10:49 +0100 Subject: [PATCH] Cleanup of `UseVarKeywordTest` --- .../java/migrate/lang/UseVarKeywordTest.java | 521 +++++++++--------- 1 file changed, 252 insertions(+), 269 deletions(-) diff --git a/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java b/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java index 52b79b0631..3de76f01db 100644 --- a/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java +++ b/src/test/java/org/openrewrite/java/migrate/lang/UseVarKeywordTest.java @@ -15,9 +15,6 @@ */ package org.openrewrite.java.migrate.lang; -import static org.openrewrite.java.Assertions.java; -import static org.openrewrite.java.Assertions.version; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -26,15 +23,20 @@ import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest; +import static org.openrewrite.java.Assertions.java; +import static org.openrewrite.java.Assertions.version; + class UseVarKeywordTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { spec.recipe( - Environment.builder() - .scanRuntimeClasspath("org.openrewrite.java.migrate.lang") - .build() - .activateRecipes("org.openrewrite.java.migrate.lang.UseVar")); + Environment.builder() + .scanRuntimeClasspath("org.openrewrite.java.migrate.lang") + .build() + .activateRecipes("org.openrewrite.java.migrate.lang.UseVar")) + .allSources(sources -> version(sources, 10)) + ; } @Nested @@ -44,8 +46,8 @@ class GeneralNotApplicable { void assignNull() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -53,8 +55,7 @@ void m() { String str = null; } } - """), - 10 + """ ) ); } @@ -63,8 +64,8 @@ void m() { void assignNothing() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -72,8 +73,7 @@ void m() { String str; } } - """), - 10 + """ ) ); } @@ -82,8 +82,8 @@ void m() { void multipleVariables() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -91,8 +91,7 @@ void m() { String str1, str2 = "Hello World!"; } } - """), - 10 + """ ) ); } @@ -101,8 +100,8 @@ void m() { void simpleAssigment() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -111,8 +110,7 @@ void m() { str1 = "Hello World!"; } } - """), - 10 + """ ) ); } @@ -121,8 +119,8 @@ void m() { void varUsage() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -130,8 +128,7 @@ void m() { var str1 = "Hello World!"; } } - """), - 10 + """ ) ); } @@ -140,17 +137,16 @@ void m() { void withTernary() { //language=java rewriteRun( - version( - java(""" - package com.example.app; - - class A { - void m() { - String o = true ? "isTrue" : "Test"; - } - } - """), - 10 + java( + """ + package com.example.app; + + class A { + void m() { + String o = true ? "isTrue" : "Test"; + } + } + """ ) ); } @@ -165,8 +161,8 @@ class Applicable { void inMethodBody() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -174,7 +170,8 @@ void m() { Object o = new Object(); } } - """, """ + """, + """ package com.example.app; class A { @@ -182,8 +179,7 @@ void m() { var o = new Object(); } } - """), - 10 + """ ) ); } @@ -192,8 +188,8 @@ void m() { void reassignment() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -202,7 +198,8 @@ void m() { Object innerO = o; } } - """, """ + """, + """ package com.example.app; class A { @@ -211,8 +208,7 @@ void m() { var innerO = o; } } - """), - 10 + """ ) ); } @@ -222,8 +218,8 @@ void m() { void withTernary() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -231,7 +227,8 @@ void m() { String o = true ? "isTrue" : "Test"; } } - """, """ + """, + """ package com.example.app; class A { @@ -239,8 +236,7 @@ void m() { var o = true ? "isTrue" : "Test"; } } - """), - 10 + """ ) ); } @@ -249,8 +245,8 @@ void m() { void inStaticInitializer() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -258,7 +254,8 @@ class A { Object o = new Object(); } } - """, """ + """, + """ package com.example.app; class A { @@ -266,8 +263,7 @@ class A { var o = new Object(); } } - """), - 10 + """ ) ); } @@ -276,8 +272,8 @@ class A { void inInstanceInitializer() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -285,7 +281,8 @@ class A { Object o = new Object(); } } - """, """ + """, + """ package com.example.app; class A { @@ -293,8 +290,7 @@ class A { var o = new Object(); } } - """), - 10 + """ ) ); } @@ -306,8 +302,8 @@ class NotApplicable { void asParameter() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -315,8 +311,7 @@ Object m(Object o) { return o; } } - """), - 10 + """ ) ); } @@ -325,8 +320,8 @@ Object m(Object o) { void asField() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -335,8 +330,7 @@ Object m() { return o; } } - """), - 10 + """ ) ); } @@ -351,8 +345,8 @@ class NotApplicable { void forShort() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -360,8 +354,7 @@ void m() { short mask = 0x7fff; } } - """), - 10 + """ ) ); } @@ -370,8 +363,8 @@ void m() { void forByte() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -379,8 +372,7 @@ void m() { byte flags = 0; } } - """), - 10 + """ ) ); } @@ -393,8 +385,8 @@ class Applicable { void forString() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -402,7 +394,8 @@ void m() { String str = "I am a value"; } } - """, """ + """, + """ package com.example.app; class A { @@ -410,8 +403,7 @@ void m() { var str = "I am a value"; } } - """), - 10 + """ ) ); } @@ -420,8 +412,8 @@ void m() { void forBoolean() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -429,7 +421,8 @@ void m() { boolean b = true; } } - """, """ + """, + """ package com.example.app; class A { @@ -437,8 +430,7 @@ void m() { var b = true; } } - """), - 10 + """ ) ); } @@ -447,8 +439,7 @@ void m() { void forChar() { //language=java rewriteRun( - version( - java(""" + java(""" package com.example.app; class A { @@ -456,7 +447,8 @@ void m() { char ch = '\ufffd'; } } - """, """ + """, + """ package com.example.app; class A { @@ -464,8 +456,7 @@ void m() { var ch = '\ufffd'; } } - """), - 10 + """ ) ); } @@ -474,8 +465,8 @@ void m() { void forDouble() { //language=java rewriteRun( - version( - java(""" + java( + """ package com.example.app; class A { @@ -483,7 +474,8 @@ void m() { double d = 2.0; } } - """, """ + """, + """ package com.example.app; class A { @@ -491,8 +483,7 @@ void m() { var d = 2.0; } } - """), - 10 + """ ) ); } @@ -501,25 +492,24 @@ void m() { void forFloat() { //language=java rewriteRun( - version( - java(""" + java(""" package com.example.app; class A { void m() { - float f = 2.0; + float f = 2.0F; } } - """, """ + """, + """ package com.example.app; - class A { + class A { void m() { var f = 2.0F; } } - """), - 10 + """ ) ); } @@ -530,22 +520,23 @@ void forLong() { rewriteRun( version( java(""" - package com.example.app; - - class A { - void m() { - long l = 2; + package com.example.app; + + class A { + void m() { + long l = 2; + } } - } - """, """ - package com.example.app; - - class A { - void m() { - var l = 2L; + """, + """ + package com.example.app; + + class A { + void m() { + var l = 2L; + } } - } - """), + """), 10 ) ); @@ -555,8 +546,7 @@ void m() { void forDoubleWithTypNotation() { //language=java rewriteRun( - version( - java(""" + java(""" package com.example.app; class A { @@ -564,7 +554,8 @@ void m() { double d = 2.0D; } } - """, """ + """, + """ package com.example.app; class A { @@ -572,8 +563,7 @@ void m() { var d = 2.0D; } } - """), - 10 + """ ) ); } @@ -582,8 +572,7 @@ void m() { void forFloatWithTypNotation() { //language=java rewriteRun( - version( - java(""" + java(""" package com.example.app; class A { @@ -591,7 +580,8 @@ void m() { float f = 2.0F; } } - """, """ + """, + """ package com.example.app; class A { @@ -599,8 +589,7 @@ void m() { var f = 2.0F; } } - """), - 10 + """ ) ); } @@ -609,8 +598,7 @@ void m() { void forLongWithTypNotation() { //language=java rewriteRun( - version( - java(""" + java(""" package com.example.app; class A { @@ -618,7 +606,8 @@ void m() { long l = 2L; } } - """, """ + """, + """ package com.example.app; class A { @@ -626,8 +615,7 @@ void m() { var l = 2L; } } - """), - 10 + """ ) ); } @@ -642,62 +630,60 @@ class NotApplicable { void forEmptyFactoryMethod() { //language=java rewriteRun( - version( - java( - """ - package com.example.app; - - import java.util.List; - - class A { - void m() { - List strs = List.of(); - } + java( + """ + package com.example.app; + + import java.util.List; + + class A { + void m() { + List strs = List.of(); } - """), - 10 + } + """ ) ); } + @Test void forEmptyDiamondOperators() { //language=java rewriteRun( - version( - java( - """ - package com.example.app; - - import java.util.ArrayList; - import java.util.List; - - class A { - void m() { - List strs = new ArrayList<>(); - } + java( + """ + package com.example.app; + + import java.util.ArrayList; + import java.util.List; + + class A { + void m() { + List strs = new ArrayList<>(); } - """), - 10 + } + """ ) ); } + @Test void withDiamondOperatorOnRaw() { //language=java rewriteRun( - version( - java(""" - package com.example.app; - - import java.util.ArrayList; - - class A { - void m() { - List strs = new ArrayList(); + java(""" + package com.example.app; + + import java.util.List; + import java.util.ArrayList; + + class A { + void m() { + List strs = new ArrayList(); + } } - } - """), - 10 + """ + ) ); } @@ -709,126 +695,123 @@ class Applicable { void ifWelldefined() { //language=java rewriteRun( - version( - java(""" - package com.example.app; - - import java.util.List; - import java.util.ArrayList; - - class A { - void m() { - List strs = new ArrayList(); - } - } - """, """ - package com.example.app; - - import java.util.ArrayList; - - class A { - void m() { - var strs = new ArrayList(); - } - } - """), - 10 + java(""" + package com.example.app; + + import java.util.List; + import java.util.ArrayList; + + class A { + void m() { + List strs = new ArrayList(); + } + } + """, + """ + package com.example.app; + + import java.util.ArrayList; + + class A { + void m() { + var strs = new ArrayList(); + } + } + """ ) ); } + @Test void forNoDiamondOperators() { //language=java rewriteRun( - version( - java( - """ - package com.example.app; - - import java.util.ArrayList; - import java.util.List; - - class A { - void m() { - List strs = new ArrayList(); - } + java( + """ + package com.example.app; + + import java.util.ArrayList; + import java.util.List; + + class A { + void m() { + List strs = new ArrayList(); } - """, """ - package com.example.app; - - import java.util.ArrayList; - - class A { - void m() { - var strs = new ArrayList(); - } + } + """, + """ + package com.example.app; + + import java.util.ArrayList; + + class A { + void m() { + var strs = new ArrayList(); } - """), - 10 + } + """ ) ); } + @Test @Example void withDiamondOperator() { //language=java rewriteRun( - version( - java(""" - package com.example.app; - - import java.util.List; - import java.util.ArrayList; - - class A { - void m() { - List strs = new ArrayList<>(); - } - } - """, """ - package com.example.app; - - import java.util.ArrayList; - - class A { - void m() { - var strs = new ArrayList(); - } - } - """), - 10 + java(""" + package com.example.app; + + import java.util.List; + import java.util.ArrayList; + + class A { + void m() { + List strs = new ArrayList<>(); + } + } + """, + """ + package com.example.app; + + import java.util.ArrayList; + + class A { + void m() { + var strs = new ArrayList(); + } + } + """ ) ); } @Test - @Disabled("not yet implemented by UseVarForMethodInvocations") // todo mboegers in PR #249 void withFactoryMethods() { //language=java rewriteRun( - version( - java(""" - package com.example.app; - - import java.util.List; - - class A { - void m() { - List strs = List.of("one", "two"); - } - } - """, """ - package com.example.app; - - import java.util.List; - - class A { - void m() { - List strs = List.of("one", "two"); - } - } - """), - 10 + java(""" + package com.example.app; + + import java.util.List; + + class A { + void m() { + List strs = List.of("one", "two"); + } + } + """, + """ + package com.example.app; + + import java.util.List; + + class A { + void m() { + var strs = List.of("one", "two"); + } + } + """ ) ); }