PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store Tile in view tag, not position

Browse Source 
The position(used to find the tile) is not up-to-date when recyclerview
changes, so store tile instead.

Bug: 32370624
Test: make -j40 SettingsTests
Change-Id: I10d29b3137ecb1c37b6a8468c6f2709b8497caa6
This commit is contained in:
jackqdyulei
2016-10-24 14:28:55 -07:00
parent 4eddfb804c
commit a44fdda438
2 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/dashboard/DashboardAdapter.java
View File

@@ -64,8 +64,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
@Override
public void onClick(View v) {
//TODO: get rid of setTag/getTag
final Tile tile = (Tile) mDashboardData.getItemEntityByPosition((int) v.getTag());
((SettingsActivity) mContext).openTile(tile);
((SettingsActivity) mContext).openTile((Tile) v.getTag());
}
};
@@ -205,7 +204,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
case R.layout.dashboard_tile:
final Tile tile = (Tile) mDashboardData.getItemEntityByPosition(position);
onBindTile(holder, tile);
holder.itemView.setTag(position);
holder.itemView.setTag(tile);
holder.itemView.setOnClickListener(mTileClickListener);
break;
case R.layout.suggestion_header:

62
tests/app/src/com/android/settings/tests/DashboardAdapterTest.java Normal file
View File

@@ -0,0 +1,62 @@
/*
* Copyright (C) 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.tests;
import android.app.Instrumentation;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import com.android.settings.R;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.*;
import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
import static org.hamcrest.core.AllOf.allOf;
@RunWith(AndroidJUnit4.class)
@SmallTest
public class DashboardAdapterTest {
@Before
public void SetUp() {
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
instrumentation.startActivitySync(new Intent(Settings
.ACTION_SETTINGS));
}
@Test
public void testTileConsistency_ToggleSuggestionsAndOpenBluetooth_shouldInBluetooth()
throws Exception{
final Context context = InstrumentationRegistry.getTargetContext();
onView(allOf(withText(context.getString(R.string.suggestions_title)),
withEffectiveVisibility(VISIBLE))).perform(click());
onView(allOf(withText(context.getString(R.string.bluetooth_settings)),
withEffectiveVisibility(VISIBLE))).perform(click());
// It should go to Bluetooth sub page, not other page or crash
onView(allOf(withText(context.getString(R.string.bluetooth_settings)),
withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
}
}