Skip to content

Enable generic bytecode tests on JDK 17 #1561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msridhar merged 8 commits into from
May 3, 2026
+22 −19
Merged

Enable generic bytecode tests on JDK 17 #1561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
10a23a1
Enable tests on JDK 17
msridhar May 2, 2026
465e941
list toolchains
msridhar May 2, 2026
d2607aa
tweaks
msridhar May 2, 2026
950b2be
try again
msridhar May 2, 2026
7aca857
hopefully final tweak
msridhar May 2, 2026
157359d
try again
msridhar May 2, 2026
ec31262
tweak comment
msridhar May 2, 2026
d9a2727
tweak again
msridhar May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,33 @@ jobs:
with:
website: jdk.java.net
release: 27
- name: 'Set up Default JDK'
# Use Zulu for JDK 17 on Windows, as Temurin build of 17.0.19 is still not released
- name: 'Set up Zulu JDK 17 on Windows'
uses: actions/setup-java@v5
with:
java-version: 25
java-version: 17
distribution: 'zulu'
check-latest: 'true'
if: runner.os == 'Windows'
- name: 'Set up Temurin JDK 17'
uses: actions/setup-java@v5
with:
java-version: 17
distribution: 'temurin'
check-latest: 'true'
if: runner.os != 'Windows'
- name: 'Set up JDKs'
uses: actions/setup-java@v5
with:
java-version: |
21
25
distribution: 'temurin'
check-latest: 'true'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v5
- name: List toolchains
run: ./gradlew javaToolchains
- name: Build and test
run: ./gradlew build
- name: Run shellcheck
Expand Down
9 changes: 0 additions & 9 deletions ...nit-tests/src/test/java/com/uber/nullaway/guava/NullAwayGuavaParametricNullnessTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.uber.nullaway.generics.JSpecifyJavacConfig;
import java.util.Arrays;
import java.util.List;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -86,8 +85,6 @@ public void testFutureCallbackParametricNullness() {

@Test
public void jspecifyFutureCallback() {
// to ensure javac reads proper generic types from the Guava jar
Assume.assumeTrue(Runtime.version().feature() >= 21);
jspecifyCompilationHelper
.addSourceLines(
"Test.java",
Expand Down Expand Up @@ -134,8 +131,6 @@ public void testIterableParametricNullness() {

@Test
public void jspecifyIterables() {
// to ensure javac reads proper generic types from the Guava jar
Assume.assumeTrue(Runtime.version().feature() >= 21);
jspecifyCompilationHelper
.addSourceLines(
"Test.java",
Expand Down Expand Up @@ -164,8 +159,6 @@ public void jspecifyIterables() {

@Test
public void jspecifyComparators() {
// to ensure javac reads proper generic types from the Guava jar
Assume.assumeTrue(Runtime.version().feature() >= 21);
jspecifyCompilationHelper
.addSourceLines(
"Test.java",
Expand Down Expand Up @@ -246,8 +239,6 @@ public void testFunctionMethodOverride() {

@Test
public void newHashSetPassingNullable() {
// to ensure javac reads proper generic types from the Guava jar
Assume.assumeTrue(Runtime.version().feature() >= 21);
jspecifyCompilationHelper
.addSourceLines(
"Test.java",
Expand Down
8 changes: 0 additions & 8 deletions nullaway/src/test/java/com/uber/nullaway/jspecify/BytecodeGenericsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.uber.nullaway.NullAwayTestsBase;
import com.uber.nullaway.generics.JSpecifyJavacConfig;
import java.util.List;
import org.junit.Assume;
import org.junit.Test;

public class BytecodeGenericsTests extends NullAwayTestsBase {
Expand Down Expand Up @@ -83,8 +82,6 @@ static void testNegative(NullableTypeParam<@Nullable String> t1) {

@Test
public void genericsChecksForFieldAssignments() {
// to read annotations properly from bytecode
Assume.assumeTrue(Runtime.version().feature() >= 21);
makeHelper()
.addSourceLines(
"Test.java",
Expand All @@ -110,9 +107,6 @@ static void testNegative(NullableTypeParam<@Nullable String> t1) {

@Test
public void genericsChecksForParamPassingAndReturns() {
// to read annotations properly from bytecode
Assume.assumeTrue(Runtime.version().feature() >= 21);

makeHelper()
.addSourceLines(
"Test.java",
Expand Down Expand Up @@ -245,8 +239,6 @@ static void useTestFunc(String s) {

@Test
public void callMethodTakingJavaUtilFunction() {
// to read annotations properly from bytecode
Assume.assumeTrue(Runtime.version().feature() >= 21);
makeHelper()
.addSourceLines(
"Test.java",
Expand Down
Loading