diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-17 13:44:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-17 13:44:40 +0000 |
| commit | 0c953680838dddc8c4890a73511bcca44dbd4ad9 (patch) | |
| tree | 77a65872eea9db3a0ac4d8a85f9b140b8e1a9aa2 | |
| parent | ab5e48f755fefe77eba87422e6b2b316152572cd (diff) | |
| parent | 7000e9738faa6bfead9ae6f44a187109c17261cc (diff) | |
Remove ambiguous wildcard import of org.mockito.Matchers.* am: 029cbaebb9
am: 7000e9738f
Change-Id: I0ca3a2be68e0e6f1ffe98ad914ed2b0844957587
3 files changed, 0 insertions, 3 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java index d0aa6ffae..c7b6180d4 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java @@ -27,7 +27,6 @@ import static com.android.server.wifi.WifiController.CMD_SET_AP; import static com.android.server.wifi.WifiController.CMD_WIFI_TOGGLED; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import android.content.ContentResolver; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java index 1bbdda981..d5d79b831 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java @@ -18,7 +18,6 @@ package com.android.server.wifi; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import android.content.Context; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java index 738318c8e..02cb633d0 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java @@ -19,7 +19,6 @@ package com.android.server.wifi.scanner; import static com.android.server.wifi.ScanTestUtil.*; import static org.junit.Assert.*; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import android.app.test.MockAnswerUtil.AnswerWithArguments; |