DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update size annotations for compat, design, and appcompat tests." into nyc-support-25.1-dev

Browse Source 
GitOrigin-RevId=fa3094f84f696402be1c750540edf091f989f140

PiperOrigin-RevId: 141511210
This commit is contained in:
TreeHugger Robot 2016-12-09 02:44:20 +00:00 committed by Travis Collins
parent 5cebd32087
commit 10aa01f940
5 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tests/src/android/support/design/widget/AppBarWithCollapsingToolbarTest.java
View File

@ -21,13 +21,13 @@ import static org.junit.Assert.assertEquals;
import android.os.Build;
import android.os.SystemClock;
import android.support.design.test.R;
import android.support.test.filters.MediumTest;
import android.support.test.filters.LargeTest;
import android.support.test.filters.SdkSuppress;
import android.widget.ImageView;
import org.junit.Test;
@MediumTest
@LargeTest
public class AppBarWithCollapsingToolbarTest extends AppBarLayoutBaseTest {
@Test
public void testPinnedToolbar() throws Throwable {

3
lib/tests/src/android/support/design/widget/AppBarWithToolbarAndTabsTest.java
View File

@ -28,11 +28,10 @@ import android.support.annotation.StringRes;
import android.support.design.test.R;
import android.support.design.testutils.Cheeses;
import android.support.test.filters.LargeTest;
import android.support.test.filters.MediumTest;
import org.junit.Test;
@MediumTest
@LargeTest
public class AppBarWithToolbarAndTabsTest extends AppBarLayoutBaseTest {
private TabLayout mTabLayout;

14
lib/tests/src/android/support/design/widget/NavigationViewTest.java
View File

@ -65,7 +65,7 @@ import android.support.annotation.ColorInt;
import android.support.annotation.IdRes;
import android.support.design.test.R;
import android.support.design.testutils.TestDrawable;
import android.support.test.filters.SmallTest;
import android.support.test.filters.MediumTest;
import android.support.v4.content.res.ResourcesCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
@ -85,6 +85,7 @@ import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
@MediumTest
public class NavigationViewTest
extends BaseInstrumentationTestCase<NavigationViewActivity> {
private static final int[] MENU_CONTENT_ITEM_IDS = { R.id.destination_home,
@ -118,7 +119,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testBasics() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -141,7 +141,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testWillNotDraw() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -154,7 +153,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testTextAppearance() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -182,7 +180,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testTextColor() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -213,7 +210,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testBackground() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -271,7 +267,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testIconTinting() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -366,7 +361,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testHeaders() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -404,7 +398,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testHeaderState() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -443,7 +436,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testNavigationSelectionListener() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -511,7 +503,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testCheckedAppearance() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@ -582,7 +573,6 @@ public class NavigationViewTest
}
@Test
@SmallTest
public void testActionLayout() {
// Open our drawer
onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));

14
lib/tests/src/android/support/design/widget/SnackbarTest.java
View File

@ -46,7 +46,6 @@ import android.support.design.testutils.SnackbarUtils;
import android.support.test.espresso.ViewAction;
import android.support.test.espresso.ViewInteraction;
import android.support.test.filters.MediumTest;
import android.support.test.filters.SmallTest;
import android.support.v4.view.ViewCompat;
import android.text.TextUtils;
import android.view.View;
@ -54,6 +53,7 @@ import android.view.View;
import org.junit.Before;
import org.junit.Test;
@MediumTest
public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity> {
private static final String MESSAGE_TEXT = "Test Message";
private static final @StringRes int MESSAGE_ID = R.string.snackbar_text;
@ -98,7 +98,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@SmallTest
public void testBasicContent() throws Throwable {
// Verify different combinations of snackbar content (message and action) and duration
@ -181,7 +180,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testDismissViaActionClick() throws Throwable {
verifyDismissCallback(
onView(withId(R.id.snackbar_action)),
@ -192,7 +190,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testDismissViaSwipe() throws Throwable {
verifyDismissCallback(
onView(isAssignableFrom(Snackbar.SnackbarLayout.class)),
@ -203,7 +200,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testDismissViaSwipeRtl() throws Throwable {
onView(withId(R.id.col)).perform(setLayoutDirection(ViewCompat.LAYOUT_DIRECTION_RTL));
if (ViewCompat.getLayoutDirection(mCoordinatorLayout) == ViewCompat.LAYOUT_DIRECTION_RTL) {
@ -219,7 +215,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testDismissViaApi() throws Throwable {
verifyDismissCallback(
onView(isAssignableFrom(Snackbar.SnackbarLayout.class)),
@ -235,7 +230,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testDismissViaTimeout() throws Throwable {
verifyDismissCallback(
onView(isAssignableFrom(Snackbar.SnackbarLayout.class)),
@ -246,7 +240,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testDismissViaAnotherSnackbar() throws Throwable {
final Snackbar anotherSnackbar =
Snackbar.make(mCoordinatorLayout, "A different message", Snackbar.LENGTH_SHORT);
@ -270,7 +263,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testActionClickListener() {
final View.OnClickListener mockClickListener = mock(View.OnClickListener.class);
final Snackbar snackbar =
@ -286,7 +278,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testSetCallback() throws Throwable {
final Snackbar snackbar =
Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)
@ -304,7 +295,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testSingleCallback() throws Throwable {
final Snackbar snackbar =
Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)
@ -327,7 +317,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testMultipleCallbacks() throws Throwable {
final Snackbar snackbar =
Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)
@ -351,7 +340,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
}
@Test
@MediumTest
public void testMultipleCallbacksWithRemoval() throws Throwable {
final Snackbar snackbar =
Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)

7
lib/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java
View File

@ -42,6 +42,7 @@ import android.support.design.testutils.TabLayoutActions;
import android.support.design.testutils.TestUtilsActions;
import android.support.design.testutils.TestUtilsMatchers;
import android.support.design.testutils.ViewPagerActions;
import android.support.test.filters.LargeTest;
import android.support.test.filters.MediumTest;
import android.support.test.filters.SmallTest;
import android.support.v4.view.PagerAdapter;
@ -534,19 +535,19 @@ public class TabLayoutWithViewPagerTest
}
@Test
@MediumTest
@LargeTest
public void testMinTabWidth() {
verifyMinMaxTabWidth(R.layout.tab_layout_bound_min, R.dimen.tab_width_limit_medium, 0);
}
@Test
@MediumTest
@LargeTest
public void testMaxTabWidth() {
verifyMinMaxTabWidth(R.layout.tab_layout_bound_max, 0, R.dimen.tab_width_limit_medium);
}
@Test
@MediumTest
@LargeTest
public void testMinMaxTabWidth() {
verifyMinMaxTabWidth(R.layout.tab_layout_bound_minmax, R.dimen.tab_width_limit_small,
R.dimen.tab_width_limit_large);