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 am: a76d88d26d

Browse Source 
am: 450c3bc1cd

Change-Id: I89a31203310c0ea130b9a4f70656a2f81f372c34
This commit is contained in:
Neil Fuller
2017-07-19 10:01:47 +00:00
committed by android-build-merger
parent 443f3aa138 450c3bc1cd
commit ea0e2bd457
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();
}
// TODO(nfuller): Uncomment or delete when it's clear what will happen with http://b/35995024
// @Test
// public void trackingEnabled_updateAppNotPrivileged() throws Exception {
// // Set up device configuration.
// configureTrackingEnabled();
// configureReliabilityConfigSettingsOk();
// configureUpdateAppPackageNotPrivileged(UPDATE_APP_PACKAGE_NAME);
// configureDataAppPackageOk(DATA_APP_PACKAGE_NAME);
//
// try {
// // Initialize the tracker.
// mPackageTracker.start();
// fail();
// } catch (RuntimeException expected) {}
//
// mFakeIntentHelper.assertNotInitialized();
//
// // Check reliability triggering state.
// mFakeIntentHelper.assertReliabilityTriggeringDisabled();
// }
@Test
public void trackingEnabled_updateAppNotPrivileged() throws Exception {
// Set up device configuration.
configureTrackingEnabled();
configureReliabilityConfigSettingsOk();
configureUpdateAppPackageNotPrivileged(UPDATE_APP_PACKAGE_NAME);
configureDataAppPackageOk(DATA_APP_PACKAGE_NAME);
try {
// Initialize the tracker.
mPackageTracker.start();
fail();
} catch (RuntimeException expected) {}
mFakeIntentHelper.assertNotInitialized();
// Check reliability triggering state.
mFakeIntentHelper.assertReliabilityTriggeringDisabled();
}
@Test
public void trackingEnabled_dataAppConfigMissing() throws Exception {
@@ -239,26 +238,25 @@ public class PackageTrackerTest {
mFakeIntentHelper.assertReliabilityTriggeringDisabled();
}
// TODO(nfuller): Uncomment or delete when it's clear what will happen with http://b/35995024
// @Test
// public void trackingEnabled_dataAppNotPrivileged() throws Exception {
// // Set up device configuration.
// configureTrackingEnabled();
// configureReliabilityConfigSettingsOk();
// configureUpdateAppPackageOk(UPDATE_APP_PACKAGE_NAME);
// configureDataAppPackageNotPrivileged(DATA_APP_PACKAGE_NAME);
//
// try {
// // Initialize the tracker.
// mPackageTracker.start();
// fail();
// } catch (RuntimeException expected) {}
//
// mFakeIntentHelper.assertNotInitialized();
//
// // Check reliability triggering state.
// mFakeIntentHelper.assertReliabilityTriggeringDisabled();
// }
@Test
public void trackingEnabled_dataAppNotPrivileged() throws Exception {
// Set up device configuration.
configureTrackingEnabled();
configureReliabilityConfigSettingsOk();
configureUpdateAppPackageOk(UPDATE_APP_PACKAGE_NAME);
configureDataAppPackageNotPrivileged(DATA_APP_PACKAGE_NAME);
try {
// Initialize the tracker.
mPackageTracker.start();
fail();
} catch (RuntimeException expected) {}
mFakeIntentHelper.assertNotInitialized();
// Check reliability triggering state.
mFakeIntentHelper.assertReliabilityTriggeringDisabled();
}
@Test
public void trackingEnabled_packageUpdate_badUpdateAppManifestEntry() throws Exception {