Add metric for battery defender am: 6590b368f2 am: 7acf3fc852

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

Change-Id: I7271cb28f899eaa816d1243795dde3e8d91766b5

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

@@ -139,6 +139,8 @@ public final class BatteryChartPreferenceControllerTest {
 
         mBatteryChartPreferenceController.onResume();
         assertThat(BatteryDiffEntry.sResourceCache).isNotEmpty();
+        verify(mMetricsFeatureProvider)
+                .action(mContext, SettingsEnums.OPEN_BATTERY_USAGE);
     }
 
     @Test
@@ -658,8 +660,6 @@ public final class BatteryChartPreferenceControllerTest {
         assertThat(mBatteryChartPreferenceController.mTrapezoidIndex)
             .isEqualTo(expectedIndex);
         assertThat(mBatteryChartPreferenceController.mIsExpanded).isTrue();
-        verify(mMetricsFeatureProvider)
-            .action(mContext, SettingsEnums.OPEN_BATTERY_USAGE);
     }
 
     @Test

tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderActionTest.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.fuelgauge.batterytip.actions;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public final class BatteryDefenderActionTest {
+
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+    private BatteryDefenderAction mBatteryDefenderAction;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    @Mock private SettingsActivity mSettingsActivity;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mContext).when(mSettingsActivity).getApplicationContext();
+        mBatteryDefenderAction = new BatteryDefenderAction(mSettingsActivity);
+    }
+
+    @Test
+    public void testHandlePositiveAction_logMetric() {
+        final int metricKey = 10;
+        mBatteryDefenderAction.handlePositiveAction(metricKey);
+
+        verify(mMetricsFeatureProvider).action(mContext,
+                SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, metricKey);
+    }
+}

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java

@@ -17,13 +17,19 @@ package com.android.settings.fuelgauge.batterytip.tips;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.verify;
+
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 
 import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -32,12 +38,18 @@ import org.robolectric.RuntimeEnvironment;
 public class BatteryDefenderTipTest {
 
     private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
     private BatteryDefenderTip mBatteryDefenderTip;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    @Mock private BatteryTip mBatteryTip;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
         mContext = RuntimeEnvironment.application;
         mBatteryDefenderTip = new BatteryDefenderTip(BatteryTip.StateType.NEW);
     }
@@ -59,4 +71,13 @@ public class BatteryDefenderTipTest {
         assertThat(mBatteryDefenderTip.getIconId())
                 .isEqualTo(R.drawable.ic_battery_status_good_24dp);
     }
+
+    @Test
+    public void testLog_logMetric() {
+        mBatteryDefenderTip.updateState(mBatteryTip);
+        mBatteryDefenderTip.log(mContext, mMetricsFeatureProvider);
+
+        verify(mMetricsFeatureProvider).action(mContext,
+                SettingsEnums.ACTION_BATTERY_DEFENDER_TIP, mBatteryTip.mState);
+    }
 }