commit 8db1c85d74ea4f67aeb79f894fbfdf4a2eab962d
author Chiachang Wang <chiachangwang@google.com> Thu Apr 20 12:38:39 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 20 12:38:39 2023 +0000
tree 4689f303036c1146196d82f2dfed480c1fd1f901
parent ae4c8ada7f639503a914ed17b8dab890275e7134
parent 520417cc3e225d2f344bdb3ef676216cdc372b38

Merge "Remove unnecessary mocking in tearDown" am: 520417cc3e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2550152

Change-Id: Iad273cd6c94e90c48958e2b7d8aee507c0f42b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/unit/java/com/android/server/connectivity/VpnTest.java

diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java
index c599d9d..2926c9a 100644
--- a/tests/unit/java/com/android/server/connectivity/VpnTest.java
+++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java
@@ -179,7 +179,6 @@
 import com.android.testutils.DevSdkIgnoreRule;
 import com.android.testutils.DevSdkIgnoreRunner;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -434,11 +433,6 @@
                 .thenReturn(ikeSession);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        doReturn(PERMISSION_DENIED).when(mContext).checkCallingOrSelfPermission(any());
-    }
-
     private <T> void mockService(Class<T> clazz, String name, T service) {
         doReturn(service).when(mContext).getSystemService(name);
         doReturn(name).when(mContext).getSystemServiceName(clazz);