Remove obsolete Java version checks in tests.

tomball · copybara-github · commit ec24a53d0053 · 2025-09-30T16:02:46.000-07:00
The translator now supports Java 11 features by default, so the `testOnJava9OrAbove` and `testOnJava11OrAbove` wrappers are no longer needed. Tests using these wrappers are now run unconditionally.

PiperOrigin-RevId: 813464700
diff --git a/translator/src/test/java/com/google/devtools/j2objc/GenerationTest.java b/translator/src/test/java/com/google/devtools/j2objc/GenerationTest.java
@@ -839,22 +839,6 @@ protected interface TestLambda {
     void run() throws IOException;
   }
 
-  protected void testOnJava9OrAbove(TestLambda test) throws IOException {
-    if (onJava9OrAbove()) {
-      SourceVersion.setMaxSupportedVersion(SourceVersion.JAVA_9);
-      options.setSourceVersion(SourceVersion.JAVA_9);
-      test.run();
-    }
-  }
-
-  protected void testOnJava11OrAbove(TestLambda test) throws IOException {
-    if (onJava11OrAbove()) {
-      SourceVersion.setMaxSupportedVersion(SourceVersion.JAVA_11);
-      options.setSourceVersion(SourceVersion.JAVA_11);
-      test.run();
-    }
-  }
-
   protected void testOnJava16OrAbove(TestLambda test) throws IOException {
     if (onJava16OrAbove()) {
       SourceVersion.setMaxSupportedVersion(SourceVersion.JAVA_16);
diff --git a/translator/src/test/java/com/google/devtools/j2objc/gen/StatementGeneratorTest.java b/translator/src/test/java/com/google/devtools/j2objc/gen/StatementGeneratorTest.java
@@ -1899,50 +1899,43 @@ public void testEmptyStatementFormatting() throws IOException {
 
   @SuppressWarnings("StringConcatToTextBlock")
   public void testVarLocalVariables() throws IOException {
-    testOnJava11OrAbove(
-        () -> {
-          String translation =
-              translateSourceFile(
-                  String.join(
-                      "\n",
-                      "import java.util.ArrayList;",
-                      "import java.util.stream.Stream;",
-                      "class Test {",
-                      "  Stream test() {",
-                      "    var list = new ArrayList<String>();",
-                      "    var stream = list.stream();",
-                      "    return stream;",
-                      "  }",
-                      "}"),
-                  "Test",
-                  "Test.m");
-          // Verify correct type inference.
-          assertTranslation(
-              translation, "JavaUtilArrayList *list = create_JavaUtilArrayList_init();");
-          assertTranslation(translation, "id<JavaUtilStreamStream> stream = [list stream];");
-        });
+    String translation =
+        translateSourceFile(
+            String.join(
+                "\n",
+                "import java.util.ArrayList;",
+                "import java.util.stream.Stream;",
+                "class Test {",
+                "  Stream test() {",
+                "    var list = new ArrayList<String>();",
+                "    var stream = list.stream();",
+                "    return stream;",
+                "  }",
+                "}"),
+            "Test",
+            "Test.m");
+    // Verify correct type inference.
+    assertTranslation(translation, "JavaUtilArrayList *list = create_JavaUtilArrayList_init();");
+    assertTranslation(translation, "id<JavaUtilStreamStream> stream = [list stream];");
   }
 
   @SuppressWarnings("StringConcatToTextBlock")
   public void testVarLambdaExpressionParameter() throws IOException {
-    testOnJava11OrAbove(
-        () -> {
-          String translation =
-              translateSourceFile(
-                  String.join(
-                      "\n",
-                      "import java.util.function.Function;",
-                      "class Test {",
-                      "  int test(String input) {",
-                      "    Function<String, Integer> f = (var s) -> s.length();",
-                      "    return f.apply(input);",
-                      "  }",
-                      "}"),
-                  "Test",
-                  "Test.m");
-          assertTranslation(
-              translation, "@interface Test_$Lambda$1 : NSObject < JavaUtilFunctionFunction >");
-        });
+    String translation =
+        translateSourceFile(
+            String.join(
+                "\n",
+                "import java.util.function.Function;",
+                "class Test {",
+                "  int test(String input) {",
+                "    Function<String, Integer> f = (var s) -> s.length();",
+                "    return f.apply(input);",
+                "  }",
+                "}"),
+            "Test",
+            "Test.m");
+    assertTranslation(
+        translation, "@interface Test_$Lambda$1 : NSObject < JavaUtilFunctionFunction >");
   }
 
   @SuppressWarnings("StringConcatToTextBlock")
diff --git a/translator/src/test/java/com/google/devtools/j2objc/translate/AnonymousClassConverterTest.java b/translator/src/test/java/com/google/devtools/j2objc/translate/AnonymousClassConverterTest.java
@@ -421,6 +421,7 @@ public void testEnumWithParametersAndInnerClasses() throws IOException {
     assertTranslation(impl, "Color_1_initWithInt_withNSString_withInt_(e, 42, @\"RED\", 0)");
   }
 
+  @SuppressWarnings("StringConcatToTextBlock")
   public void testEnumWithInnerEnum() throws IOException {
     String impl = translateSourceFile(
       "public enum OuterValue {\n"
@@ -554,21 +555,21 @@ public void testGenericConstructorCalledByAnonymousClass() throws IOException {
   }
 
   public void testAnonymousClassWithDiamondOperator() throws IOException {
-    testOnJava9OrAbove(() -> {
-      String translation = translateSourceFile(
-          "public class Test { "
-              + "  public void test() { "
-              + "    Comparable<Runnable> c = new Comparable<>() { "
-              + "      @Override "
-              + "      public int compareTo(Runnable r) { "
-              + "        return 17; "
-              + "      } "
-              + "    }; "
-              + "  } "
-              + "} ",
-          "Test", "Test.m");
-      assertTranslation(translation, "@interface Test_1 : NSObject < JavaLangComparable >");
-      assertTranslation(translation, "- (int32_t)compareToWithId:(id<JavaLangRunnable>)r;");
-    });
+    String translation =
+        translateSourceFile(
+            "public class Test { "
+                + "  public void test() { "
+                + "    Comparable<Runnable> c = new Comparable<>() { "
+                + "      @Override "
+                + "      public int compareTo(Runnable r) { "
+                + "        return 17; "
+                + "      } "
+                + "    }; "
+                + "  } "
+                + "} ",
+            "Test",
+            "Test.m");
+    assertTranslation(translation, "@interface Test_1 : NSObject < JavaLangComparable >");
+    assertTranslation(translation, "- (int32_t)compareToWithId:(id<JavaLangRunnable>)r;");
   }
 }
diff --git a/translator/src/test/java/com/google/devtools/j2objc/translate/DefaultMethodsTest.java b/translator/src/test/java/com/google/devtools/j2objc/translate/DefaultMethodsTest.java
@@ -446,25 +446,25 @@ public void testClassInheritsOverridingMethodsWithDifferentSelectors() throws IO
   }
 
   public void testPrivateInterfaceMethod() throws IOException {
-    testOnJava9OrAbove(() -> {
-      String translation = translateSourceFile(
-          "public interface Test { "
-              + "  String name(); "
-              + "  default boolean isPalindrome() { "
-              + "    return name().equals(reverse(name())); "
-              + "  } "
-              + "  default boolean isPalindromeIgnoreCase() { "
-              + "    return name().equalsIgnoreCase(reverse(name())); "
-              + "  } "
-              + "  private String reverse(String s) { "
-              + "    return new StringBuilder(s).reverse().toString(); "
-              + " } "
-              + "}",
-          "Test", "Test.m");
-      assertTranslation(translation,
-          "NSString *Test_reverseWithNSString_(id<Test> self, NSString *s) {");
-      assertOccurrences(translation, "Test_reverseWithNSString_(self, [self name])", 2);
-      assertNotInTranslation(translation, "- (NSString *)reverseWithNSString:(NSString *)s {");
-    });
+    String translation =
+        translateSourceFile(
+            "public interface Test { "
+                + "  String name(); "
+                + "  default boolean isPalindrome() { "
+                + "    return name().equals(reverse(name())); "
+                + "  } "
+                + "  default boolean isPalindromeIgnoreCase() { "
+                + "    return name().equalsIgnoreCase(reverse(name())); "
+                + "  } "
+                + "  private String reverse(String s) { "
+                + "    return new StringBuilder(s).reverse().toString(); "
+                + " } "
+                + "}",
+            "Test",
+            "Test.m");
+    assertTranslation(
+        translation, "NSString *Test_reverseWithNSString_(id<Test> self, NSString *s) {");
+    assertOccurrences(translation, "Test_reverseWithNSString_(self, [self name])", 2);
+    assertNotInTranslation(translation, "- (NSString *)reverseWithNSString:(NSString *)s {");
   }
 }
diff --git a/translator/src/test/java/com/google/devtools/j2objc/translate/RewriterTest.java b/translator/src/test/java/com/google/devtools/j2objc/translate/RewriterTest.java
@@ -23,7 +23,6 @@
 import com.google.devtools.j2objc.ast.IfStatement;
 import com.google.devtools.j2objc.ast.LabeledStatement;
 import com.google.devtools.j2objc.ast.Statement;
-
 import java.io.IOException;
 import java.util.List;
 
@@ -478,46 +477,47 @@ public void testTryWithResourceAndCatch() throws IOException {
   }
 
   public void testTryWithResourceOnEffectivelyFinalVariable() throws IOException {
-    testOnJava9OrAbove(() -> {
-      String translation = translateSourceFile(
-          "import java.io.*; "
-              + "public class Test { "
-              + "  String test(String path) throws IOException { "
-              + "    BufferedReader br = new BufferedReader(new FileReader(path)); "
-              + "    try (br) { "
-              + "      return br.readLine(); "
-              + "    } "
-              + "  } "
-              + "} ",
-          "Test", "Test.m");
-      assertTranslatedLines(translation,
-          "JavaIoBufferedReader *br = create_JavaIoBufferedReader_initWithJavaIoReader_("
-              + "create_JavaIoFileReader_initWithNSString_(path));",
-          "{",
-          "  JavaLangThrowable *__primaryException1 = nil;",
-          "  @try {",
-          "    return [br readLine];",
-          "  }",
-          "  @catch (JavaLangThrowable *e) {",
-          "    __primaryException1 = e;",
-          "    @throw e;",
-          "  }",
-          "  @finally {",
-          "    if (br != nil) {",
-          "      if (__primaryException1 != nil) {",
-          "        @try {",
-          "          [br close];",
-          "        }",
-          "        @catch (JavaLangThrowable *e) {",
-          "          [__primaryException1 addSuppressedWithJavaLangThrowable:e];",
-          "        }",
-          "      }",
-          "      else {",
-          "        [br close];",
-          "      }",
-          "    }",
-          "  }",
-          "}");
-    });
+    String translation =
+        translateSourceFile(
+            "import java.io.*; "
+                + "public class Test { "
+                + "  String test(String path) throws IOException { "
+                + "    BufferedReader br = new BufferedReader(new FileReader(path)); "
+                + "    try (br) { "
+                + "      return br.readLine(); "
+                + "    } "
+                + "  } "
+                + "} ",
+            "Test",
+            "Test.m");
+    assertTranslatedLines(
+        translation,
+        "JavaIoBufferedReader *br = create_JavaIoBufferedReader_initWithJavaIoReader_("
+            + "create_JavaIoFileReader_initWithNSString_(path));",
+        "{",
+        "  JavaLangThrowable *__primaryException1 = nil;",
+        "  @try {",
+        "    return [br readLine];",
+        "  }",
+        "  @catch (JavaLangThrowable *e) {",
+        "    __primaryException1 = e;",
+        "    @throw e;",
+        "  }",
+        "  @finally {",
+        "    if (br != nil) {",
+        "      if (__primaryException1 != nil) {",
+        "        @try {",
+        "          [br close];",
+        "        }",
+        "        @catch (JavaLangThrowable *e) {",
+        "          [__primaryException1 addSuppressedWithJavaLangThrowable:e];",
+        "        }",
+        "      }",
+        "      else {",
+        "        [br close];",
+        "      }",
+        "    }",
+        "  }",
+        "}");
   }
 }
