Fixes to allow tests to run with bazel.

PiperOrigin-RevId: 157542075

4 files changed, 15 insertions, 2 deletions

diff --git a/robolectric-sandbox/src/test/java/org/robolectric/JavaVersionTest.java b/robolectric-sandbox/src/test/java/org/robolectric/JavaVersionTest.java
index 818824d63..dd9a9f7d3 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/JavaVersionTest.java
+++ b/robolectric-sandbox/src/test/java/org/robolectric/JavaVersionTest.java
@@ -1,10 +1,13 @@
 package org.robolectric;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.robolectric.util.JavaVersion;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@RunWith(JUnit4.class)
 public class JavaVersionTest {
   @Test
   public void jdk8() {
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java b/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
index 505c08a58..cb885ce6c 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
+++ b/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
@@ -3,6 +3,8 @@ package org.robolectric;
 import javax.annotation.Nonnull;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.Mockito;
 import org.robolectric.internal.bytecode.ClassHandler;
 import org.robolectric.internal.bytecode.ClassInfo;
@@ -81,6 +83,7 @@ import static org.mockito.Mockito.when;
 import static org.robolectric.util.ReflectionHelpers.newInstance;
 import static org.robolectric.util.ReflectionHelpers.setStaticField;
 
+@RunWith(JUnit4.class)
 public class SandboxClassLoaderTest {
 
   private ClassLoader classLoader;
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/ShadowingTest.java b/robolectric-sandbox/src/test/java/org/robolectric/ShadowingTest.java
index 0183b33de..22a2ca7dc 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/ShadowingTest.java
+++ b/robolectric-sandbox/src/test/java/org/robolectric/ShadowingTest.java
@@ -1,6 +1,7 @@
 package org.robolectric;
 
 import org.assertj.core.api.Assertions;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Implementation;
@@ -18,7 +19,9 @@ import java.lang.reflect.Modifier;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
 @RunWith(SandboxTestRunner.class)
@@ -234,15 +237,16 @@ public class ShadowingTest {
     }
   }
 
+  @Test @Ignore("todo fix")
   public void shouldNotInstrumentPackageIfNotAddedToConfig() throws Exception {
     Class<?> clazz = Class.forName(AFinalClass.class.getName());
-    assertEquals(1, clazz.getModifiers() & Modifier.FINAL);
+    assertTrue(Modifier.isFinal(clazz.getModifiers()));
   }
 
   @Test
   @SandboxConfig(instrumentedPackages = {"org.robolectric.testing"})
   public void shouldInstrumentPackageIfAddedToConfig() throws Exception {
     Class<?> clazz = Class.forName(AFinalClass.class.getName());
-    assertEquals(0, clazz.getModifiers() & Modifier.FINAL);
+    assertFalse(Modifier.isFinal(clazz.getModifiers()));
   }
 }
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java b/robolectric-sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java
index e20aa8c33..38aae88fd 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java
+++ b/robolectric-sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java
@@ -1,6 +1,8 @@
 package org.robolectric.internal.bytecode;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.robolectric.internal.bytecode.ProxyMaker;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -8,6 +10,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@RunWith(JUnit4.class)
 public class ProxyMakerTest {
   private static final ProxyMaker.MethodMapper IDENTITY_NAME = new ProxyMaker.MethodMapper() {
     @Override public String getName(String className, String methodName) {