Fix BottomSheetBehaviorTest
Fix testedNestedScroll failing on ICS.
Also fix testAutoPeekHeight on landscape.
Bug: 30403598
Change-Id: Id78e56f5a92a0da8c46b16a2c329d647ae7df091
diff --git a/design/src/android/support/design/widget/BottomSheetBehavior.java b/design/src/android/support/design/widget/BottomSheetBehavior.java
index 1337352..80689ef 100644
--- a/design/src/android/support/design/widget/BottomSheetBehavior.java
+++ b/design/src/android/support/design/widget/BottomSheetBehavior.java
@@ -22,6 +22,7 @@
import android.os.Parcelable;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
import android.support.design.R;
import android.support.v4.os.ParcelableCompat;
import android.support.v4.os.ParcelableCompatCreatorCallbacks;
@@ -725,6 +726,11 @@
}
}
+ @VisibleForTesting
+ int getPeekHeightMin() {
+ return mPeekHeightMin;
+ }
+
private class SettleRunnable implements Runnable {
private final View mView;
diff --git a/design/tests/src/android/support/design/widget/BottomSheetBehaviorTest.java b/design/tests/src/android/support/design/widget/BottomSheetBehaviorTest.java
index 4c03fd6..4c6804f 100644
--- a/design/tests/src/android/support/design/widget/BottomSheetBehaviorTest.java
+++ b/design/tests/src/android/support/design/widget/BottomSheetBehaviorTest.java
@@ -491,7 +491,7 @@
// Swipe from the very bottom of the bottom sheet to the top edge of the screen so that the
// scrolling content is also scrolled
Espresso.onView(ViewMatchers.withId(R.id.coordinator))
- .perform(new GeneralSwipeAction(Swipe.FAST,
+ .perform(new GeneralSwipeAction(Swipe.SLOW,
new CoordinatesProvider() {
@Override
public float[] calculateCoordinates(View view) {
@@ -618,8 +618,10 @@
InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
+ CoordinatorLayout col = getCoordinatorLayout();
assertThat(getBottomSheet().getTop(),
- is(getCoordinatorLayout().getWidth() * 9 / 16));
+ is(Math.min(col.getWidth() * 9 / 16,
+ col.getHeight() - getBehavior().getPeekHeightMin())));
}
});
}
