Fixing variable names in tests (#745)

greg-at-moderne · web-flow · commit e3a0ecd0ce81 · 2025-06-02T07:05:39.000+02:00
diff --git a/src/test/java/org/openrewrite/java/migrate/IBMSemeruTest.java b/src/test/java/org/openrewrite/java/migrate/IBMSemeruTest.java
@@ -88,8 +88,8 @@ void bar() {
                     }
                 }
 
-                public static Handler testMethod(Handler handler){ //flag (2)
-                    return handler;
+                public static Handler testMethod(Handler handler1){ //flag (2)
+                    return handler1;
                 }
               }
               """
diff --git a/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalTest.java b/src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilOptionalTest.java
@@ -84,8 +84,8 @@ String foo(Optional<String> optional) {
             import java.util.Optional;
 
             class A {
-                String foo(Optional<String> optional) {
-                    return optional.orElse(null);
+                String foo(Optional<String> optional1) {
+                    return optional1.orElse(null);
                 }
             }
             """));
@@ -108,8 +108,8 @@ Optional<String> foo(Optional<String> optional) {
             import java.util.Optional;
 
             class A {
-                Optional<String> foo(Optional<String> optional) {
-                    return optional.orElse("other");
+                Optional<String> foo(Optional<String> optional1) {
+                    return optional1.orElse("other");
                 }
             }
             """));
@@ -132,8 +132,8 @@ Optional<String> foo(Optional<String> optional) {
             import java.util.Optional;
 
             class A {
-                Optional<String> foo(Optional<String> optional) {
-                    return optional.orElseGet(() -> "other");
+                Optional<String> foo(Optional<String> optional1) {
+                    return optional1.orElseGet(() -> "other");
                 }
             }
             """));
@@ -159,8 +159,8 @@ String foo(Optional<String> optional, Supplier<String> supplier) {
               import java.util.function.Supplier;
 
               class A {
-                  String foo(Optional<String> optional, Supplier<String> supplier) {
-                      return optional.orElseGet(supplier);
+                  String foo(Optional<String> optional1, Supplier<String> supplier1) {
+                      return optional1.orElseGet(supplier1);
                   }
               }
               """
@@ -184,8 +184,8 @@ Optional<String> foo(Optional<String> optional) {
             import java.util.Optional;
 
             class A {
-                Optional<String> foo(Optional<String> optional) {
-                    return optional.map(String::toUpperCase);
+                Optional<String> foo(Optional<String> optional1) {
+                    return optional1.map(String::toUpperCase);
                 }
             }
             """));
diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/RemovedJakartaFacesExpressionLanguageClassesTest.java b/src/test/java/org/openrewrite/java/migrate/jakarta/RemovedJakartaFacesExpressionLanguageClassesTest.java
@@ -67,9 +67,9 @@ public void testJakarta() {
               public class Test {
 
                    public void testJakarta() {
-                        MethodExpression methodBinding = null;
-                        ELResolver propertyResolver = null;
-                        ValueExpression valueBinding = null;
+                        MethodExpression methodExpression = null;
+                        ELResolver eLResolver = null;
+                        ValueExpression valueExpression = null;
                    }
               }
               """
@@ -112,11 +112,11 @@ public void testJakarta_1() {
             public class Test {
 
                 public void testJakarta_1() {
-                    ELResolver variableResolver = null;
-                    ELException evaluationException = null;
-                    MethodNotFoundException methodNotFoundException = null;
-                    PropertyNotFoundException propertyNotFoundException = null;
-                    ELException referenceSyntaxException = null;
+                    ELResolver eLResolver = null;
+                    ELException eLException = null;
+                    MethodNotFoundException methodNotFoundException1 = null;
+                    PropertyNotFoundException propertyNotFoundException1 = null;
+                    ELException eLException1 = null;
                 }
             }
             """
@@ -154,9 +154,9 @@ public void testJavax() {
               public class Test {
 
                    public void testJavax() {
-                        MethodExpression methodBinding = null;
-                        ELResolver propertyResolver = null;
-                        ValueExpression valueBinding = null;
+                        MethodExpression methodExpression = null;
+                        ELResolver eLResolver = null;
+                        ValueExpression valueExpression = null;
                    }
               }
               """
@@ -199,11 +199,11 @@ public void testJavax_1() {
             public class Test {
 
                 public void testJavax_1() {
-                    ELResolver variableResolver = null;
-                    ELException evaluationException = null;
-                    MethodNotFoundException methodNotFoundException = null;
-                    PropertyNotFoundException propertyNotFoundException = null;
-                    ELException referenceSyntaxException = null;
+                    ELResolver eLResolver = null;
+                    ELException eLException = null;
+                    MethodNotFoundException methodNotFoundException1 = null;
+                    PropertyNotFoundException propertyNotFoundException1 = null;
+                    ELException eLException1 = null;
                 }
             }
             """

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ void bar() {`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`91`		`- public static Handler testMethod(Handler handler){ //flag (2)`
`92`		`- return handler;`
	`91`	`+ public static Handler testMethod(Handler handler1){ //flag (2)`
	`92`	`+ return handler1;`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ String foo(Optional<String> optional) {`
`84`	`84`	`import java.util.Optional;`
`85`	`85`
`86`	`86`	`class A {`
`87`		`- String foo(Optional<String> optional) {`
`88`		`- return optional.orElse(null);`
	`87`	`+ String foo(Optional<String> optional1) {`
	`88`	`+ return optional1.orElse(null);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`"""));`
`@@ -108,8 +108,8 @@ Optional<String> foo(Optional<String> optional) {`
`108`	`108`	`import java.util.Optional;`
`109`	`109`
`110`	`110`	`class A {`
`111`		`- Optional<String> foo(Optional<String> optional) {`
`112`		`- return optional.orElse("other");`
	`111`	`+ Optional<String> foo(Optional<String> optional1) {`
	`112`	`+ return optional1.orElse("other");`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`"""));`
`@@ -132,8 +132,8 @@ Optional<String> foo(Optional<String> optional) {`
`132`	`132`	`import java.util.Optional;`
`133`	`133`
`134`	`134`	`class A {`
`135`		`- Optional<String> foo(Optional<String> optional) {`
`136`		`- return optional.orElseGet(() -> "other");`
	`135`	`+ Optional<String> foo(Optional<String> optional1) {`
	`136`	`+ return optional1.orElseGet(() -> "other");`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`"""));`
`@@ -159,8 +159,8 @@ String foo(Optional<String> optional, Supplier<String> supplier) {`
`159`	`159`	`import java.util.function.Supplier;`
`160`	`160`
`161`	`161`	`class A {`
`162`		`- String foo(Optional<String> optional, Supplier<String> supplier) {`
`163`		`- return optional.orElseGet(supplier);`
	`162`	`+ String foo(Optional<String> optional1, Supplier<String> supplier1) {`
	`163`	`+ return optional1.orElseGet(supplier1);`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`"""`
`@@ -184,8 +184,8 @@ Optional<String> foo(Optional<String> optional) {`
`184`	`184`	`import java.util.Optional;`
`185`	`185`
`186`	`186`	`class A {`
`187`		`- Optional<String> foo(Optional<String> optional) {`
`188`		`- return optional.map(String::toUpperCase);`
	`187`	`+ Optional<String> foo(Optional<String> optional1) {`
	`188`	`+ return optional1.map(String::toUpperCase);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`	`"""));`