Snap for 6300905 from b3d67ade6d6f883ac6b02535fbadc1b6b09ec5b3 to qt-d4-release
Change-Id: I9a3c63b67effca07cf18419d5ab7c2112243c814
diff --git a/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiListItemTest.java b/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiListItemTest.java
index c4c4850..cf28632 100644
--- a/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiListItemTest.java
+++ b/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiListItemTest.java
@@ -111,9 +111,9 @@
mListView.measure(0, 0);
mListView.layout(0, 0, 100, 10000);
- if (mListView.mNestedRecyclerView != null) {
- mListView.mNestedRecyclerView.measure(0, 0);
- mListView.mNestedRecyclerView.layout(0, 0, 100, 10000);
+ if (mListView != null) {
+ mListView.measure(0, 0);
+ mListView.layout(0, 0, 100, 10000);
}
// Required to init nested RecyclerView
diff --git a/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java b/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java
index 4385913..70de34b 100644
--- a/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java
+++ b/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java
@@ -18,24 +18,18 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
import android.content.Context;
-import android.content.res.Resources;
import android.view.LayoutInflater;
import android.view.View;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import com.android.car.ui.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
@@ -48,9 +42,6 @@
private View mView;
private CarUiRecyclerView mCarUiRecyclerView;
- @Mock
- private RecyclerView.Adapter mAdapter;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -101,25 +92,13 @@
}
@Test
- public void init_shouldContainNestedRecyclerView() {
+ public void init_shouldContainRecyclerView() {
mView = LayoutInflater.from(mContext)
.inflate(R.layout.test_grid_car_ui_recycler_view, null);
mCarUiRecyclerView = mView.findViewById(R.id.test_prv);
- assertThat(mCarUiRecyclerView.mNestedRecyclerView).isNotNull();
- }
-
- @Test
- public void init_shouldNotContainNestedRecyclerView() {
- Context context = spy(mContext);
- Resources resources = spy(mContext.getResources());
- when(resources.getBoolean(R.bool.car_ui_scrollbar_enable)).thenReturn(false);
- when(context.getResources()).thenReturn(resources);
-
- mCarUiRecyclerView = new CarUiRecyclerView(context);
-
- assertThat(mCarUiRecyclerView.mNestedRecyclerView).isNull();
+ assertThat(mCarUiRecyclerView).isNotNull();
}
@Test
diff --git a/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/DefaultScrollBarTest.java b/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/DefaultScrollBarTest.java
index b38a7ee..d60a025 100644
--- a/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/DefaultScrollBarTest.java
+++ b/car-ui-lib/tests/robotests/src/com/android/car/ui/recyclerview/DefaultScrollBarTest.java
@@ -67,8 +67,6 @@
when(mRecyclerView.getRecycledViewPool()).thenReturn(mRecycledViewPool);
when(mParent.generateLayoutParams(any())).thenReturn(mLayoutParams);
- mScrollBar.initialize(mRecyclerView, 10, CarUiRecyclerView.ScrollBarPosition.START, true);
-
// called once in DefaultScrollBar and once in SnapHelper while setting up the call backs
// when we use attachToRecyclerView(recyclerview)
verify(mRecyclerView, times(2)).addOnScrollListener(
@@ -82,8 +80,6 @@
when(mRecyclerView.getRecycledViewPool()).thenReturn(mRecycledViewPool);
when(mParent.generateLayoutParams(any())).thenReturn(mLayoutParams);
- mScrollBar.initialize(mRecyclerView, 10, CarUiRecyclerView.ScrollBarPosition.START, true);
-
verify(mRecycledViewPool).setMaxRecycledViews(0, 12);
}
@@ -94,8 +90,6 @@
when(mRecyclerView.getRecycledViewPool()).thenReturn(mRecycledViewPool);
when(mParent.generateLayoutParams(any())).thenReturn(mLayoutParams);
- mScrollBar.initialize(mRecyclerView, 10, CarUiRecyclerView.ScrollBarPosition.START, true);
-
verify(mRecyclerView).setOnFlingListener(null);
}
@@ -106,7 +100,6 @@
when(mRecyclerView.getRecycledViewPool()).thenReturn(mRecycledViewPool);
when(mParent.generateLayoutParams(any())).thenReturn(mLayoutParams);
- mScrollBar.initialize(mRecyclerView, 10, CarUiRecyclerView.ScrollBarPosition.START, true);
mScrollBar.setPadding(10, 20);
DefaultScrollBar defaultScrollBar = (DefaultScrollBar) mScrollBar;
