Merge pull request #2961 from wmathurin/fix-kv-inspector-activity-test

Fix KeyValueStoreInspectorActivityTest and SmartStoreInspectorActivityTest

Author: wmathurin

libs/test/SmartStoreTest/src/com/salesforce/androidsdk/smartstore/store/KeyValueStoreInspectorActivityTest.java

@@ -37,13 +37,16 @@
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static org.hamcrest.CoreMatchers.allOf;
 
+import android.Manifest;
+import android.os.Build;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.espresso.matcher.RootMatchers;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.rule.GrantPermissionRule;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject;
 import androidx.test.uiautomator.UiObjectNotFoundException;
@@ -57,6 +60,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -78,6 +82,12 @@ public class KeyValueStoreInspectorActivityTest {
     private final String VALUE_3 = "this is a third value in ";
     private final String GLOBAL_STORE_TEXT = KeyValueStoreInspectorActivity.GLOBAL_STORE;
 
+    // Pre-grant POST_NOTIFICATIONS so the permission dialog doesn't steal focus from the activity
+    @Rule
+    public GrantPermissionRule permissionRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+            ? GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS)
+            : GrantPermissionRule.grant();
+
     public ActivityScenario<KeyValueStoreInspectorActivity> activityScenario;
     public KeyValueStoreInspectorActivity keyValueStoreInspectorActivity;
 

libs/test/SmartStoreTest/src/com/salesforce/androidsdk/smartstore/store/SmartStoreInspectorActivityTest.java

@@ -33,7 +33,9 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
+import android.Manifest;
 import android.content.Context;
+import android.os.Build;
 import android.widget.ListAdapter;
 import android.widget.MultiAutoCompleteTextView;
 import android.widget.TextView;
@@ -42,6 +44,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.rule.GrantPermissionRule;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject;
 import androidx.test.uiautomator.UiObjectNotFoundException;
@@ -59,6 +62,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -81,6 +85,12 @@ public class SmartStoreInspectorActivityTest {
 	private Context targetContext;
 	private SmartStore store;
 
+	// Pre-grant POST_NOTIFICATIONS so the permission dialog doesn't steal focus from the activity
+	@Rule
+	public GrantPermissionRule permissionRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+			? GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS)
+			: GrantPermissionRule.grant();
+
 	public ActivityScenario<SmartStoreInspectorActivity> activityScenario;
 	public SmartStoreInspectorActivity smartStoreInspectorActivity;