diff --git a/binder/build.gradle b/binder/build.gradle index c5bb988562..537c23a009 100644 --- a/binder/build.gradle +++ b/binder/build.gradle @@ -13,8 +13,6 @@ android { srcDirs += "${projectDir}/../core/src/test/java/" setIncludes(["io/grpc/internal/FakeClock.java", "io/grpc/binder/**"]) - exclude 'io/grpc/binder/ServerSecurityPolicyTest.java' - exclude 'io/grpc/binder/SecurityPoliciesTest.java' } } androidTest { diff --git a/binder/src/test/java/io/grpc/binder/SecurityPoliciesTest.java b/binder/src/test/java/io/grpc/binder/SecurityPoliciesTest.java index 604addb3b0..6fd9e22eba 100644 --- a/binder/src/test/java/io/grpc/binder/SecurityPoliciesTest.java +++ b/binder/src/test/java/io/grpc/binder/SecurityPoliciesTest.java @@ -18,27 +18,21 @@ package io.grpc.binder; import static com.google.common.truth.Truth.assertThat; +import android.os.Process; import io.grpc.Status; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.shadows.ShadowProcess; @RunWith(RobolectricTestRunner.class) public final class SecurityPoliciesTest { - private static final int MY_UID = 1234; + private static final int MY_UID = Process.myUid(); private static final int OTHER_UID = MY_UID + 1; private static final String PERMISSION_DENIED_REASONS = "some reasons"; private SecurityPolicy policy; - @Before - public void setUp() { - ShadowProcess.setUid(MY_UID); - } - @Test public void testInternalOnly() throws Exception { policy = SecurityPolicies.internalOnly(); diff --git a/binder/src/test/java/io/grpc/binder/ServerSecurityPolicyTest.java b/binder/src/test/java/io/grpc/binder/ServerSecurityPolicyTest.java index 8c61b6119b..95a4fe5a6e 100644 --- a/binder/src/test/java/io/grpc/binder/ServerSecurityPolicyTest.java +++ b/binder/src/test/java/io/grpc/binder/ServerSecurityPolicyTest.java @@ -18,13 +18,12 @@ package io.grpc.binder; import static com.google.common.truth.Truth.assertThat; +import android.os.Process; import com.google.common.base.Function; import io.grpc.Status; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.shadows.ShadowProcess; @RunWith(RobolectricTestRunner.class) public final class ServerSecurityPolicyTest { @@ -33,16 +32,11 @@ public final class ServerSecurityPolicyTest { private static final String SERVICE2 = "service_two"; private static final String SERVICE3 = "service_three"; - private static final int MY_UID = 1234; + private static final int MY_UID = Process.myUid(); private static final int OTHER_UID = MY_UID + 1; ServerSecurityPolicy policy; - @Before - public void setUp() { - ShadowProcess.setUid(MY_UID); - } - @Test public void testDefaultInternalOnly() { policy = new ServerSecurityPolicy();