Rename test classes

jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/NullAwayInstanceOfBindingTests.java → jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/InstanceOfBindingTests.java

@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-public class NullAwayInstanceOfBindingTests {
+public class InstanceOfBindingTests {
 
   @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 

jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/NullAwayModuleInfoTests.java → jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/ModuleInfoTests.java

@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-public class NullAwayModuleInfoTests {
+public class ModuleInfoTests {
 
   @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 

jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/NullAwayOptionalEmptyTests.java → jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/OptionalEmptyTests.java

@@ -10,7 +10,7 @@
 import org.junit.rules.TemporaryFolder;
 
 /** Tests for support of the {@code Optional.isEmpty()} API. This API was introduced in JDK 11. */
-public class NullAwayOptionalEmptyTests {
+public class OptionalEmptyTests {
 
   @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 

jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/NullAwayRecordTests.java → jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/RecordTests.java

@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-public class NullAwayRecordTests {
+public class RecordTests {
 
   @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 

jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/NullAwaySwitchTests.java → jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/SwitchTests.java

@@ -30,7 +30,7 @@
 import org.junit.rules.TemporaryFolder;
 
 /** NullAway unit tests involving language features available on JDK 17 but not JDK 11. */
-public class NullAwaySwitchTests {
+public class SwitchTests {
 
   @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 

nullaway/build.gradle

@@ -124,9 +124,9 @@ def jdk8Test = tasks.register("testJdk8", Test) {
     jvmArgs "-Xbootclasspath/p:${configurations.errorproneJavac.asPath}"
     filter {
         // JDK 8 does not support diamonds on anonymous classes
-        excludeTestsMatching "com.uber.nullaway.NullAwayJSpecifyGenericsTests.overrideDiamondAnonymousClass"
+        excludeTestsMatching "com.uber.nullaway.jspecify.GenericsTests.overrideDiamondAnonymousClass"
         // tests cannot run on JDK 8 since Mockito version no longer supports it
-        excludeTestsMatching "com.uber.nullaway.NullAwaySerializationTest.initializationError"
+        excludeTestsMatching "com.uber.nullaway.SerializationTest.initializationError"
         excludeTestsMatching "com.uber.nullaway.handlers.contract.ContractUtilsTest.getEmptyAntecedent"
     }
 }

nullaway/src/test/java/com/uber/nullaway/NullAwayAccessPathsTests.java → nullaway/src/test/java/com/uber/nullaway/AccessPathsTests.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-public class NullAwayAccessPathsTests extends NullAwayTestsBase {
+public class AccessPathsTests extends NullAwayTestsBase {
 
   @Test
   public void testConstantsInAccessPathsNegative() {

nullaway/src/test/java/com/uber/nullaway/NullAwayAcknowledgeRestrictiveAnnotationsTests.java → nullaway/src/test/java/com/uber/nullaway/AcknowledgeRestrictiveAnnotationsTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayAcknowledgeRestrictiveAnnotationsTests extends NullAwayTestsBase {
+public class AcknowledgeRestrictiveAnnotationsTests extends NullAwayTestsBase {
 
   @Test
   public void generatedAsUnannotatedPlusRestrictive() {

nullaway/src/test/java/com/uber/nullaway/NullAwayAndroidTest.java → nullaway/src/test/java/com/uber/nullaway/AndroidTest.java

@@ -11,7 +11,7 @@
 
 /** Unit tests for {@link com.uber.nullaway.NullAway}. */
 @RunWith(JUnit4.class)
-public class NullAwayAndroidTest {
+public class AndroidTest {
   @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
   private CompilationTestHelper compilationHelper;

nullaway/src/test/java/com/uber/nullaway/NullAwayAssertionLibsTests.java → nullaway/src/test/java/com/uber/nullaway/AssertionLibsTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayAssertionLibsTests extends NullAwayTestsBase {
+public class AssertionLibsTests extends NullAwayTestsBase {
 
   @Test
   public void supportTruthAssertThatIsNotNull_Object() {

nullaway/src/test/java/com/uber/nullaway/NullAwayAutoSuggestNoCastTest.java → nullaway/src/test/java/com/uber/nullaway/AutoSuggestNoCastTest.java

@@ -30,7 +30,7 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class NullAwayAutoSuggestNoCastTest {
+public class AutoSuggestNoCastTest {
 
   @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
 

nullaway/src/test/java/com/uber/nullaway/NullAwayAutoSuggestTest.java → nullaway/src/test/java/com/uber/nullaway/AutoSuggestTest.java

@@ -35,7 +35,7 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class NullAwayAutoSuggestTest {
+public class AutoSuggestTest {
 
   @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
 

nullaway/src/test/java/com/uber/nullaway/NullAwayBytecodeInteractionsTests.java → nullaway/src/test/java/com/uber/nullaway/BytecodeInteractionsTests.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-public class NullAwayBytecodeInteractionsTests extends NullAwayTestsBase {
+public class BytecodeInteractionsTests extends NullAwayTestsBase {
   @Test
   public void typeUseJarReturn() {
     defaultCompilationHelper

nullaway/src/test/java/com/uber/nullaway/NullAwayContractsBooleanTests.java → nullaway/src/test/java/com/uber/nullaway/ContractsBooleanTests.java

@@ -4,7 +4,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayContractsBooleanTests extends NullAwayTestsBase {
+public class ContractsBooleanTests extends NullAwayTestsBase {
 
   @Test
   public void nonNullCheckIsTrueIsNotNullable() {

nullaway/src/test/java/com/uber/nullaway/NullAwayContractsTests.java → nullaway/src/test/java/com/uber/nullaway/ContractsTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayContractsTests extends NullAwayTestsBase {
+public class ContractsTests extends NullAwayTestsBase {
 
   @Test
   public void checkContractPositiveCases() {

nullaway/src/test/java/com/uber/nullaway/NullAwayCoreTests.java → nullaway/src/test/java/com/uber/nullaway/CoreTests.java

@@ -29,7 +29,7 @@
 
 /** Unit tests for {@link com.uber.nullaway.NullAway}. */
 @RunWith(JUnit4.class)
-public class NullAwayCoreTests extends NullAwayTestsBase {
+public class CoreTests extends NullAwayTestsBase {
 
   @Test
   public void coreNullabilityPositiveCases() {

nullaway/src/test/java/com/uber/nullaway/NullAwayCustomLibraryModelsTests.java → nullaway/src/test/java/com/uber/nullaway/CustomLibraryModelsTests.java

@@ -29,7 +29,7 @@
 import java.util.List;
 import org.junit.Test;
 
-public class NullAwayCustomLibraryModelsTests extends NullAwayTestsBase {
+public class CustomLibraryModelsTests extends NullAwayTestsBase {
 
   private CompilationTestHelper makeLibraryModelsTestHelperWithArgs(List<String> args) {
     // Adding directly to args will throw an UnsupportedOperationException, since that list is

nullaway/src/test/java/com/uber/nullaway/NullAwayEnsuresNonNullTests.java → nullaway/src/test/java/com/uber/nullaway/EnsuresNonNullTests.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-public class NullAwayEnsuresNonNullTests extends NullAwayTestsBase {
+public class EnsuresNonNullTests extends NullAwayTestsBase {
 
   @Test
   public void requiresNonNullInterpretation() {

nullaway/src/test/java/com/uber/nullaway/NullAwayFrameworkTests.java → nullaway/src/test/java/com/uber/nullaway/FrameworkTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayFrameworkTests extends NullAwayTestsBase {
+public class FrameworkTests extends NullAwayTestsBase {
   @Test
   public void lombokSupportTesting() {
     defaultCompilationHelper.addSourceFile("lombok/LombokBuilderInit.java").doTest();

nullaway/src/test/java/com/uber/nullaway/NullAwayFunctionalInterfaceNullabilityTests.java → nullaway/src/test/java/com/uber/nullaway/FunctionalInterfaceNullabilityTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayFunctionalInterfaceNullabilityTests extends NullAwayTestsBase {
+public class FunctionalInterfaceNullabilityTests extends NullAwayTestsBase {
 
   @Test
   public void multipleTypeParametersInstantiation() {

nullaway/src/test/java/com/uber/nullaway/NullAwayGuavaAssertionsTests.java → nullaway/src/test/java/com/uber/nullaway/GuavaAssertionsTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayGuavaAssertionsTests extends NullAwayTestsBase {
+public class GuavaAssertionsTests extends NullAwayTestsBase {
 
   @Test
   public void checkNotNullTest() {

nullaway/src/test/java/com/uber/nullaway/NullAwayInitializationTests.java → nullaway/src/test/java/com/uber/nullaway/InitializationTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayInitializationTests extends NullAwayTestsBase {
+public class InitializationTests extends NullAwayTestsBase {
   @Test
   public void initFieldPositiveCases() {
     defaultCompilationHelper.addSourceFile("CheckFieldInitPositiveCases.java").doTest();

nullaway/src/test/java/com/uber/nullaway/NullAwayJava8Tests.java → nullaway/src/test/java/com/uber/nullaway/Java8Tests.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-public class NullAwayJava8Tests extends NullAwayTestsBase {
+public class Java8Tests extends NullAwayTestsBase {
   @Test
   public void java8PositiveCases() {
     defaultCompilationHelper.addSourceFile("NullAwayJava8PositiveCases.java").doTest();

nullaway/src/test/java/com/uber/nullaway/NullAwayKeySetIteratorTests.java → nullaway/src/test/java/com/uber/nullaway/KeySetIteratorTests.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-public class NullAwayKeySetIteratorTests extends NullAwayTestsBase {
+public class KeySetIteratorTests extends NullAwayTestsBase {
 
   @Test
   public void mapKeySetIteratorBasic() {

nullaway/src/test/java/com/uber/nullaway/NullAwayOptionalEmptinessTests.java → nullaway/src/test/java/com/uber/nullaway/OptionalEmptinessTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayOptionalEmptinessTests extends NullAwayTestsBase {
+public class OptionalEmptinessTests extends NullAwayTestsBase {
 
   @Test
   public void optionalEmptinessHandlerTest() {

nullaway/src/test/java/com/uber/nullaway/NullAwaySerializationTest.java → nullaway/src/test/java/com/uber/nullaway/SerializationTest.java

@@ -56,7 +56,7 @@
 
 /** Unit tests for {@link com.uber.nullaway.NullAway}. */
 @RunWith(JUnit4.class)
-public class NullAwaySerializationTest extends NullAwayTestsBase {
+public class SerializationTest extends NullAwayTestsBase {
   private String configPath;
   private Path root;
   private final DisplayFactory<FixDisplay> fixDisplayFactory;
@@ -71,7 +71,7 @@ public class NullAwaySerializationTest extends NullAwayTestsBase {
   private static final String FIELD_INIT_FILE_NAME = "field_init.tsv";
   private static final String FIELD_INIT_HEADER = FieldInitializationInfo.header();
 
-  public NullAwaySerializationTest() {
+  public SerializationTest() {
     this.fixDisplayFactory =
         values -> {
           Preconditions.checkArgument(

nullaway/src/test/java/com/uber/nullaway/NullAwayThriftTests.java → nullaway/src/test/java/com/uber/nullaway/ThriftTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayThriftTests extends NullAwayTestsBase {
+public class ThriftTests extends NullAwayTestsBase {
   @Test
   public void testThriftIsSet() {
     defaultCompilationHelper

nullaway/src/test/java/com/uber/nullaway/NullAwayTypeUseAnnotationsTests.java → nullaway/src/test/java/com/uber/nullaway/TypeUseAnnotationsTests.java

@@ -27,7 +27,7 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class NullAwayTypeUseAnnotationsTests extends NullAwayTestsBase {
+public class TypeUseAnnotationsTests extends NullAwayTestsBase {
 
   @Test
   public void annotationAppliedToTypeParameter() {
@@ -230,4 +230,37 @@ public void typeUseAnnotationOnInnerMultiLevel() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void typeParameterAnnotationIsDistinctFromMethodReturnAnnotation() {
+    defaultCompilationHelper
+        .addSourceLines(
+            "Test.java",
+            "package com.uber;",
+            "import org.jspecify.annotations.Nullable;",
+            "import java.util.function.Supplier;",
+            "public class Test {",
+            "  public static <R> @Nullable Supplier<@Nullable R> getNullableSupplierOfNullable() {",
+            "    return new Supplier<R>() {",
+            "      @Nullable",
+            "      public R get() { return null; }",
+            "    };",
+            "  }",
+            "  public static <R> Supplier<@Nullable R> getNonNullSupplierOfNullable() {",
+            "    return new Supplier<R>() {",
+            "      @Nullable",
+            "      public R get() { return null; }",
+            "    };",
+            "  }",
+            "  public static String test1() {",
+            "    // BUG: Diagnostic contains: dereferenced expression getNullableSupplierOfNullable() is @Nullable",
+            "    return getNullableSupplierOfNullable().toString();",
+            "  }",
+            "  public static String test2() {",
+            "    // The supplier contains null, but isn't itself nullable. Check against a past FP",
+            "    return getNonNullSupplierOfNullable().toString();",
+            "  }",
+            "}")
+        .doTest();
+  }
 }

nullaway/src/test/java/com/uber/nullaway/NullAwayUnannotatedTests.java → nullaway/src/test/java/com/uber/nullaway/UnannotatedTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayUnannotatedTests extends NullAwayTestsBase {
+public class UnannotatedTests extends NullAwayTestsBase {
 
   @Test
   public void coreNullabilitySkipClass() {

nullaway/src/test/java/com/uber/nullaway/NullAwayUnsoundnessTests.java → nullaway/src/test/java/com/uber/nullaway/UnsoundnessTests.java

@@ -6,7 +6,7 @@
 import org.junit.Test;
 
 /** Unit tests showing cases where NullAway is unsound. Useful for documentation purposes. */
-public class NullAwayUnsoundnessTests extends NullAwayTestsBase {
+public class UnsoundnessTests extends NullAwayTestsBase {
 
   @Before
   @Override

nullaway/src/test/java/com/uber/nullaway/NullAwayVarargsTests.java → nullaway/src/test/java/com/uber/nullaway/VarargsTests.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayVarargsTests extends NullAwayTestsBase {
+public class VarargsTests extends NullAwayTestsBase {
 
   @Test
   public void testNonNullVarargs() {

nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyArrayTests.java → nullaway/src/test/java/com/uber/nullaway/jspecify/ArrayTests.java

@@ -1,10 +1,11 @@
-package com.uber.nullaway;
+package com.uber.nullaway.jspecify;
 
 import com.google.errorprone.CompilationTestHelper;
+import com.uber.nullaway.NullAwayTestsBase;
 import java.util.Arrays;
 import org.junit.Test;
 
-public class NullAwayJSpecifyArrayTests extends NullAwayTestsBase {
+public class ArrayTests extends NullAwayTestsBase {
 
   @Test
   public void arrayTopLevelAnnotationDereference() {

nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericMethodTests.java → nullaway/src/test/java/com/uber/nullaway/jspecify/GenericMethodTests.java

@@ -1,11 +1,12 @@
-package com.uber.nullaway;
+package com.uber.nullaway.jspecify;
 
 import com.google.errorprone.CompilationTestHelper;
+import com.uber.nullaway.NullAwayTestsBase;
 import java.util.Arrays;
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class NullAwayJSpecifyGenericMethodTests extends NullAwayTestsBase {
+public class GenericMethodTests extends NullAwayTestsBase {
 
   @Test
   @Ignore("requires generic method support")