Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdb40b93 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am:... 

Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am: f6be4c02" into nyc-mr1-dev-plus-aosp
am: 7d9b79c4

* commit '7d9b79c4':
  ShortcutManager: Break down unit tests

Change-Id: If4e742401c1fa02f48d086f9cbdf50d8100e4f16
parents 694f4ada 7d9b79c4

services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java

0 → 100644
+1476 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java→services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java

+647 −3464

File changed and moved.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java

0 → 100644
+1421 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,10 @@ import java.util.function.BooleanSupplier; 
import java.util.function.Function;

import java.util.function.Function;

import java.util.function.Predicate;

import java.util.function.Predicate;





/**

 * Common utility methods for ShortcutManager tests.  This is used by both CTS and the unit tests.

 * Because it's used by CTS too, it can only access the public APIs.

 */

public class ShortcutManagerTestUtils {

public class ShortcutManagerTestUtils {

    private static final String TAG = "ShortcutManagerUtils";

    private static final String TAG = "ShortcutManagerUtils";