Merge "Add since_visible_millis to Settings action logs."
This commit is contained in:
committed by
Android (Google) Code Review
commit
41df9518ab
@@ -28,6 +28,8 @@ import com.android.settings.overlay.FeatureFactory;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
@@ -42,24 +44,35 @@ import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.verifyNoMoreInteractions;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class MetricsFeatureProviderTest {
|
||||
private static int CATEGORY = 10;
|
||||
private static boolean SUBTYPE_BOOLEAN = true;
|
||||
private static int SUBTYPE_INTEGER = 1;
|
||||
private static long ELAPSED_TIME = 1000;
|
||||
|
||||
@Mock private LogWriter mockLogWriter;
|
||||
@Mock private VisibilityLoggerMixin mockVisibilityLogger;
|
||||
|
||||
@Mock
|
||||
private LogWriter mLogWriter;
|
||||
private Context mContext;
|
||||
private MetricsFeatureProvider mProvider;
|
||||
|
||||
@Captor
|
||||
private ArgumentCaptor<Pair> mPairCaptor;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mProvider = new MetricsFeatureProvider();
|
||||
List<LogWriter> writers = new ArrayList<>();
|
||||
writers.add(mLogWriter);
|
||||
writers.add(mockLogWriter);
|
||||
ReflectionHelpers.setField(mProvider, "mLoggerWriters", writers);
|
||||
|
||||
when(mockVisibilityLogger.elapsedTimeSinceVisible()).thenReturn(ELAPSED_TIME);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -77,7 +90,7 @@ public class MetricsFeatureProviderTest {
|
||||
mProvider.logDashboardStartIntent(mContext, null /* intent */,
|
||||
MetricsEvent.SETTINGS_GESTURES);
|
||||
|
||||
verifyNoMoreInteractions(mLogWriter);
|
||||
verifyNoMoreInteractions(mockLogWriter);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -86,7 +99,7 @@ public class MetricsFeatureProviderTest {
|
||||
|
||||
mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
|
||||
|
||||
verify(mLogWriter).action(
|
||||
verify(mockLogWriter).action(
|
||||
eq(mContext),
|
||||
eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
|
||||
anyString(),
|
||||
@@ -99,10 +112,32 @@ public class MetricsFeatureProviderTest {
|
||||
|
||||
mProvider.logDashboardStartIntent(mContext, intent, MetricsEvent.SETTINGS_GESTURES);
|
||||
|
||||
verify(mLogWriter).action(
|
||||
verify(mockLogWriter).action(
|
||||
eq(mContext),
|
||||
eq(MetricsEvent.ACTION_SETTINGS_TILE_CLICK),
|
||||
anyString(),
|
||||
eq(Pair.create(MetricsEvent.FIELD_CONTEXT, MetricsEvent.SETTINGS_GESTURES)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void action_BooleanLogsElapsedTime() {
|
||||
mProvider.action(mockVisibilityLogger, CATEGORY, SUBTYPE_BOOLEAN);
|
||||
verify(mockLogWriter).action(eq(CATEGORY), eq(SUBTYPE_BOOLEAN), mPairCaptor.capture());
|
||||
|
||||
Pair value = mPairCaptor.getValue();
|
||||
assertThat(value.first instanceof Integer).isTrue();
|
||||
assertThat((int) value.first).isEqualTo(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS);
|
||||
assertThat(value.second).isEqualTo(ELAPSED_TIME);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void action_IntegerLogsElapsedTime() {
|
||||
mProvider.action(mockVisibilityLogger, CATEGORY, SUBTYPE_INTEGER);
|
||||
verify(mockLogWriter).action(eq(CATEGORY), eq(SUBTYPE_INTEGER), mPairCaptor.capture());
|
||||
|
||||
Pair value = mPairCaptor.getValue();
|
||||
assertThat(value.first instanceof Integer).isTrue();
|
||||
assertThat((int) value.first).isEqualTo(MetricsEvent.NOTIFICATION_SINCE_VISIBLE_MILLIS);
|
||||
assertThat(value.second).isEqualTo(ELAPSED_TIME);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user