Fix warnings in the junit module

This PR removes unused dependencies and fix a couple of warnings in the `junit` module.
MGaetan89 · Nov 18, 2024 · 8a56830 · 8a56830
1 parent 2630fe4
commit 8a56830
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/junit/build.gradle.kts b/junit/build.gradle.kts
@@ -4,11 +4,8 @@ plugins {
 }
 
 dependencies {
-  api(project(":annotations"))
   api(project(":sandbox"))
   api(project(":pluginapi"))
-  api(project(":shadowapi"))
-  api(project(":utils:reflector"))
 
   compileOnly(libs.findbugs.jsr305)
   compileOnly(libs.junit4)

diff --git a/junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java b/junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java
@@ -457,7 +457,7 @@ protected Class<?>[] getExtraShadows(FrameworkMethod method) {
     List<Class<?>> shadowClasses = new ArrayList<>();
     addShadows(shadowClasses, getTestClass().getJavaClass().getAnnotation(SandboxConfig.class));
     addShadows(shadowClasses, method.getAnnotation(SandboxConfig.class));
-    return shadowClasses.toArray(new Class[shadowClasses.size()]);
+    return shadowClasses.toArray(new Class[0]);
   }
 
   private void addShadows(List<Class<?>> shadowClasses, SandboxConfig annotation) {

diff --git a/robolectric/src/main/java/org/robolectric/RobolectricTestParameterInjector.java b/robolectric/src/main/java/org/robolectric/RobolectricTestParameterInjector.java
@@ -13,6 +13,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.IntStream;
+import javax.annotation.Nonnull;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
@@ -52,6 +53,7 @@ protected void validateTestMethods(List<Throwable> errors) {
   }
 
   @Override
+  @Nonnull
   protected InstrumentationConfiguration createClassLoaderConfig(FrameworkMethod method) {
     return new InstrumentationConfiguration.Builder(super.createClassLoaderConfig(method))
         .doNotAcquireClass(DelegateTestRunner.class)

diff --git a/robolectric/src/test/java/org/robolectric/SingleSdkRobolectricTestRunner.java b/robolectric/src/test/java/org/robolectric/SingleSdkRobolectricTestRunner.java
@@ -34,6 +34,7 @@ public SingleSdkRobolectricTestRunner(Class<?> testClass, Injector injector)
   }
 
   @Override
+  @Nonnull
   protected AndroidSandbox getSandbox(FrameworkMethod method) {
     AndroidSandbox sandbox = super.getSandbox(method);
     latestSandbox = sandbox;