From 2a4df330b2261e82b327a70e2d702080c1fae279 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Sun, 30 Sep 2018 04:06:08 -0700 Subject: [PATCH] Fix robolectric test runner import Summary: Can't use our internal test runner for this, d'uh. Reviewed By: danielbuechele Differential Revision: D10101984 fbshipit-source-id: 23f0af1c0b9e5d761de260643ef8d5546d9478eb --- .../sonar/plugins/console/ConsoleSonarPluginTest.java | 4 ++-- .../facebook/sonar/plugins/console/JavascriptSessionTest.java | 4 ++-- .../sonar/plugins/inspector/ApplicationWrapperTest.java | 4 ++-- .../sonar/plugins/inspector/DescriptorMappingTest.java | 4 ++-- .../sonar/plugins/inspector/InspectorSonarPluginTest.java | 4 ++-- .../inspector/descriptors/ViewGroupDescriptorTest.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java b/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java index cfcae65bf..eca19803d 100644 --- a/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java +++ b/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java @@ -13,12 +13,12 @@ import static org.hamcrest.MatcherAssert.assertThat; import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.testing.FlipperConnectionMock; import com.facebook.flipper.testing.FlipperResponderMock; -import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner; +import org.robolectric.RobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -@RunWith(WithTestDefaultsRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConsoleSonarPluginTest { FlipperConnectionMock connection; diff --git a/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java b/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java index ae58cab7c..84524a8bb 100644 --- a/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java +++ b/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java @@ -9,7 +9,7 @@ package com.facebook.flipper.plugins.console; import static org.junit.Assert.assertEquals; -import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner; +import org.robolectric.RobolectricTestRunner; import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.HashMap; @@ -18,7 +18,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mozilla.javascript.ContextFactory; -@RunWith(WithTestDefaultsRunner.class) +@RunWith(RobolectricTestRunner.class) public class JavascriptSessionTest { ContextFactory mContextFactory = new ContextFactory(); diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java index 68f4addc0..6ec733715 100644 --- a/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java +++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java @@ -14,7 +14,7 @@ import android.app.Activity; import android.app.Application; import android.app.Application.ActivityLifecycleCallbacks; import android.os.Bundle; -import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner; +import org.robolectric.RobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -22,7 +22,7 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -@RunWith(WithTestDefaultsRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApplicationWrapperTest { private ApplicationWrapper mWrapper; diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java index 40e9e22d7..22e4bd9a1 100644 --- a/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java +++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java @@ -14,12 +14,12 @@ import com.facebook.flipper.core.FlipperConnection; import com.facebook.flipper.core.FlipperDynamic; import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.testing.FlipperConnectionMock; -import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner; +import org.robolectric.RobolectricTestRunner; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -@RunWith(WithTestDefaultsRunner.class) +@RunWith(RobolectricTestRunner.class) public class DescriptorMappingTest { private class TestClass {} diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java index 29788cd14..9ce00e9ff 100644 --- a/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java +++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java @@ -26,7 +26,7 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin.TouchOverla import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor; import com.facebook.flipper.testing.FlipperConnectionMock; import com.facebook.flipper.testing.FlipperResponderMock; -import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner; +import org.robolectric.RobolectricTestRunner; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -39,7 +39,7 @@ import org.robolectric.RuntimeEnvironment; import javax.annotation.Nullable; -@RunWith(WithTestDefaultsRunner.class) +@RunWith(RobolectricTestRunner.class) public class InspectorSonarPluginTest { private MockApplicationDescriptor mApplicationDescriptor; diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java index 9dfae0c99..9e3ea9bdf 100644 --- a/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java +++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java @@ -15,13 +15,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; import com.facebook.flipper.plugins.inspector.Touch; -import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner; +import org.robolectric.RobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.robolectric.RuntimeEnvironment; -@RunWith(WithTestDefaultsRunner.class) +@RunWith(RobolectricTestRunner.class) public class ViewGroupDescriptorTest { @Test