Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-enable some test cases" am: 8feaad7249

Browse Source 
am: a76d88d26d

Change-Id: I03fcdebbe246fcffb92b7598d3084b3383982d98
This commit is contained in:
Neil Fuller
2017-07-19 09:56:17 +00:00
committed by android-build-merger
parent b1894abbc5 a76d88d26d
commit 450c3bc1cd
1 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
services/tests/servicestests/src/com/android/server/timezone/PackageTrackerTest.java
View File

@@ -198,26 +198,25 @@ public class PackageTrackerTest {
mFakeIntentHelper.assertReliabilityTriggeringDisabled(); mFakeIntentHelper.assertReliabilityTriggeringDisabled();
} }
// TODO(nfuller): Uncomment or delete when it's clear what will happen with http://b/35995024 @Test
// @Test public void trackingEnabled_updateAppNotPrivileged() throws Exception {
// public void trackingEnabled_updateAppNotPrivileged() throws Exception { // Set up device configuration.
// // Set up device configuration. configureTrackingEnabled();
// configureTrackingEnabled(); configureReliabilityConfigSettingsOk();
// configureReliabilityConfigSettingsOk(); configureUpdateAppPackageNotPrivileged(UPDATE_APP_PACKAGE_NAME);
// configureUpdateAppPackageNotPrivileged(UPDATE_APP_PACKAGE_NAME); configureDataAppPackageOk(DATA_APP_PACKAGE_NAME);
// configureDataAppPackageOk(DATA_APP_PACKAGE_NAME);
// try {
// try { // Initialize the tracker.
// // Initialize the tracker. mPackageTracker.start();
// mPackageTracker.start(); fail();
// fail(); } catch (RuntimeException expected) {}
// } catch (RuntimeException expected) {}
// mFakeIntentHelper.assertNotInitialized();
// mFakeIntentHelper.assertNotInitialized();
// // Check reliability triggering state.
// // Check reliability triggering state. mFakeIntentHelper.assertReliabilityTriggeringDisabled();
// mFakeIntentHelper.assertReliabilityTriggeringDisabled(); }
// }
@Test @Test
public void trackingEnabled_dataAppConfigMissing() throws Exception { public void trackingEnabled_dataAppConfigMissing() throws Exception {
@@ -239,26 +238,25 @@ public class PackageTrackerTest {
mFakeIntentHelper.assertReliabilityTriggeringDisabled(); mFakeIntentHelper.assertReliabilityTriggeringDisabled();
} }
// TODO(nfuller): Uncomment or delete when it's clear what will happen with http://b/35995024 @Test
// @Test public void trackingEnabled_dataAppNotPrivileged() throws Exception {
// public void trackingEnabled_dataAppNotPrivileged() throws Exception { // Set up device configuration.
// // Set up device configuration. configureTrackingEnabled();
// configureTrackingEnabled(); configureReliabilityConfigSettingsOk();
// configureReliabilityConfigSettingsOk(); configureUpdateAppPackageOk(UPDATE_APP_PACKAGE_NAME);
// configureUpdateAppPackageOk(UPDATE_APP_PACKAGE_NAME); configureDataAppPackageNotPrivileged(DATA_APP_PACKAGE_NAME);
// configureDataAppPackageNotPrivileged(DATA_APP_PACKAGE_NAME);
// try {
// try { // Initialize the tracker.
// // Initialize the tracker. mPackageTracker.start();
// mPackageTracker.start(); fail();
// fail(); } catch (RuntimeException expected) {}
// } catch (RuntimeException expected) {}
// mFakeIntentHelper.assertNotInitialized();
// mFakeIntentHelper.assertNotInitialized();
// // Check reliability triggering state.
// // Check reliability triggering state. mFakeIntentHelper.assertReliabilityTriggeringDisabled();
// mFakeIntentHelper.assertReliabilityTriggeringDisabled(); }
// }
@Test @Test
public void trackingEnabled_packageUpdate_badUpdateAppManifestEntry() throws Exception { public void trackingEnabled_packageUpdate_badUpdateAppManifestEntry() throws Exception {