Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51294a9f authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Convert ItemDragListenerTest to JUnit4, and add it to APCT." into nyc-andromeda-dev

parents 8a744f75 4c5e1fa8
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -16,7 +16,14 @@

package com.android.documentsui;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import android.content.ClipData;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.view.DragEvent;
import android.view.View;

@@ -25,14 +32,16 @@ import com.android.documentsui.testing.DragEvents;
import com.android.documentsui.testing.TestTimer;
import com.android.documentsui.testing.TestViews;

import junit.framework.TestCase;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Timer;
import java.util.TimerTask;

public class ItemDragListenerTest extends TestCase {
@RunWith(AndroidJUnit4.class)
@SmallTest
public class ItemDragListenerTest {

    private static final long DELAY_AFTER_HOVERING = ItemDragListener.SPRING_TIMEOUT + 1;

@@ -42,7 +51,7 @@ public class ItemDragListenerTest extends TestCase {

    private TestDragListener mListener;

    @Override
    @Before
    public void setUp() {
        mTestView = TestViews.createTestView();