Make most tests oss-ready

breakcount · May 14, 2015 · e7da690 · e7da690
1 parent 8b280e3
commit e7da690
Show file tree

Hide file tree

Showing 48 changed files with 129 additions and 97 deletions.
diff --git a/drawee/src/test/java/com/facebook/drawee/controller/AbstractDraweeControllerTest.java b/drawee/src/test/java/com/facebook/drawee/controller/AbstractDraweeControllerTest.java
@@ -25,7 +25,7 @@
 import com.facebook.datasource.SettableDataSource;
 import com.facebook.drawee.components.DeferredReleaser;
 import com.facebook.drawee.interfaces.SettableDraweeHierarchy;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.*;
 
 /** * Tests for AbstractDraweeController */
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AbstractDraweeControllerTest {
 
   public static class FakeImageInfo {

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/ArrayDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/ArrayDrawableTest.java
@@ -15,7 +15,7 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -31,7 +31,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ArrayDrawableTest {
   private Drawable mUnderlyingDrawable0;
   private Drawable mUnderlyingDrawable1;

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/DrawableUtilsTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/DrawableUtilsTest.java
@@ -14,7 +14,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,7 +26,7 @@
 /**
  * Tests for {@link ForwardingDrawable}
  */
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DrawableUtilsTest {
 
   private final Rect mBounds = mock(Rect.class);

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/FadeDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/FadeDrawableTest.java
@@ -13,7 +13,7 @@
 import android.graphics.drawable.Drawable;
 
 import com.facebook.common.testing.FakeClock;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -23,7 +23,7 @@
 
 import static org.mockito.Mockito.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FadeDrawableTest {
   private Drawable[] mLayers = new Drawable[] {
       DrawableTestUtils.mockDrawable(),

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/ForwardingDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/ForwardingDrawableTest.java
@@ -14,7 +14,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -26,7 +26,7 @@
 /**
  * Tests for {@link ForwardingDrawable}
  */
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ForwardingDrawableTest {
   private Drawable mInnerDrawable;
   private FakeForwardingDrawable mDrawable;

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/MatrixDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/MatrixDrawableTest.java
@@ -12,7 +12,7 @@
 import android.graphics.Matrix;
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class MatrixDrawableTest {
   private Drawable mUnderlyingDrawable;
   private Matrix mMatrix1;

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/RoundedBitmapDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/RoundedBitmapDrawableTest.java
@@ -16,7 +16,7 @@
 import android.graphics.drawable.Drawable;
 import android.util.DisplayMetrics;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -25,7 +25,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RoundedBitmapDrawableTest {
   private Resources mResources;
   private Bitmap mBitmap;

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/RoundedColorDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/RoundedColorDrawableTest.java
@@ -16,7 +16,7 @@
 import android.graphics.PixelFormat;
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -27,7 +27,7 @@
 import static org.mockito.Mockito.*;
 import static org.mockito.Matchers.any;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RoundedColorDrawableTest {
 
   private Canvas mCanvas;

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/RoundedCornersDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/RoundedCornersDrawableTest.java
@@ -12,7 +12,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -21,7 +21,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RoundedCornersDrawableTest {
 
   private Drawable mUnderlyingDrawable;

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/ScaleTypeDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/ScaleTypeDrawableTest.java
@@ -15,7 +15,7 @@
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -26,7 +26,7 @@
 
 import static org.mockito.Mockito.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ScaleTypeDrawableTest {
   private Drawable mUnderlyingDrawable = mock(Drawable.class);
   private PointF mFocusPoint = new PointF(0.1f, 0.4f);

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/ScalingUtilsTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/ScalingUtilsTest.java
@@ -12,7 +12,7 @@
 import android.graphics.Matrix;
 import android.graphics.Rect;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -24,7 +24,7 @@
 /**
  * Tests for scale type calculations.
  */
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ScalingUtilsTest {
   private final Matrix mExpectedMatrix = new Matrix();
   private final Matrix mActualMatrix = new Matrix();

diff --git a/drawee/src/test/java/com/facebook/drawee/drawable/SettableDrawableTest.java b/drawee/src/test/java/com/facebook/drawee/drawable/SettableDrawableTest.java
@@ -11,7 +11,7 @@
 
 import android.graphics.drawable.Drawable;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -20,7 +20,7 @@
 
 import static org.mockito.Mockito.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SettableDrawableTest {
   private Drawable mUnderlyingDrawable0;
   private Drawable mUnderlyingDrawable1;

diff --git a/drawee/src/test/java/com/facebook/drawee/generic/GenericDraweeHierarchyBuilderTest.java b/drawee/src/test/java/com/facebook/drawee/generic/GenericDraweeHierarchyBuilderTest.java
@@ -18,15 +18,15 @@
 import com.facebook.common.internal.Lists;
 import com.facebook.drawee.drawable.AndroidGraphicsTestUtils;
 import com.facebook.drawee.drawable.ScalingUtils;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class GenericDraweeHierarchyBuilderTest {
 
   private final Drawable mBackgroundDrawable1 = mock(BitmapDrawable.class);

diff --git a/drawee/src/test/java/com/facebook/drawee/generic/GenericDraweeHierarchyTest.java b/drawee/src/test/java/com/facebook/drawee/generic/GenericDraweeHierarchyTest.java
@@ -29,7 +29,7 @@
 import com.facebook.drawee.drawable.RoundedCornersDrawable;
 import com.facebook.drawee.drawable.ScaleTypeDrawable;
 import com.facebook.drawee.drawable.SettableDrawable;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +39,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class GenericDraweeHierarchyTest {
 
   private final BitmapDrawable mPlaceholderImage = mock(BitmapDrawable.class);

diff --git a/drawee/src/test/java/com/facebook/drawee/generic/RoundingParamsTest.java b/drawee/src/test/java/com/facebook/drawee/generic/RoundingParamsTest.java
@@ -11,15 +11,15 @@
 
 import android.graphics.Color;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static org.junit.Assert.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RoundingParamsTest {
 
   private RoundingParams mRoundingParams;

diff --git a/drawee/src/test/java/com/facebook/drawee/gestures/GestureDetectorTest.java b/drawee/src/test/java/com/facebook/drawee/gestures/GestureDetectorTest.java
@@ -11,7 +11,7 @@
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -25,7 +25,7 @@
 /**
  * Tests for {@link GestureDetector}
  */
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class GestureDetectorTest {
 
   private GestureDetector.ClickListener mClickListener;

diff --git a/drawee/src/test/java/com/facebook/drawee/testing/DraweeMocksTest.java b/drawee/src/test/java/com/facebook/drawee/testing/DraweeMocksTest.java
@@ -17,7 +17,7 @@
 import com.facebook.drawee.drawable.VisibilityCallback;
 import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -28,7 +28,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DraweeMocksTest {
 
   @Before

diff --git a/drawee/src/test/java/com/facebook/drawee/view/AspectRatioMeasureTest.java b/drawee/src/test/java/com/facebook/drawee/view/AspectRatioMeasureTest.java
@@ -10,7 +10,7 @@
 package com.facebook.drawee.view;
 
 import com.facebook.drawee.view.AspectRatioMeasure;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -22,7 +22,7 @@
 import static android.view.ViewGroup.LayoutParams;
 import static android.view.ViewGroup.LayoutParams.*;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AspectRatioMeasureTest {
 
   AspectRatioMeasure.Spec mSpec = new AspectRatioMeasure.Spec();

diff --git a/drawee/src/test/java/com/facebook/drawee/view/DraweeHolderTest.java b/drawee/src/test/java/com/facebook/drawee/view/DraweeHolderTest.java
@@ -15,7 +15,7 @@
 import com.facebook.drawee.interfaces.DraweeHierarchy;
 import com.facebook.drawee.interfaces.DraweeController;
 import com.facebook.drawee.testing.DraweeMocks;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,7 +29,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DraweeHolderTest {
 
   private DraweeHolder mDraweeHolder;

diff --git a/drawee/src/test/java/com/facebook/drawee/view/DraweeViewTest.java b/drawee/src/test/java/com/facebook/drawee/view/DraweeViewTest.java
@@ -16,7 +16,7 @@
 import com.facebook.drawee.interfaces.DraweeHierarchy;
 import com.facebook.drawee.interfaces.DraweeController;
 import com.facebook.drawee.testing.DraweeMocks;
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -28,7 +28,7 @@
 import static org.mockito.Mockito.*;
 
 /** Unit test for {@link DraweeView}. */
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DraweeViewTest {
 
   private DraweeView<DraweeHierarchy> mDraweeView;

diff --git a/drawee/src/test/java/com/facebook/drawee/view/MultiDraweeHolderTest.java b/drawee/src/test/java/com/facebook/drawee/view/MultiDraweeHolderTest.java
@@ -13,7 +13,7 @@
 import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -25,7 +25,7 @@
 /**
  * Tests for {@link MultiDraweeHolder}
  */
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class MultiDraweeHolderTest {
 
   MultiDraweeHolder mMultiHolder;

diff --git a/fbcore/src/test/java/com/facebook/common/executors/HandlerExecutorServiceImplTest.java b/fbcore/src/test/java/com/facebook/common/executors/HandlerExecutorServiceImplTest.java
@@ -14,7 +14,7 @@
 
 import android.os.Handler;
 
-import com.facebook.testing.robolectric.v2.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -24,7 +24,7 @@
 import org.robolectric.shadows.ShadowLooper;
 import org.robolectric.util.Scheduler;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class HandlerExecutorServiceImplTest {
 
   private AtomicInteger mCounter = new AtomicInteger();