Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999

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

tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java

@@ -21,9 +21,12 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
+import android.os.BatteryManager;
 
 import androidx.test.core.app.ApplicationProvider;
 
@@ -33,16 +36,23 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowBatteryManager;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowBatteryManager.class})
 public class BatteryFirstUseDatePreferenceControllerTest {
     private BatteryFirstUseDatePreferenceController mController;
     private Context mContext;
+    private BatteryManager mBatteryManager;
+    private ShadowBatteryManager mShadowBatteryManager;
     private FakeFeatureFactory mFactory;
 
     @Before
     public void setUp() {
         mContext = ApplicationProvider.getApplicationContext();
+        mBatteryManager = mContext.getSystemService(BatteryManager.class);
+        mShadowBatteryManager = shadowOf(mBatteryManager);
         mFactory = FakeFeatureFactory.setupForTest();
         mController = new BatteryFirstUseDatePreferenceController(mContext,
                 "battery_info_first_use_date");
@@ -50,15 +60,37 @@ public class BatteryFirstUseDatePreferenceControllerTest {
 
     @Test
     public void getAvailabilityStatus_dateAvailable_returnAvailable() {
-        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable()).thenReturn(true);
+        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(anyLong()))
+                .thenReturn(true);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_dateUnavailable_returnNotAvailable() {
-        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable()).thenReturn(false);
+        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(anyLong()))
+                .thenReturn(false);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
+
+    @Test
+    public void getSummary_available_returnExpectedDate() {
+        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(anyLong()))
+                .thenReturn(true);
+        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE,
+                1669680000L);
+
+        final CharSequence result = mController.getSummary();
+
+        assertThat(result.toString()).isEqualTo("November 29, 2022");
+    }
+
+    @Test
+    public void getSummary_unavailable_returnNull() {
+        when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(anyLong()))
+                .thenReturn(false);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }

tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java

@@ -21,9 +21,12 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
+import android.os.BatteryManager;
 
 import androidx.test.core.app.ApplicationProvider;
 
@@ -33,17 +36,24 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowBatteryManager;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowBatteryManager.class})
 public class BatteryManufactureDatePreferenceControllerTest {
 
     private BatteryManufactureDatePreferenceController mController;
     private Context mContext;
+    private BatteryManager mBatteryManager;
+    private ShadowBatteryManager mShadowBatteryManager;
     private FakeFeatureFactory mFactory;
 
     @Before
     public void setUp() {
         mContext = ApplicationProvider.getApplicationContext();
+        mBatteryManager = mContext.getSystemService(BatteryManager.class);
+        mShadowBatteryManager = shadowOf(mBatteryManager);
         mFactory = FakeFeatureFactory.setupForTest();
         mController = new BatteryManufactureDatePreferenceController(mContext,
                 "battery_info_manufacture_date");
@@ -51,16 +61,37 @@ public class BatteryManufactureDatePreferenceControllerTest {
 
     @Test
     public void getAvailabilityStatus_dateAvailable_returnAvailable() {
-        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable()).thenReturn(true);
+        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(
+                anyLong())).thenReturn(true);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_dateUnavailable_returnNotAvailable() {
-        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable())
+        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(anyLong()))
                 .thenReturn(false);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
+
+    @Test
+    public void getSummary_available_returnExpectedDate() {
+        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(
+                anyLong())).thenReturn(true);
+        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE,
+                1669680000L);
+
+        final CharSequence result = mController.getSummary();
+
+        assertThat(result.toString()).isEqualTo("November 29, 2022");
+    }
+
+    @Test
+    public void getSummary_unavailable_returnNull() {
+        when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(anyLong()))
+                .thenReturn(false);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }

tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImplTest.java

@@ -18,83 +18,29 @@ package com.android.settings.fuelgauge;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.content.Context;
-import android.os.BatteryManager;
-
-import androidx.test.core.app.ApplicationProvider;
+import static org.mockito.ArgumentMatchers.anyLong;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowBatteryManager;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowBatteryManager.class})
 public class BatterySettingsFeatureProviderImplTest {
-    private BatteryManager mBatteryManager;
-    private ShadowBatteryManager mShadowBatteryManager;
-    private Context mContext;
     private BatterySettingsFeatureProviderImpl mImpl;
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        mBatteryManager = mContext.getSystemService(BatteryManager.class);
-        mShadowBatteryManager = shadowOf(mBatteryManager);
-        mImpl = spy(new BatterySettingsFeatureProviderImpl(mContext));
+        mImpl = new BatterySettingsFeatureProviderImpl();
     }
 
     @Test
     public void isManufactureDateAvailable_returnFalse() {
-        assertThat(mImpl.isManufactureDateAvailable()).isFalse();
+        assertThat(mImpl.isManufactureDateAvailable(anyLong())).isFalse();
     }
 
     @Test
     public void isFirstUseDateAvailable_returnFalse() {
-        assertThat(mImpl.isFirstUseDateAvailable()).isFalse();
-    }
-
-    @Test
-    public void getManufactureDateSummary_available_returnExpectedDate() {
-        doReturn(true).when(mImpl).isManufactureDateAvailable();
-        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE,
-                1669680000L);
-
-        final CharSequence result = mImpl.getManufactureDateSummary();
-
-        assertThat(result.toString()).isEqualTo("November 29, 2022");
-    }
-
-    @Test
-    public void getManufactureDateSummary_unavailable_returnNull() {
-        doReturn(false).when(mImpl).isManufactureDateAvailable();
-
-        assertThat(mImpl.getManufactureDateSummary()).isNull();
-    }
-
-    @Test
-    public void getFirstUseDateSummary_available_returnExpectedDate() {
-        doReturn(true).when(mImpl).isFirstUseDateAvailable();
-        mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE,
-                1669680000L);
-
-        final CharSequence result = mImpl.getFirstUseDateSummary();
-
-        assertThat(result.toString()).isEqualTo("November 29, 2022");
-    }
-
-    @Test
-    public void getFirstUseDateSummary_unavailable_returnNull() {
-        doReturn(false).when(mImpl).isFirstUseDateAvailable();
-
-        assertThat(mImpl.getFirstUseDateSummary()).isNull();
+        assertThat(mImpl.isFirstUseDateAvailable(anyLong())).isFalse();
     }
 }

tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java

@@ -171,7 +171,7 @@ public class FakeFeatureFactory extends FeatureFactory {
     }
 
     @Override
-    public BatterySettingsFeatureProvider getBatterySettingsFeatureProvider(Context context) {
+    public BatterySettingsFeatureProvider getBatterySettingsFeatureProvider() {
         return batterySettingsFeatureProvider;
     }
 

tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt

@@ -84,9 +84,7 @@ class FakeFeatureFactory : FeatureFactory() {
         TODO("Not yet implemented")
     }
 
-    override fun getBatterySettingsFeatureProvider(
-        context: Context?,
-    ): BatterySettingsFeatureProvider {
+    override fun getBatterySettingsFeatureProvider(): BatterySettingsFeatureProvider {
         TODO("Not yet implemented")
     }
 

tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java

@@ -157,7 +157,7 @@ public class FakeFeatureFactory extends FeatureFactory {
     }
 
     @Override
-    public BatterySettingsFeatureProvider getBatterySettingsFeatureProvider(Context context) {
+    public BatterySettingsFeatureProvider getBatterySettingsFeatureProvider() {
         return batterySettingsFeatureProvider;
     }