Refactorings for Google-internal change

7 files changed, 21 insertions, 23 deletions

diff --git a/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameter.java b/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameter.java
index 240a57b..8e78e7c 100644
--- a/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameter.java
+++ b/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameter.java
@@ -34,7 +34,6 @@ import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 
 /**
  * Test parameter annotation that defines the values that a single parameter can have.
@@ -140,7 +139,7 @@ public @interface TestParameter {
      *
      * <p>Do not override this method.
      */
-    default TestParameterValue value(@Nullable Object wrappedValue) {
+    default TestParameterValue value(@javax.annotation.Nullable Object wrappedValue) {
       return TestParameterValue.wrap(wrappedValue);
     }
   }
diff --git a/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameterValuesProvider.java b/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameterValuesProvider.java
index 078026a..129d514 100644
--- a/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameterValuesProvider.java
+++ b/junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameterValuesProvider.java
@@ -60,7 +60,7 @@ public abstract class TestParameterValuesProvider
   @Override
   public final TestParameterValue value(@Nullable Object wrappedValue) {
     // Overriding this method as final because it is not supposed to be overwritten
-    return TestParameter.TestParameterValuesProvider.super.value(wrappedValue);
+    return TestParameterValue.wrap(wrappedValue);
   }
 
   /**
diff --git a/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterAnnotationMethodProcessorTest.java b/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterAnnotationMethodProcessorTest.java
index df3a16b..458b623 100644
--- a/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterAnnotationMethodProcessorTest.java
+++ b/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterAnnotationMethodProcessorTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertThrows;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.testing.junit.testparameterinjector.SharedTestUtilitiesJUnit4.SuccessfulTestCaseBase;
-import com.google.testing.junit.testparameterinjector.TestParameter.TestParameterValuesProvider;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Retention;
 import java.util.Arrays;
@@ -272,9 +271,9 @@ public class TestParameterAnnotationMethodProcessorTest {
       storeTestParametersForThisTest(testString);
     }
 
-    private static final class Test2Provider implements TestParameterValuesProvider {
+    private static final class Test2Provider extends TestParameterValuesProvider {
       @Override
-      public List<Object> provideValues() {
+      public List<Object> provideValues(TestParameterValuesProvider.Context context) {
         return newArrayList(123, "123", "null", null);
       }
     }
@@ -660,9 +659,9 @@ public class TestParameterAnnotationMethodProcessorTest {
     public void test(@TestParameter(valuesProvider = NonStaticProvider.class) int i) {}
 
     @SuppressWarnings("ClassCanBeStatic")
-    class NonStaticProvider implements TestParameterValuesProvider {
+    class NonStaticProvider extends TestParameterValuesProvider {
       @Override
-      public List<?> provideValues() {
+      public List<?> provideValues(TestParameterValuesProvider.Context context) {
         return ImmutableList.of();
       }
     }
diff --git a/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterInjectorKotlinTest.kt b/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterInjectorKotlinTest.kt
index e015533..10ce60e 100644
--- a/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterInjectorKotlinTest.kt
+++ b/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterInjectorKotlinTest.kt
@@ -17,7 +17,6 @@ package com.google.testing.junit.testparameterinjector
 import com.google.common.collect.ImmutableList
 import com.google.common.collect.ImmutableMap
 import com.google.testing.junit.testparameterinjector.SharedTestUtilitiesJUnit4.SuccessfulTestCaseBase
-import com.google.testing.junit.testparameterinjector.TestParameter.TestParameterValuesProvider
 import java.util.Arrays
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -148,8 +147,8 @@ class TestParameterInjectorKotlinTest {
         .buildOrThrow()
     }
 
-    private class DoubleValueClassProvider : TestParameterValuesProvider {
-      override fun provideValues(): List<DoubleValueClass> {
+    private class DoubleValueClassProvider : TestParameterValuesProvider() {
+      override fun provideValues(context: Context): List<DoubleValueClass> {
         return ImmutableList.of(DoubleValueClass(1.0), DoubleValueClass(2.5))
       }
     }
@@ -262,6 +261,7 @@ class TestParameterInjectorKotlinTest {
         .collect(ImmutableList.toImmutableList())
     }
   }
+
   annotation class RunAsTest
 
   enum class Color {
@@ -269,7 +269,10 @@ class TestParameterInjectorKotlinTest {
     BLUE,
     GREEN
   }
+
   @JvmInline value class ColorValueClass(val onlyValue: Color)
+
   @JvmInline value class StringValueClass(val onlyValue: String)
+
   @JvmInline value class DoubleValueClass(val onlyValue: Double)
 }
diff --git a/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterTest.java b/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterTest.java
index 61534e6..d5d3c96 100644
--- a/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterTest.java
+++ b/junit4/src/test/java/com/google/testing/junit/testparameterinjector/TestParameterTest.java
@@ -21,6 +21,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import com.google.common.base.CharMatcher;
 import com.google.common.collect.ImmutableMap;
 import com.google.testing.junit.testparameterinjector.SharedTestUtilitiesJUnit4.SuccessfulTestCaseBase;
+import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider.Context;
 import java.lang.annotation.Retention;
 import java.util.Arrays;
 import java.util.Collection;
@@ -195,27 +196,24 @@ public class TestParameterTest {
           .build();
     }
 
-    private static final class TestNumberProvider
-        implements TestParameter.TestParameterValuesProvider {
+    private static final class TestNumberProvider extends TestParameterValuesProvider {
       @Override
-      public List<?> provideValues() {
+      public List<?> provideValues(Context context) {
         return newArrayList(value(1).withName("one"), 2);
       }
     }
 
-    private static final class TestStringProvider
-        implements TestParameter.TestParameterValuesProvider {
+    private static final class TestStringProvider extends TestParameterValuesProvider {
       @Override
-      public List<?> provideValues() {
+      public List<?> provideValues(Context context) {
         return newArrayList(
             "A", "B", null, value(null).withName("nothing"), value("harry").withName("wizard"));
       }
     }
 
-    private static final class CharMatcherProvider
-        implements TestParameter.TestParameterValuesProvider {
+    private static final class CharMatcherProvider extends TestParameterValuesProvider {
       @Override
-      public List<CharMatcher> provideValues() {
+      public List<CharMatcher> provideValues(Context context) {
         return newArrayList(CharMatcher.any(), CharMatcher.ascii(), CharMatcher.whitespace());
       }
     }
diff --git a/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameter.java b/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameter.java
index e294f6d..9798c2f 100644
--- a/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameter.java
+++ b/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameter.java
@@ -34,7 +34,6 @@ import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 
 /**
  * Test parameter annotation that defines the values that a single parameter can have.
@@ -140,7 +139,7 @@ public @interface TestParameter {
      *
      * <p>Do not override this method.
      */
-    default TestParameterValue value(@Nullable Object wrappedValue) {
+    default TestParameterValue value(@javax.annotation.Nullable Object wrappedValue) {
       return TestParameterValue.wrap(wrappedValue);
     }
   }
diff --git a/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameterValuesProvider.java b/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameterValuesProvider.java
index 2cf9da6..51169b8 100644
--- a/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameterValuesProvider.java
+++ b/junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameterValuesProvider.java
@@ -60,7 +60,7 @@ public abstract class TestParameterValuesProvider
   @Override
   public final TestParameterValue value(@Nullable Object wrappedValue) {
     // Overriding this method as final because it is not supposed to be overwritten
-    return TestParameter.TestParameterValuesProvider.super.value(wrappedValue);
+    return TestParameterValue.wrap(wrappedValue);
   }
 
   /**