From 4d006f59bbb7fe41c49ea08e205754f314a4d5b8 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Wed, 15 May 2019 11:07:03 -0700 Subject: [PATCH] Added test coverage to Context.startActivityAsUser Test: atest ContextTest Fixes: 127711435 Change-Id: I7629da8d15ded1b2ac0907f2284289fdb07879ec (cherry picked from commit 7c491a534a2f70dd4ce0bb76eccc57b8b188c90c) --- .../src/android/content/ContextTest.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/core/tests/coretests/src/android/content/ContextTest.java b/core/tests/coretests/src/android/content/ContextTest.java index 2f442c34f2c16..b1a54dcced467 100644 --- a/core/tests/coretests/src/android/content/ContextTest.java +++ b/core/tests/coretests/src/android/content/ContextTest.java @@ -19,6 +19,7 @@ package android.content; import static org.junit.Assert.assertEquals; import android.app.ActivityThread; +import android.os.UserHandle; import android.view.WindowManager; import androidx.test.InstrumentationRegistry; @@ -58,4 +59,32 @@ public class ContextTest { assertEquals(defaultDisplayContext.getDisplay().getDisplayId(), defaultDisplayContext.getDisplayId()); } + + @Test(expected = NullPointerException.class) + public void testStartActivityAsUserNullIntentNullUser() { + final Context testContext = + InstrumentationRegistry.getInstrumentation().getTargetContext(); + testContext.startActivityAsUser(null, null); + } + + @Test(expected = NullPointerException.class) + public void testStartActivityAsUserNullIntentNonNullUser() { + final Context testContext = + InstrumentationRegistry.getInstrumentation().getTargetContext(); + testContext.startActivityAsUser(null, new UserHandle(UserHandle.USER_ALL)); + } + + @Test(expected = NullPointerException.class) + public void testStartActivityAsUserNonNullIntentNullUser() { + final Context testContext = + InstrumentationRegistry.getInstrumentation().getTargetContext(); + testContext.startActivityAsUser(new Intent(), null); + } + + @Test(expected = RuntimeException.class) + public void testStartActivityAsUserNonNullIntentNonNullUser() { + final Context testContext = + InstrumentationRegistry.getInstrumentation().getTargetContext(); + testContext.startActivityAsUser(new Intent(), new UserHandle(UserHandle.USER_ALL)); + } }