| commit | 1c370c647a3b6a598577a8741034929ece818cce | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Apr 20 12:40:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 12:40:41 2023 +0000 |
| tree | 88b346754ff1a645d92c73f91a9651da9fac80ae | |
| parent | a3f2f58d1683bd0663e82f2dbbf96be899c145c6 [diff] | |
| parent | 520417cc3e225d2f344bdb3ef676216cdc372b38 [diff] |
Merge "Remove unnecessary mocking in tearDown" am: 520417cc3e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2550152 Change-Id: Ibcc04d0633dfe96900c0181d97b390c159dd28b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);