Merge "Disable testTextAppearanceInSuggestionsPopup" into nyc-dev

This commit is contained in:
Keisuke Kuroyanagi
2016-03-29 11:36:45 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -20,6 +20,7 @@ import android.app.Activity;
import android.content.res.TypedArray;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Suppress;
import android.text.Selection;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
@@ -42,6 +43,7 @@ public class SuggestionsPopupWindowTest extends ActivityInstrumentationTestCase2
}
@SmallTest
@Suppress
public void testTextAppearanceInSuggestionsPopup() {
final Activity activity = getActivity();

View File

@@ -44,7 +44,6 @@ import com.android.frameworks.coretests.R;
import android.support.test.espresso.Espresso;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Suppress;
import android.view.MotionEvent;
import android.widget.espresso.ContextMenuUtils;
@@ -98,7 +97,6 @@ public class TextViewActivityMouseTest extends ActivityInstrumentationTestCase2<
}
@SmallTest
@Suppress
public void testContextMenu() throws Exception {
final String text = "abc def ghi.";
onView(withId(R.id.textview)).perform(click());