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

14
tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
View File

@@ -45,7 +45,6 @@ import android.support.v7.preference.PreferenceScreen;
import android.util.AttributeSet;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.RestrictedLockUtils;
@@ -61,9 +60,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
SettingsShadowResources.class
})
@Config(shadows = SettingsShadowResources.class)
public class SoundPreferenceControllerTest {
private Context mContext;
@@ -107,7 +104,7 @@ public class SoundPreferenceControllerTest {
mController.onPreferenceChange(mock(NotificationSoundPreference.class), Uri.EMPTY);
mController.handlePreferenceTreeClick(mock(NotificationSoundPreference.class));
mController.onActivityResult(1, 1, null);
mController.hasValidSound(null);
SoundPreferenceController.hasValidSound(null);
}
@Test
@@ -224,7 +221,6 @@ public class SoundPreferenceControllerTest {
verify(mFragment, never()).startActivityForResult(any(), anyInt());
}
@Test
public void testOnPreferenceTreeClick_correctPref() throws Exception {
NotificationSoundPreference pref =
@@ -251,12 +247,12 @@ public class SoundPreferenceControllerTest {
public void testHasValidSound() {
NotificationChannel channel =
new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
assertTrue(mController.hasValidSound(channel));
assertTrue(SoundPreferenceController.hasValidSound(channel));
channel.setSound(Uri.EMPTY, Notification.AUDIO_ATTRIBUTES_DEFAULT);
assertFalse(mController.hasValidSound(channel));
assertFalse(SoundPreferenceController.hasValidSound(channel));
channel.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT);
assertFalse(mController.hasValidSound(channel));
assertFalse(SoundPreferenceController.hasValidSound(channel));
}
}