Remove data usage v1 code.
- remove all v1 code and the corresponding feature flag switch. Bug: 117420679 Test: make RunSettingsRoboTests Change-Id: Ib062c03c671b0f860698f5e5e153ab46d963175a
This commit is contained in:
Doris Ling
@@ -18,17 +18,15 @@ package com.android.settings.datausage;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.NetworkStatsHistory;
|
||||
import android.net.NetworkStatsHistory.Entry;
|
||||
import android.util.SparseIntArray;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.widget.UsageView;
|
||||
import com.android.settingslib.net.NetworkCycleChartData;
|
||||
import com.android.settingslib.net.NetworkCycleData;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -37,14 +35,17 @@ import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class ChartDataUsagePreferenceTest {
|
||||
|
||||
private static final long MILLIS_IN_ONE_HOUR = 60 * 60 * 1000;
|
||||
private static final long MILLIS_IN_ONE_DAY = 24 * MILLIS_IN_ONE_HOUR;
|
||||
private static final long TIMESTAMP_NOW = Integer.MAX_VALUE;
|
||||
private static final long TIMESTAMP_START = 1521583200000L;
|
||||
private static final long TIMESTAMP_END = 1521676800000L;
|
||||
|
||||
private NetworkStatsHistory mNetworkStatsHistory;
|
||||
private List<NetworkCycleData> mNetworkCycleData;
|
||||
private NetworkCycleChartData mNetworkCycleChartData;
|
||||
private Context mContext;
|
||||
private ChartDataUsagePreference mPreference;
|
||||
|
||||
@@ -54,23 +55,17 @@ public class ChartDataUsagePreferenceTest {
|
||||
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mPreference = new ChartDataUsagePreference(mContext, null);
|
||||
mNetworkStatsHistory = spy(new NetworkStatsHistory(MILLIS_IN_ONE_HOUR, 10));
|
||||
addTestNetworkEntries();
|
||||
mPreference.setNetworkStats(mNetworkStatsHistory);
|
||||
createTestNetworkData();
|
||||
mPreference.setNetworkCycleData(mNetworkCycleChartData);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void calcPoints_notStartOfData_shouldAddDataPointsOnly() {
|
||||
final long start = TIMESTAMP_NOW - 20 * MILLIS_IN_ONE_DAY;
|
||||
final long end = TIMESTAMP_NOW - 5 * MILLIS_IN_ONE_DAY;
|
||||
mPreference.setVisibleRange(start, end);
|
||||
when(mNetworkStatsHistory.getIndexAfter(start)).thenReturn(2);
|
||||
when(mNetworkStatsHistory.getIndexAfter(end)).thenReturn(7);
|
||||
public void calcPoints_dataAvailableFromCycleStart_shouldAddDataPointsOnly() {
|
||||
final UsageView usageView = mock(UsageView.class);
|
||||
final ArgumentCaptor<SparseIntArray> pointsCaptor =
|
||||
ArgumentCaptor.forClass(SparseIntArray.class);
|
||||
|
||||
mPreference.calcPoints(usageView);
|
||||
mPreference.calcPoints(usageView, mNetworkCycleData.subList(0, 5));
|
||||
|
||||
verify(usageView).addPath(pointsCaptor.capture());
|
||||
SparseIntArray points = pointsCaptor.getValue();
|
||||
@@ -79,17 +74,12 @@ public class ChartDataUsagePreferenceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void calcPoints_startOfData_shouldIndicateStartOfData() {
|
||||
final long start = TIMESTAMP_NOW - 20 * MILLIS_IN_ONE_DAY;
|
||||
final long end = TIMESTAMP_NOW - 5 * MILLIS_IN_ONE_DAY;
|
||||
mPreference.setVisibleRange(start, end);
|
||||
when(mNetworkStatsHistory.getIndexAfter(start)).thenReturn(0);
|
||||
when(mNetworkStatsHistory.getIndexAfter(end)).thenReturn(5);
|
||||
public void calcPoints_dataNotAvailableAtCycleStart_shouldIndicateStartOfData() {
|
||||
final UsageView usageView = mock(UsageView.class);
|
||||
final ArgumentCaptor<SparseIntArray> pointsCaptor =
|
||||
ArgumentCaptor.forClass(SparseIntArray.class);
|
||||
|
||||
mPreference.calcPoints(usageView);
|
||||
mPreference.calcPoints(usageView, mNetworkCycleData.subList(2, 7));
|
||||
|
||||
verify(usageView).addPath(pointsCaptor.capture());
|
||||
SparseIntArray points = pointsCaptor.getValue();
|
||||
@@ -98,35 +88,29 @@ public class ChartDataUsagePreferenceTest {
|
||||
assertThat(points.valueAt(1)).isEqualTo(-1);
|
||||
}
|
||||
|
||||
private void addTestNetworkEntries() {
|
||||
// create 10 arbitary network data
|
||||
mNetworkStatsHistory.setValues(0, createEntry(1521583200000L, 743823454L, 16574289L));
|
||||
mNetworkStatsHistory.setValues(1, createEntry(1521586800000L, 64396L, 160364L));
|
||||
mNetworkStatsHistory.setValues(2, createEntry(1521590400000L, 2832L, 5299L));
|
||||
mNetworkStatsHistory.setValues(3, createEntry(1521655200000L, 83849690L, 3558238L));
|
||||
mNetworkStatsHistory.setValues(4, createEntry(1521658800000L, 1883657L, 353330L));
|
||||
mNetworkStatsHistory.setValues(5, createEntry(1521662400000L, 705259L, 279065L));
|
||||
mNetworkStatsHistory.setValues(6, createEntry(1521666000000L, 216169L, 155302L));
|
||||
mNetworkStatsHistory.setValues(7, createEntry(1521669600000L, 6069175L, 427581L));
|
||||
mNetworkStatsHistory.setValues(8, createEntry(1521673200000L, 120389L, 110807L));
|
||||
mNetworkStatsHistory.setValues(9, createEntry(1521676800000L, 29947L, 73257L));
|
||||
private void createTestNetworkData() {
|
||||
mNetworkCycleData = new ArrayList<>();
|
||||
// create 10 arbitrary network data
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521583200000L, 1521586800000L, 743823454L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521586800000L, 1521590400000L, 64396L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521590400000L, 1521655200000L, 2832L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521655200000L, 1521658800000L, 83849690L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521658800000L, 1521662400000L, 1883657L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521662400000L, 1521666000000L, 705259L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521666000000L, 1521669600000L, 216169L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521669600000L, 1521673200000L, 6069175L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521673200000L, 1521676800000L, 120389L));
|
||||
mNetworkCycleData.add(createNetworkCycleData(1521676800000L, 1521678800000L, 29947L));
|
||||
|
||||
final NetworkCycleChartData.Builder builder = new NetworkCycleChartData.Builder();
|
||||
builder.setUsageBuckets(mNetworkCycleData)
|
||||
.setStartTime(TIMESTAMP_START)
|
||||
.setEndTime(TIMESTAMP_END);
|
||||
mNetworkCycleChartData = builder.build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a network entry to be used to calculate the usage chart. In the calculation, we only
|
||||
* need bucketStart, total bytes (rx + tx), and bucketDuration (which is set when we create
|
||||
* the NetworkStatsHistory object). Other fields are ignored, so we don't initialize here.
|
||||
*
|
||||
* @param start the timestamp when this entry begins
|
||||
* @param rx the total number of received bytes
|
||||
* @param tx the total number of transmitted bytes
|
||||
* @return the network entry with the corresponding start time and data usage
|
||||
*/
|
||||
private Entry createEntry(long start, long rx, long tx) {
|
||||
Entry entry = new Entry();
|
||||
entry.bucketStart = start;
|
||||
entry.rxBytes = rx;
|
||||
entry.txBytes = tx;
|
||||
return entry;
|
||||
private NetworkCycleData createNetworkCycleData(long start, long end, long usage) {
|
||||
return new NetworkCycleData.Builder()
|
||||
.setStartTime(start).setEndTime(end).setTotalUsage(usage).build();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user