Remove generic type argument from AnswerWithArguments

It does not add any type safety and was wrong in a number of usages.

Change-Id: I93a76ff60f8dd2fc5eb9786bc312f96f9cfdeaaa

6 files changed, 26 insertions, 38 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/MockAlarmManager.java b/tests/wifitests/src/com/android/server/wifi/MockAlarmManager.java
index c7caafe5d..c8a1c913d 100644
--- a/tests/wifitests/src/com/android/server/wifi/MockAlarmManager.java
+++ b/tests/wifitests/src/com/android/server/wifi/MockAlarmManager.java
@@ -103,7 +103,7 @@ public class MockAlarmManager {
         }
     }
 
-    private class SetListenerAnswer extends AnswerWithArguments<Void> {
+    private class SetListenerAnswer extends AnswerWithArguments {
         public void answer(int type, long triggerAtMillis, String tag,
                 AlarmManager.OnAlarmListener listener, Handler handler) {
             mPendingAlarms.add(new PendingAlarm(type, triggerAtMillis, tag,
@@ -111,7 +111,7 @@ public class MockAlarmManager {
         }
     }
 
-    private class CancelListenerAnswer extends AnswerWithArguments<Void> {
+    private class CancelListenerAnswer extends AnswerWithArguments {
         public void answer(AlarmManager.OnAlarmListener listener) {
             Iterator<PendingAlarm> alarmItr = mPendingAlarms.iterator();
             while (alarmItr.hasNext()) {
diff --git a/tests/wifitests/src/com/android/server/wifi/MockAnswerUtil.java b/tests/wifitests/src/com/android/server/wifi/MockAnswerUtil.java
index 1aa391789..1a3dfa144 100644
--- a/tests/wifitests/src/com/android/server/wifi/MockAnswerUtil.java
+++ b/tests/wifitests/src/com/android/server/wifi/MockAnswerUtil.java
@@ -30,12 +30,12 @@ public class MockAnswerUtil {
 
     /**
      * Answer that calls the method in the Answer called "answer" that matches the type signature of
-     * the method being answered. An error will be thrown if the signature does not match exactly.
-     *
-     * @param <R> the return type of the method
+     * the method being answered. An error will be thrown at runtime if the signature does not match
+     * exactly.
      */
-    public static class AnswerWithArguments<R> implements Answer<R> {
-        public final R answer(InvocationOnMock invocation) throws Throwable {
+    public static class AnswerWithArguments implements Answer<Object> {
+        @Override
+        public final Object answer(InvocationOnMock invocation) throws Throwable {
             Method method = invocation.getMethod();
             try {
                 Method implementation = getClass().getMethod("answer", method.getParameterTypes());
@@ -46,7 +46,7 @@ public class MockAnswerUtil {
                 }
                 Object[] args = invocation.getArguments();
                 try {
-                    return (R) implementation.invoke(this, args);
+                    return implementation.invoke(this, args);
                 } catch (IllegalAccessException e) {
                     throw new RuntimeException("Error invoking answer method", e);
                 } catch (InvocationTargetException e) {
diff --git a/tests/wifitests/src/com/android/server/wifi/MockWifiMonitor.java b/tests/wifitests/src/com/android/server/wifi/MockWifiMonitor.java
index 995d559c6..8b68a1184 100644
--- a/tests/wifitests/src/com/android/server/wifi/MockWifiMonitor.java
+++ b/tests/wifitests/src/com/android/server/wifi/MockWifiMonitor.java
@@ -54,7 +54,7 @@ public class MockWifiMonitor {
     }
 
     private final Map<String, SparseArray<Handler>> mHandlerMap = new HashMap<>();
-    private class RegisterHandlerAnswer extends AnswerWithArguments<Void> {
+    private class RegisterHandlerAnswer extends AnswerWithArguments {
         public void answer(String iface, int what, Handler handler) {
             SparseArray<Handler> ifaceHandlers = mHandlerMap.get(iface);
             if (ifaceHandlers == null) {
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
index e7fbb50d0..146a59abf 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
@@ -51,8 +51,6 @@ import com.android.server.wifi.hotspot2.pps.HomeSP;
 
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -133,7 +131,7 @@ public class WifiConfigStoreTest extends AndroidTestCase {
         mConfiguredNetworks = (ConfigurationMap) configuredNetworksField.get(mConfigStore);
 
         // Intercept writes to networkHistory.txt.
-        doAnswer(new AnswerWithArguments<Void>() {
+        doAnswer(new AnswerWithArguments() {
             public void answer(String filePath, DelayedDiskWrite.Writer writer) throws Exception {
                 final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
                 final DataOutputStream stream = new DataOutputStream(buffer);
@@ -704,29 +702,21 @@ public class WifiConfigStoreTest extends AndroidTestCase {
         reset(mWifiNative);
         when(mWifiNative.addNetwork()).thenReturn(0);
         when(mWifiNative.setNetworkVariable(anyInt(), anyString(), anyString())).thenAnswer(
-                new Answer<Boolean>() {
-                    @Override
-                    public Boolean answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
+                new AnswerWithArguments() {
+                    public boolean answer(int netId, String name, String value) {
                         // Verify that no wpa_supplicant variables were written for any other
                         // network configurations.
-                        assertEquals((Integer) args[0], (Integer) 0);
-                        String name = (String) args[1];
-                        String value = (String) args[2];
+                        assertEquals(netId, 0);
                         networkVariables.put(name, value);
                         return true;
                     }
                 });
         when(mWifiNative.getNetworkVariable(anyInt(), anyString())).then(
-                new Answer<String>() {
-                    @Override
-                    public String answer(InvocationOnMock invocationOnMock) throws Throwable {
-                        Object args[] = invocationOnMock.getArguments();
-                        Integer netId = (Integer) args[0];
-                        String name = (String) args[1];
+                new AnswerWithArguments() {
+                    public String answer(int netId, String name) {
                         // Verify that no wpa_supplicant variables were read for any other
                         // network configurations.
-                        assertEquals(netId, (Integer) 0);
+                        assertEquals(netId, 0);
                         return networkVariables.get(name);
                     }
                 });
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectionTest.java b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectionTest.java
index f537b70e9..0d35f5fcb 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectionTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectionTest.java
@@ -196,7 +196,7 @@ public class WifiQualifiedNetworkSelectionTest {
      */
     private void prepareConfigStore(final WifiConfiguration[] configs) {
         when(mWifiConfigStore.getWifiConfiguration(anyInt()))
-                .then(new AnswerWithArguments<Boolean>() {
+                .then(new AnswerWithArguments() {
                     public WifiConfiguration answer(int netId) {
                         if (netId >= 0 && netId < configs.length) {
                             return configs[netId];
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 9f99cbf93..683d35689 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -18,11 +18,11 @@ package com.android.server.wifi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -64,9 +64,7 @@ import com.android.internal.util.IState;
 import com.android.internal.util.StateMachine;
 import com.android.server.wifi.MockAnswerUtil.AnswerWithArguments;
 import com.android.server.wifi.hotspot2.NetworkDetail;
-import com.android.server.wifi.hotspot2.SupplicantBridge;
 import com.android.server.wifi.hotspot2.Utils;
-import com.android.server.wifi.hotspot2.omadm.PasspointManagementObjectManager;
 import com.android.server.wifi.p2p.WifiP2pServiceImpl;
 
 import org.junit.After;
@@ -161,7 +159,7 @@ public class WifiStateMachineTest {
         when(facade.getService(BatteryStats.SERVICE_NAME)).thenReturn(batteryStatsBinder);
 
         when(facade.makeIpManager(any(Context.class), anyString(), any(IpManager.Callback.class)))
-                .then(new AnswerWithArguments<IpManager>() {
+                .then(new AnswerWithArguments() {
                     public IpManager answer(
                             Context context, String ifname, IpManager.Callback callback) {
                         return new TestIpManager(context, ifname, callback);
@@ -443,7 +441,7 @@ public class WifiStateMachineTest {
 
         when(mWifiNative.addNetwork()).thenReturn(0);
         when(mWifiNative.setNetworkVariable(anyInt(), anyString(), anyString()))
-                .then(new AnswerWithArguments<Boolean>() {
+                .then(new AnswerWithArguments() {
                     public boolean answer(int netId, String name, String value) {
                         if (netId != 0) {
                             Log.d(TAG, "Can't set var " + name + " for " + netId);
@@ -457,7 +455,7 @@ public class WifiStateMachineTest {
                 });
 
         when(mWifiNative.setNetworkExtra(anyInt(), anyString(), (Map<String, String>) anyObject()))
-                .then(new AnswerWithArguments<Boolean>() {
+                .then(new AnswerWithArguments() {
                     public boolean answer(int netId, String name, Map<String, String> values) {
                         if (netId != 0) {
                             Log.d(TAG, "Can't set extra " + name + " for " + netId);
@@ -470,7 +468,7 @@ public class WifiStateMachineTest {
                 });
 
         when(mWifiNative.getNetworkVariable(anyInt(), anyString()))
-                .then(new AnswerWithArguments<String>() {
+                .then(new AnswerWithArguments() {
                     public String answer(int netId, String name) throws Throwable {
                         if (netId != 0) {
                             Log.d(TAG, "Can't find var " + name + " for " + netId);