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

Use external/robolectric-shadows/run_robotests.mk

Browse Source 
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
James Lemieux
2018-02-26 00:51:42 -08:00
parent 229a6a2bc4
commit 22a39c2b93
752 changed files with 5096 additions and 9182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robotests/src/com/android/settings/display/AppGridViewTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -30,7 +29,6 @@ import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
import android.util.IconDrawableFactory;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,10 +37,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppGridViewTest {
@Mock
@@ -70,10 +66,10 @@ public class AppGridViewTest {
@Test
public void appEntry_shouldLoadIcon() {
when(mPackageManager.loadUnbadgedItemIcon(mActivityInfo, mApplicationInfo)).thenReturn(
mIcon);
final AppGridView.ActivityEntry activityEntry = new AppGridView.ActivityEntry(
mInfo, "label", mIconFactory);
when(mPackageManager.loadUnbadgedItemIcon(mActivityInfo, mApplicationInfo))
.thenReturn(mIcon);
final AppGridView.ActivityEntry activityEntry =
new AppGridView.ActivityEntry(mInfo, "label", mIconFactory);
assertThat(activityEntry.label).isEqualTo("label");
assertThat(activityEntry.getIcon()).isNotNull();
@@ -81,12 +77,12 @@ public class AppGridViewTest {
@Test
public void appEntry_compare_shouldCompareIgnoreCase() {
final AppGridView.ActivityEntry entry1 = new AppGridView.ActivityEntry(
mInfo, "label", mIconFactory);
final AppGridView.ActivityEntry entry2 = new AppGridView.ActivityEntry(
mInfo, "LABEL", mIconFactory);
final AppGridView.ActivityEntry entry3 = new AppGridView.ActivityEntry(
mInfo, "label2", mIconFactory);
final AppGridView.ActivityEntry entry1 =
new AppGridView.ActivityEntry(mInfo, "label", mIconFactory);
final AppGridView.ActivityEntry entry2 =
new AppGridView.ActivityEntry(mInfo, "LABEL", mIconFactory);
final AppGridView.ActivityEntry entry3 =
new AppGridView.ActivityEntry(mInfo, "label2", mIconFactory);
assertThat(entry1.compareTo(entry2)).isEqualTo(0);
assertThat(entry1.compareTo(entry3)).isNotEqualTo(0);