diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-05-12 17:10:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-12 17:10:53 +0000 |
| commit | 9bf12e5ad0c0d7c66f7b55b86ab1f7b153ef518d (patch) | |
| tree | bfc0ba944261280e82077302ff95456acc39fdd7 | |
| parent | 66a46324936132dffed26ff9af173bcb1657d54c (diff) | |
| parent | cf6cfc5d712cdf6dc44bf32b3e23d76fe44b3d25 (diff) | |
| download | cts-9bf12e5ad0c0d7c66f7b55b86ab1f7b153ef518d.tar.gz | |
Merge "cts: Fix flaky testReportShortcutUsed test" into nougat-mr1-cts-dev
| -rw-r--r-- | tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java index aa0ad821800..7cda2272cbe 100644 --- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java +++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java @@ -104,10 +104,6 @@ public class ShortcutManagerUsageTest extends ShortcutManagerCtsTestsBase { // Report usage. final long start = System.currentTimeMillis() - USAGE_STATS_RANGE_ALLOWANCE; - runWithCaller(mPackageContext1, () -> getManager().reportShortcutUsed(id1)); - runWithCaller(mPackageContext1, () -> getManager().reportShortcutUsed(idManifest)); - runWithCaller(mPackageContext1, () -> getManager().reportShortcutUsed(idNonexistance)); - runWithCaller(mPackageContext2, () -> getManager().reportShortcutUsed(id3)); final long end = System.currentTimeMillis() + USAGE_STATS_RANGE_ALLOWANCE; @@ -122,14 +118,18 @@ public class ShortcutManagerUsageTest extends ShortcutManagerCtsTestsBase { mPackageContext2.getPackageName(), id3), "Events weren't populated"); assertTrue(hasEvent(usm.queryEvents(start, end), - mPackageContext1.getPackageName(), id1)); + mPackageContext2.getPackageName(), id3)); + runWithCaller(mPackageContext1, () -> getManager().reportShortcutUsed(id1)); assertTrue(hasEvent(usm.queryEvents(start, end), - mPackageContext1.getPackageName(), idManifest)); - assertFalse(hasEvent(usm.queryEvents(start, end), - mPackageContext1.getPackageName(), idNonexistance)); + mPackageContext1.getPackageName(), id1)); + runWithCaller(mPackageContext1, () -> getManager().reportShortcutUsed(idManifest)); assertTrue(hasEvent(usm.queryEvents(start, end), - mPackageContext2.getPackageName(), id3)); + mPackageContext1.getPackageName(), idManifest)); + + runWithCaller(mPackageContext1, () -> getManager().reportShortcutUsed(idNonexistance)); + assertFalse(hasEvent(usm.queryEvents(start, end), + mPackageContext1.getPackageName(), idNonexistance)); } } |