Remove networkScorer wrapper

Also modified NetworkScorerPickerPreferenceController to register itself
in xml directily

Bug: 76167422
Test: robotests
Change-Id: I4a216b5e6845aecd6aaeed0ed9b3e06c9e0fc590

tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java

@@ -23,12 +23,12 @@ import static org.mockito.Mockito.when;
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.net.NetworkScoreManager;
 import android.net.NetworkScorerAppData;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,6 +36,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.Collections;
 
@@ -48,14 +49,15 @@ public class NetworkScorerPickerPreferenceControllerTest {
 
     private Context mContext;
     @Mock
-    private NetworkScoreManagerWrapper mNetworkScorer;
+    private NetworkScoreManager mNetworkScorer;
     private NetworkScorerPickerPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mController = new NetworkScorerPickerPreferenceController(mContext, mNetworkScorer);
+        mController = new NetworkScorerPickerPreferenceController(mContext, "test_key");
+        ReflectionHelpers.setField(mController, "mNetworkScoreManager", mNetworkScorer);
     }
 
     @Test

tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.net.NetworkScoreManager;
 import android.net.NetworkScorerAppData;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
@@ -33,7 +34,7 @@ import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.RadioButtonPreference;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
+
 import com.google.android.collect.Lists;
 
 import org.junit.Before;
@@ -56,7 +57,7 @@ public class NetworkScorerPickerTest {
 
     private Context mContext;
     @Mock
-    private NetworkScoreManagerWrapper mNetworkScoreManager;
+    private NetworkScoreManager mNetworkScoreManager;
     @Mock
     private PreferenceScreen mPreferenceScreen;
 
@@ -111,7 +112,7 @@ public class NetworkScorerPickerTest {
 
         verify(mPreferenceScreen).addPreference(arg.capture());
         assertThat(arg.getValue().getTitle())
-            .isEqualTo(mContext.getString(R.string.network_scorer_picker_none_preference));
+                .isEqualTo(mContext.getString(R.string.network_scorer_picker_none_preference));
         assertThat(arg.getValue().isChecked()).isTrue();
     }
 
@@ -169,13 +170,13 @@ public class NetworkScorerPickerTest {
         private final Context mContext;
         private final PreferenceScreen mScreen;
         private final PreferenceManager mPrefManager;
-        private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
+        private final NetworkScoreManager mNetworkScoreManager;
 
         public TestFragment(Context context, PreferenceScreen preferenceScreen,
-                NetworkScoreManagerWrapper networkScoreManagerWrapper) {
+                NetworkScoreManager networkScoreManager) {
             mContext = context;
             mScreen = preferenceScreen;
-            mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
+            mNetworkScoreManager = networkScoreManager;
             mPrefManager = mock(PreferenceManager.class);
             when(mPrefManager.getContext()).thenReturn(context);
         }
@@ -196,8 +197,8 @@ public class NetworkScorerPickerTest {
         }
 
         @Override
-        NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
-            return mNetworkScoreManagerWrapper;
+        NetworkScoreManager createNetworkScorerManager(Context context) {
+            return mNetworkScoreManager;
         }
     }
 }

tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java

@@ -16,8 +16,10 @@
 
 package com.android.settings.wifi;
 
+import static android.content.Context.NETWORK_SCORE_SERVICE;
 import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE;
-import static com.android.settings.wifi.UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY;
+import static com.android.settings.wifi.UseOpenWifiPreferenceController
+        .REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -38,8 +40,8 @@ import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+
 import com.google.common.collect.Lists;
 
 import org.junit.Before;
@@ -51,6 +53,7 @@ import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -74,7 +77,7 @@ public class UseOpenWifiPreferenceControllerTest {
     @Mock
     private Fragment mFragment;
     @Mock
-    private NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
+    private NetworkScoreManager mNetworkScoreManager;
     @Captor
     private ArgumentCaptor<Intent> mIntentCaptor;
     private Context mContext;
@@ -85,23 +88,25 @@ public class UseOpenWifiPreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
 
         mContext = RuntimeEnvironment.application;
+        ShadowApplication.getInstance()
+                .setSystemService(NETWORK_SCORE_SERVICE, mNetworkScoreManager);
     }
 
     private void createController() {
-        mController = new UseOpenWifiPreferenceController(
-                mContext, mFragment, mNetworkScoreManagerWrapper, mLifecycle);
+        mController = new UseOpenWifiPreferenceController(mContext, mFragment, mLifecycle);
     }
 
     /**
      * Sets the scorers.
+     *
      * @param scorers list of scorers returned by {@link NetworkScoreManager#getAllValidScorers()}.
      *                First scorer in the list is the active scorer.
      */
     private void setupScorers(@NonNull List<NetworkScorerAppData> scorers) {
-        when(mNetworkScoreManagerWrapper.getActiveScorerPackage())
-            .thenReturn(sEnableActivityComponent.getPackageName());
-        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers);
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0));
+        when(mNetworkScoreManager.getActiveScorerPackage())
+                .thenReturn(sEnableActivityComponent.getPackageName());
+        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(scorers);
+        when(mNetworkScoreManager.getActiveScorer()).thenReturn(scorers.get(0));
     }
 
     @Test
@@ -130,7 +135,7 @@ public class UseOpenWifiPreferenceControllerTest {
     @Test
     public void testIsAvailable_returnsTrueIfNonActiveScorerSupported() {
         setupScorers(Lists.newArrayList(sAppDataNoActivity, sAppData));
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(sAppDataNoActivity);
+        when(mNetworkScoreManager.getActiveScorer()).thenReturn(sAppDataNoActivity);
         createController();
 
         assertThat(mController.isAvailable()).isTrue();
@@ -192,7 +197,7 @@ public class UseOpenWifiPreferenceControllerTest {
         setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
         createController();
 
-        assertThat(mController.onActivityResult(234 /* requestCode */ , Activity.RESULT_OK))
+        assertThat(mController.onActivityResult(234 /* requestCode */, Activity.RESULT_OK))
                 .isEqualTo(false);
         assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE))
                 .isNull();
@@ -240,7 +245,7 @@ public class UseOpenWifiPreferenceControllerTest {
 
     @Test
     public void updateState_noScorer_preferenceDisabled_summaryChanged() {
-        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(new ArrayList<>());
+        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(new ArrayList<>());
         createController();
 
         final SwitchPreference preference = mock(SwitchPreference.class);