summaryrefslogtreecommitdiff
path: root/tests/PackageWatchdog
diff options
context:
space:
mode:
authorJW Wang <wangchun@google.com>2019-09-05 15:55:52 +0800
committerJW Wang <wangchun@google.com>2019-09-06 19:05:27 +0800
commitdbc7520d19c81565b33128ca165b721c9e4fdca8 (patch)
tree5c45e3a7070728c6d942294e9deaef2ab5f67c2d /tests/PackageWatchdog
parentd23419c15c43cb1f075bce786ee90804de2a80d5 (diff)
Remove unused code (6/n)
Bug: 140472424 Test: atest PackageWatchdogTest Change-Id: I9c42b20785c3002a4d73423a0cac26e3d45640eb
Diffstat (limited to 'tests/PackageWatchdog')
-rw-r--r--tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java70
1 files changed, 0 insertions, 70 deletions
diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
index 7f75dbc81bca..2d867f9d754f 100644
--- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
+++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
@@ -20,7 +20,6 @@ import static android.service.watchdog.ExplicitHealthCheckService.PackageConfig;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -65,8 +64,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-// TODO: Write test without using PackageWatchdog#getPackages. Just rely on
-// behavior of observers receiving crash notifications or not to determine if it's registered
// TODO: Use Truth in tests.
/**
* Test PackageWatchdog.
@@ -215,73 +212,6 @@ public class PackageWatchdogTest {
assertEquals(1, observer2.mHealthCheckFailedPackages.size());
}
- /**
- * Test registration, unregistration, package expiry and duration reduction
- */
- @Test
- public void testRegistration() throws Exception {
- PackageWatchdog watchdog = createWatchdog();
- TestObserver observer1 = new TestObserver(OBSERVER_NAME_1);
- TestObserver observer2 = new TestObserver(OBSERVER_NAME_2);
- TestObserver observer3 = new TestObserver(OBSERVER_NAME_3);
-
- // Start observing for observer1 which will be unregistered
- watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION);
- // Start observing for observer2 which will expire
- watchdog.startObservingHealth(observer2, Arrays.asList(APP_A, APP_B), SHORT_DURATION);
- // Start observing for observer3 which will have expiry duration reduced
- watchdog.startObservingHealth(observer3, Arrays.asList(APP_A), LONG_DURATION);
-
- // Verify packages observed at start
- // 1
- assertEquals(1, watchdog.getPackages(observer1).size());
- assertTrue(watchdog.getPackages(observer1).contains(APP_A));
- // 2
- assertEquals(2, watchdog.getPackages(observer2).size());
- assertTrue(watchdog.getPackages(observer2).contains(APP_A));
- assertTrue(watchdog.getPackages(observer2).contains(APP_B));
- // 3
- assertEquals(1, watchdog.getPackages(observer3).size());
- assertTrue(watchdog.getPackages(observer3).contains(APP_A));
-
- // Then unregister observer1
- watchdog.unregisterHealthObserver(observer1);
-
- // Verify observer2 and observer3 left
- // 1
- assertNull(watchdog.getPackages(observer1));
- // 2
- assertEquals(2, watchdog.getPackages(observer2).size());
- assertTrue(watchdog.getPackages(observer2).contains(APP_A));
- assertTrue(watchdog.getPackages(observer2).contains(APP_B));
- // 3
- assertEquals(1, watchdog.getPackages(observer3).size());
- assertTrue(watchdog.getPackages(observer3).contains(APP_A));
-
- // Then advance time a little and run messages in Handlers so observer2 expires
- moveTimeForwardAndDispatch(SHORT_DURATION);
-
- // Verify observer3 left with reduced expiry duration
- // 1
- assertNull(watchdog.getPackages(observer1));
- // 2
- assertNull(watchdog.getPackages(observer2));
- // 3
- assertEquals(1, watchdog.getPackages(observer3).size());
- assertTrue(watchdog.getPackages(observer3).contains(APP_A));
-
- // Then advance time some more and run messages in Handlers so observer3 expires
- moveTimeForwardAndDispatch(LONG_DURATION);
-
- // Verify observer3 expired
- // 1
- assertNull(watchdog.getPackages(observer1));
- // 2
- assertNull(watchdog.getPackages(observer2));
- // 3
- assertNull(watchdog.getPackages(observer3));
- }
-
/** Observing already observed package extends the observation time. */
@Test
public void testObserveAlreadyObservedPackage() {