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

Add types to Matchers to avoid warnings about raw types and unchecked

Browse Source 
method invocations.

PiperOrigin-RevId: 286404247
This commit is contained in:
isabellekim 2019-12-19 12:11:36 -05:00 committed by Daniel Nizri
parent 8dd8acecd9
commit b8afe2b41f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/javatests/com/google/android/material/appbar/AppBarLayoutBaseTest.java
View File

@ -39,6 +39,7 @@ import androidx.core.view.ViewCompat;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import com.google.android.material.internal.BaseDynamicCoordinatorLayoutTest;
import com.google.android.material.resources.TextAppearanceConfig;
@ -113,16 +114,16 @@ public abstract class AppBarLayoutBaseTest extends BaseDynamicCoordinatorLayoutT
onView(withId(R.id.collapsing_app_bar)).check(matches(withScrimAlpha(alpha)));
}
static Matcher withScrimAlpha(final int alpha) {
return new TypeSafeMatcher<CollapsingToolbarLayout>() {
static Matcher<View> withScrimAlpha(final int alpha) {
return new TypeSafeMatcher<View>(CollapsingToolbarLayout.class) {
@Override
public void describeTo(Description description) {
description.appendText("CollapsingToolbarLayout has content scrim with alpha: " + alpha);
}
@Override
protected boolean matchesSafely(CollapsingToolbarLayout view) {
return alpha == view.getScrimAlpha();
protected boolean matchesSafely(View view) {
return alpha == ((CollapsingToolbarLayout) view).getScrimAlpha();
}
};
}

14
tests/javatests/com/google/android/material/navigation/NavigationViewTest.java
View File

@ -249,7 +249,7 @@ public class NavigationViewTest {
// direct child of RecyclerView which is expected to have the background set
// on it. If the internal implementation of NavigationView changes, the second
// Matcher below will need to be tweaked.
Matcher menuItemMatcher =
Matcher<View> menuItemMatcher =
allOf(
hasDescendant(withText(menuStringContent.get(MENU_CONTENT_ITEM_IDS[i]))),
isChildOfA(isAssignableFrom(RecyclerView.class)),
@ -265,7 +265,7 @@ public class NavigationViewTest {
// And check that all the menu items have the new fill
final @ColorInt int newFillColorBlue = ResourcesCompat.getColor(res, R.color.test_blue, null);
for (int i = 0; i < MENU_CONTENT_ITEM_IDS.length; i++) {
Matcher menuItemMatcher =
Matcher<View> menuItemMatcher =
allOf(
hasDescendant(withText(menuStringContent.get(MENU_CONTENT_ITEM_IDS[i]))),
isChildOfA(isAssignableFrom(RecyclerView.class)),
@ -283,7 +283,7 @@ public class NavigationViewTest {
// And check that all the menu items have the new fill
final @ColorInt int newFillColorGreen = ResourcesCompat.getColor(res, R.color.test_green, null);
for (int i = 0; i < MENU_CONTENT_ITEM_IDS.length; i++) {
Matcher menuItemMatcher =
Matcher<View> menuItemMatcher =
allOf(
hasDescendant(withText(menuStringContent.get(MENU_CONTENT_ITEM_IDS[i]))),
isChildOfA(isAssignableFrom(RecyclerView.class)),
@ -575,7 +575,7 @@ public class NavigationViewTest {
// For the background fill check we need to select a view that has its background
// set by the current implementation (see disclaimer in testBackground)
Matcher menuItemMatcher =
Matcher<View> menuItemMatcher =
allOf(
hasDescendant(withText(menuStringContent.get(MENU_CONTENT_ITEM_IDS[i]))),
isChildOfA(isAssignableFrom(RecyclerView.class)),
@ -583,7 +583,7 @@ public class NavigationViewTest {
onView(menuItemMatcher).check(matches(withBackgroundFill(expectedItemBackground)));
// And for the foreground color check we need to select a view with the text content
Matcher menuItemTextMatcher =
Matcher<View> menuItemTextMatcher =
allOf(
withText(menuStringContent.get(MENU_CONTENT_ITEM_IDS[i])),
isDescendantOfA(withId(R.id.start_drawer)));
@ -684,7 +684,7 @@ public class NavigationViewTest {
// details of the NavigationMenu, while conditions 3 and 4 aim to be as generic as
// possible and to not rely on the internal details of the current layout implementation
// of an individual menu item in NavigationMenu.
Matcher menuItemMatcher =
Matcher<View> menuItemMatcher =
allOf(
isDescendantOfA(withId(R.id.start_drawer)),
isChildOfA(isAssignableFrom(RecyclerView.class)),
@ -698,7 +698,7 @@ public class NavigationViewTest {
// Check that the full custom view is displayed without title and icon.
final Resources res = activityTestRule.getActivity().getResources();
Matcher customItemMatcher =
Matcher<View> customItemMatcher =
allOf(
isDescendantOfA(withId(R.id.start_drawer)),
isChildOfA(isAssignableFrom(RecyclerView.class)),