Bugfix: Call isKotlinClass() on the executable's class when operating on the executable.

Author: nymanjens

junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParameterMethodProcessor.java

@@ -685,7 +685,7 @@ private static ImmutableList<AnnotationWithMetadata> getAnnotationWithMetadataLi
       return ImmutableList.of();
     }
     Optional<ImmutableList<String>> maybeNamesFromKotlin =
-        TestParameterInjectorUtils.isKotlinClass(testClass)
+        TestParameterInjectorUtils.isKotlinClass(executable.getDeclaringClass())
             ? KotlinHooksForTestParameterInjector.getParameterNames(executable)
             : Optional.absent();
 

junit4/src/main/java/com/google/testing/junit/testparameterinjector/TestParametersMethodProcessor.java

@@ -192,7 +192,7 @@ private Optional<List<Object>> maybeGetExecutableParameters(
       TestParametersValues parametersValues = parameterValuesList.get(parametersIndex.get());
 
       ImmutableList<JavaCompatibilityParameter> parameters =
-          getParametersWithKotlinFallback(executable, testClass);
+          getParametersWithKotlinFallback(executable);
       return Optional.of(
           FluentIterable.from(parameters)
               .transform(
@@ -222,7 +222,7 @@ private ImmutableList<TestParametersValues> getExecutableParameters(
   private static ImmutableList<TestParametersValues> toParameterValuesList(
       JavaCompatibilityExecutable executable, Class<?> testClass) {
     ImmutableList<JavaCompatibilityParameter> parametersList =
-        getParametersWithKotlinFallback(executable, testClass);
+        getParametersWithKotlinFallback(executable);
     checkParameterNamesArePresent(parametersList, executable);
 
     if (executable.isAnnotationPresent(TestParameters.class)) {
@@ -445,9 +445,9 @@ private static boolean hasRelevantAnnotation(JavaCompatibilityExecutable executa
 
   @SuppressWarnings("KotlinInternal")
   private static ImmutableList<JavaCompatibilityParameter> getParametersWithKotlinFallback(
-      JavaCompatibilityExecutable executable, Class<?> testClass) {
+      JavaCompatibilityExecutable executable) {
     return executable.getParametersWithFallback(
-        TestParameterInjectorUtils.isKotlinClass(testClass)
+        TestParameterInjectorUtils.isKotlinClass(executable.getDeclaringClass())
             ? KotlinHooksForTestParameterInjector.getParameterNames(executable)
             : Optional.absent());
   }

junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParameterMethodProcessor.java

@@ -685,7 +685,7 @@ private static ImmutableList<AnnotationWithMetadata> getAnnotationWithMetadataLi
       return ImmutableList.of();
     }
     Optional<ImmutableList<String>> maybeNamesFromKotlin =
-        TestParameterInjectorUtils.isKotlinClass(testClass)
+        TestParameterInjectorUtils.isKotlinClass(executable.getDeclaringClass())
             ? KotlinHooksForTestParameterInjector.getParameterNames(executable)
             : Optional.absent();
 

junit5/src/main/java/com/google/testing/junit/testparameterinjector/junit5/TestParametersMethodProcessor.java

@@ -192,7 +192,7 @@ private Optional<List<Object>> maybeGetExecutableParameters(
       TestParametersValues parametersValues = parameterValuesList.get(parametersIndex.get());
 
       ImmutableList<JavaCompatibilityParameter> parameters =
-          getParametersWithKotlinFallback(executable, testClass);
+          getParametersWithKotlinFallback(executable);
       return Optional.of(
           FluentIterable.from(parameters)
               .transform(
@@ -222,7 +222,7 @@ private ImmutableList<TestParametersValues> getExecutableParameters(
   private static ImmutableList<TestParametersValues> toParameterValuesList(
       JavaCompatibilityExecutable executable, Class<?> testClass) {
     ImmutableList<JavaCompatibilityParameter> parametersList =
-        getParametersWithKotlinFallback(executable, testClass);
+        getParametersWithKotlinFallback(executable);
     checkParameterNamesArePresent(parametersList, executable);
 
     if (executable.isAnnotationPresent(TestParameters.class)) {
@@ -445,9 +445,9 @@ private static boolean hasRelevantAnnotation(JavaCompatibilityExecutable executa
 
   @SuppressWarnings("KotlinInternal")
   private static ImmutableList<JavaCompatibilityParameter> getParametersWithKotlinFallback(
-      JavaCompatibilityExecutable executable, Class<?> testClass) {
+      JavaCompatibilityExecutable executable) {
     return executable.getParametersWithFallback(
-        TestParameterInjectorUtils.isKotlinClass(testClass)
+        TestParameterInjectorUtils.isKotlinClass(executable.getDeclaringClass())
             ? KotlinHooksForTestParameterInjector.getParameterNames(executable)
             : Optional.absent());
   }