Convert chrome compositor test's InstrumentationTestCases

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimationTest.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.compositor.layouts;
 
 import static org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.AnimatableAnimation.createAnimation;
 
 import android.os.SystemClock;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.Animatable;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 
 /**
  * Unit tests for {@link org.chromium.chrome.browser.compositor.layouts.ChromeAnimation}.
  */
-public class ChromeAnimationTest extends InstrumentationTestCase
-        implements Animatable<ChromeAnimationTest.Property> {
-
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class ChromeAnimationTest implements Animatable<ChromeAnimationTest.Property> {
     protected enum Property {
         FAST_ANIMATION,
         SLOW_ANIMATION
     }
 
     private static final long FAST_DURATION = 100;
     private static final long SLOW_DURATION = 1000;
 
     private ChromeAnimation<Animatable<?>> mAnimations;
 
     private boolean mHasFinishedFastAnimation;
     private boolean mHasFinishedSlowAnimation;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() throws Exception {
         mHasFinishedFastAnimation = false;
         mHasFinishedSlowAnimation = false;
     }
 
     @Override
     public void setProperty(Property prop, float val) {}
 
     @Override
     public void onPropertyAnimationFinished(Property prop) {
         if (prop == Property.FAST_ANIMATION) {
@@ skipping 30 matching lines @@
      */
     private void addToAnimation(ChromeAnimation.Animation<Animatable<?>> component) {
         if (mAnimations == null || mAnimations.finished()) {
             mAnimations = new ChromeAnimation<>();
             mAnimations.start();
         }
         component.start();
         mAnimations.add(component);
     }
 
+    @Test
     @SmallTest
     @Feature({"ContextualSearch"})
     public void testConcurrentAnimationsFinishSeparately() {
         addToAnimation(this, Property.FAST_ANIMATION, 0.f, 1.f, FAST_DURATION, 0);
         addToAnimation(this, Property.SLOW_ANIMATION, 0.f, 1.f, SLOW_DURATION, 0);
 
         // Update the animation with the current time. This will internally set the initial
         // time of the animation to |now|.
         long now = SystemClock.uptimeMillis();
         mAnimations.update(now);
 
         // Advances time to check that the fast animation will finish first.
         mAnimations.update(now + FAST_DURATION);
-        assertTrue(mHasFinishedFastAnimation);
-        assertFalse(mHasFinishedSlowAnimation);
+        Assert.assertTrue(mHasFinishedFastAnimation);
+        Assert.assertFalse(mHasFinishedSlowAnimation);
 
         // Advances time to check that all animations are finished.
         mAnimations.update(now + SLOW_DURATION);
-        assertTrue(mHasFinishedFastAnimation);
-        assertTrue(mHasFinishedSlowAnimation);
+        Assert.assertTrue(mHasFinishedFastAnimation);
+        Assert.assertTrue(mHasFinishedSlowAnimation);
     }
 }