Skip to content

Commit ec24a53

Browse files
tomballcopybara-github
tomball
authored and
copybara-github
committed
Remove obsolete Java version checks in tests.
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
1 parent f0a8fe1 commit ec24a53

File tree

5 files changed

+112
-134
lines changed

5 files changed

+112
-134
lines changed

‎translator/src/test/java/com/google/devtools/j2objc/GenerationTest.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -839,22 +839,6 @@ protected interface TestLambda {
839839
void run() throws IOException;
840840
}
841841

842-
protected void testOnJava9OrAbove(TestLambda test) throws IOException {
843-
if (onJava9OrAbove()) {
844-
SourceVersion.setMaxSupportedVersion(SourceVersion.JAVA_9);
845-
options.setSourceVersion(SourceVersion.JAVA_9);
846-
test.run();
847-
}
848-
}
849-
850-
protected void testOnJava11OrAbove(TestLambda test) throws IOException {
851-
if (onJava11OrAbove()) {
852-
SourceVersion.setMaxSupportedVersion(SourceVersion.JAVA_11);
853-
options.setSourceVersion(SourceVersion.JAVA_11);
854-
test.run();
855-
}
856-
}
857-
858842
protected void testOnJava16OrAbove(TestLambda test) throws IOException {
859843
if (onJava16OrAbove()) {
860844
SourceVersion.setMaxSupportedVersion(SourceVersion.JAVA_16);

‎translator/src/test/java/com/google/devtools/j2objc/gen/StatementGeneratorTest.java‎

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,50 +1899,43 @@ public void testEmptyStatementFormatting() throws IOException {
18991899

19001900
@SuppressWarnings("StringConcatToTextBlock")
19011901
public void testVarLocalVariables() throws IOException {
1902-
testOnJava11OrAbove(
1903-
() -> {
1904-
String translation =
1905-
translateSourceFile(
1906-
String.join(
1907-
"\n",
1908-
"import java.util.ArrayList;",
1909-
"import java.util.stream.Stream;",
1910-
"class Test {",
1911-
" Stream test() {",
1912-
" var list = new ArrayList<String>();",
1913-
" var stream = list.stream();",
1914-
" return stream;",
1915-
" }",
1916-
"}"),
1917-
"Test",
1918-
"Test.m");
1919-
// Verify correct type inference.
1920-
assertTranslation(
1921-
translation, "JavaUtilArrayList *list = create_JavaUtilArrayList_init();");
1922-
assertTranslation(translation, "id<JavaUtilStreamStream> stream = [list stream];");
1923-
});
1902+
String translation =
1903+
translateSourceFile(
1904+
String.join(
1905+
"\n",
1906+
"import java.util.ArrayList;",
1907+
"import java.util.stream.Stream;",
1908+
"class Test {",
1909+
" Stream test() {",
1910+
" var list = new ArrayList<String>();",
1911+
" var stream = list.stream();",
1912+
" return stream;",
1913+
" }",
1914+
"}"),
1915+
"Test",
1916+
"Test.m");
1917+
// Verify correct type inference.
1918+
assertTranslation(translation, "JavaUtilArrayList *list = create_JavaUtilArrayList_init();");
1919+
assertTranslation(translation, "id<JavaUtilStreamStream> stream = [list stream];");
19241920
}
19251921

19261922
@SuppressWarnings("StringConcatToTextBlock")
19271923
public void testVarLambdaExpressionParameter() throws IOException {
1928-
testOnJava11OrAbove(
1929-
() -> {
1930-
String translation =
1931-
translateSourceFile(
1932-
String.join(
1933-
"\n",
1934-
"import java.util.function.Function;",
1935-
"class Test {",
1936-
" int test(String input) {",
1937-
" Function<String, Integer> f = (var s) -> s.length();",
1938-
" return f.apply(input);",
1939-
" }",
1940-
"}"),
1941-
"Test",
1942-
"Test.m");
1943-
assertTranslation(
1944-
translation, "@interface Test_$Lambda$1 : NSObject < JavaUtilFunctionFunction >");
1945-
});
1924+
String translation =
1925+
translateSourceFile(
1926+
String.join(
1927+
"\n",
1928+
"import java.util.function.Function;",
1929+
"class Test {",
1930+
" int test(String input) {",
1931+
" Function<String, Integer> f = (var s) -> s.length();",
1932+
" return f.apply(input);",
1933+
" }",
1934+
"}"),
1935+
"Test",
1936+
"Test.m");
1937+
assertTranslation(
1938+
translation, "@interface Test_$Lambda$1 : NSObject < JavaUtilFunctionFunction >");
19461939
}
19471940

19481941
@SuppressWarnings("StringConcatToTextBlock")

‎translator/src/test/java/com/google/devtools/j2objc/translate/AnonymousClassConverterTest.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ public void testEnumWithParametersAndInnerClasses() throws IOException {
421421
assertTranslation(impl, "Color_1_initWithInt_withNSString_withInt_(e, 42, @\"RED\", 0)");
422422
}
423423

424+
@SuppressWarnings("StringConcatToTextBlock")
424425
public void testEnumWithInnerEnum() throws IOException {
425426
String impl = translateSourceFile(
426427
"public enum OuterValue {\n"
@@ -554,21 +555,21 @@ public void testGenericConstructorCalledByAnonymousClass() throws IOException {
554555
}
555556

556557
public void testAnonymousClassWithDiamondOperator() throws IOException {
557-
testOnJava9OrAbove(() -> {
558-
String translation = translateSourceFile(
559-
"public class Test { "
560-
+ " public void test() { "
561-
+ " Comparable<Runnable> c = new Comparable<>() { "
562-
+ " @Override "
563-
+ " public int compareTo(Runnable r) { "
564-
+ " return 17; "
565-
+ " } "
566-
+ " }; "
567-
+ " } "
568-
+ "} ",
569-
"Test", "Test.m");
570-
assertTranslation(translation, "@interface Test_1 : NSObject < JavaLangComparable >");
571-
assertTranslation(translation, "- (int32_t)compareToWithId:(id<JavaLangRunnable>)r;");
572-
});
558+
String translation =
559+
translateSourceFile(
560+
"public class Test { "
561+
+ " public void test() { "
562+
+ " Comparable<Runnable> c = new Comparable<>() { "
563+
+ " @Override "
564+
+ " public int compareTo(Runnable r) { "
565+
+ " return 17; "
566+
+ " } "
567+
+ " }; "
568+
+ " } "
569+
+ "} ",
570+
"Test",
571+
"Test.m");
572+
assertTranslation(translation, "@interface Test_1 : NSObject < JavaLangComparable >");
573+
assertTranslation(translation, "- (int32_t)compareToWithId:(id<JavaLangRunnable>)r;");
573574
}
574575
}

‎translator/src/test/java/com/google/devtools/j2objc/translate/DefaultMethodsTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -446,25 +446,25 @@ public void testClassInheritsOverridingMethodsWithDifferentSelectors() throws IO
446446
}
447447

448448
public void testPrivateInterfaceMethod() throws IOException {
449-
testOnJava9OrAbove(() -> {
450-
String translation = translateSourceFile(
451-
"public interface Test { "
452-
+ " String name(); "
453-
+ " default boolean isPalindrome() { "
454-
+ " return name().equals(reverse(name())); "
455-
+ " } "
456-
+ " default boolean isPalindromeIgnoreCase() { "
457-
+ " return name().equalsIgnoreCase(reverse(name())); "
458-
+ " } "
459-
+ " private String reverse(String s) { "
460-
+ " return new StringBuilder(s).reverse().toString(); "
461-
+ " } "
462-
+ "}",
463-
"Test", "Test.m");
464-
assertTranslation(translation,
465-
"NSString *Test_reverseWithNSString_(id<Test> self, NSString *s) {");
466-
assertOccurrences(translation, "Test_reverseWithNSString_(self, [self name])", 2);
467-
assertNotInTranslation(translation, "- (NSString *)reverseWithNSString:(NSString *)s {");
468-
});
449+
String translation =
450+
translateSourceFile(
451+
"public interface Test { "
452+
+ " String name(); "
453+
+ " default boolean isPalindrome() { "
454+
+ " return name().equals(reverse(name())); "
455+
+ " } "
456+
+ " default boolean isPalindromeIgnoreCase() { "
457+
+ " return name().equalsIgnoreCase(reverse(name())); "
458+
+ " } "
459+
+ " private String reverse(String s) { "
460+
+ " return new StringBuilder(s).reverse().toString(); "
461+
+ " } "
462+
+ "}",
463+
"Test",
464+
"Test.m");
465+
assertTranslation(
466+
translation, "NSString *Test_reverseWithNSString_(id<Test> self, NSString *s) {");
467+
assertOccurrences(translation, "Test_reverseWithNSString_(self, [self name])", 2);
468+
assertNotInTranslation(translation, "- (NSString *)reverseWithNSString:(NSString *)s {");
469469
}
470470
}

‎translator/src/test/java/com/google/devtools/j2objc/translate/RewriterTest.java‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.google.devtools.j2objc.ast.IfStatement;
2424
import com.google.devtools.j2objc.ast.LabeledStatement;
2525
import com.google.devtools.j2objc.ast.Statement;
26-
2726
import java.io.IOException;
2827
import java.util.List;
2928

@@ -478,46 +477,47 @@ public void testTryWithResourceAndCatch() throws IOException {
478477
}
479478

480479
public void testTryWithResourceOnEffectivelyFinalVariable() throws IOException {
481-
testOnJava9OrAbove(() -> {
482-
String translation = translateSourceFile(
483-
"import java.io.*; "
484-
+ "public class Test { "
485-
+ " String test(String path) throws IOException { "
486-
+ " BufferedReader br = new BufferedReader(new FileReader(path)); "
487-
+ " try (br) { "
488-
+ " return br.readLine(); "
489-
+ " } "
490-
+ " } "
491-
+ "} ",
492-
"Test", "Test.m");
493-
assertTranslatedLines(translation,
494-
"JavaIoBufferedReader *br = create_JavaIoBufferedReader_initWithJavaIoReader_("
495-
+ "create_JavaIoFileReader_initWithNSString_(path));",
496-
"{",
497-
" JavaLangThrowable *__primaryException1 = nil;",
498-
" @try {",
499-
" return [br readLine];",
500-
" }",
501-
" @catch (JavaLangThrowable *e) {",
502-
" __primaryException1 = e;",
503-
" @throw e;",
504-
" }",
505-
" @finally {",
506-
" if (br != nil) {",
507-
" if (__primaryException1 != nil) {",
508-
" @try {",
509-
" [br close];",
510-
" }",
511-
" @catch (JavaLangThrowable *e) {",
512-
" [__primaryException1 addSuppressedWithJavaLangThrowable:e];",
513-
" }",
514-
" }",
515-
" else {",
516-
" [br close];",
517-
" }",
518-
" }",
519-
" }",
520-
"}");
521-
});
480+
String translation =
481+
translateSourceFile(
482+
"import java.io.*; "
483+
+ "public class Test { "
484+
+ " String test(String path) throws IOException { "
485+
+ " BufferedReader br = new BufferedReader(new FileReader(path)); "
486+
+ " try (br) { "
487+
+ " return br.readLine(); "
488+
+ " } "
489+
+ " } "
490+
+ "} ",
491+
"Test",
492+
"Test.m");
493+
assertTranslatedLines(
494+
translation,
495+
"JavaIoBufferedReader *br = create_JavaIoBufferedReader_initWithJavaIoReader_("
496+
+ "create_JavaIoFileReader_initWithNSString_(path));",
497+
"{",
498+
" JavaLangThrowable *__primaryException1 = nil;",
499+
" @try {",
500+
" return [br readLine];",
501+
" }",
502+
" @catch (JavaLangThrowable *e) {",
503+
" __primaryException1 = e;",
504+
" @throw e;",
505+
" }",
506+
" @finally {",
507+
" if (br != nil) {",
508+
" if (__primaryException1 != nil) {",
509+
" @try {",
510+
" [br close];",
511+
" }",
512+
" @catch (JavaLangThrowable *e) {",
513+
" [__primaryException1 addSuppressedWithJavaLangThrowable:e];",
514+
" }",
515+
" }",
516+
" else {",
517+
" [br close];",
518+
" }",
519+
" }",
520+
" }",
521+
"}");
522522
}
523523
}

0 commit comments

Comments
 (0)