am 28863e29: am 8ac0ab1b: Merge "TIF: make TvProviderPerfTest stable." into lollipop-mr1-cts-dev
* commit '28863e290e8bd16b3d318de03733dc6be26f5f58':
TIF: make TvProviderPerfTest stable.
diff --git a/suite/cts/deviceTests/tvproviderperf/src/com/android/cts/tvproviderperf/TvProviderPerfTest.java b/suite/cts/deviceTests/tvproviderperf/src/com/android/cts/tvproviderperf/TvProviderPerfTest.java
index df89cae..286d4fd 100644
--- a/suite/cts/deviceTests/tvproviderperf/src/com/android/cts/tvproviderperf/TvProviderPerfTest.java
+++ b/suite/cts/deviceTests/tvproviderperf/src/com/android/cts/tvproviderperf/TvProviderPerfTest.java
@@ -50,6 +50,7 @@
*/
public class TvProviderPerfTest extends CtsAndroidTestCase {
private static final int TRANSACTION_RUNS = 100;
+ private static final int QUERY_RUNS = 10;
private ContentResolver mContentResolver;
private String mInputId;
@@ -76,7 +77,7 @@
}
}
- @TimeoutReq(minutes = 10)
+ @TimeoutReq(minutes = 8)
public void testChannels() throws Exception {
if (!mHasTvInputFramework) return;
double[] averages = new double[4];
@@ -138,11 +139,11 @@
averages[1] = Stat.getAverage(applyBatchTimes);
// Query
- applyBatchTimes = MeasureTime.measure(TRANSACTION_RUNS, new MeasureRun() {
+ applyBatchTimes = MeasureTime.measure(QUERY_RUNS, new MeasureRun() {
@Override
public void run(int i) {
int j = 0;
- try (final Cursor cursor = mContentResolver.query(Channels.CONTENT_URI, null, null,
+ try (Cursor cursor = mContentResolver.query(Channels.CONTENT_URI, null, null,
null, null)) {
while (cursor.moveToNext()) {
++j;
@@ -169,7 +170,7 @@
averages, ResultType.LOWER_BETTER, ResultUnit.MS);
}
- @TimeoutReq(minutes = 15)
+ @TimeoutReq(minutes = 12)
public void testPrograms() throws Exception {
if (!mHasTvInputFramework) return;
double[] averages = new double[6];
@@ -234,7 +235,7 @@
public void run(int i) {
Uri channelUri = channelUris.get(i);
operations.clear();
- try (final Cursor cursor = mContentResolver.query(
+ try (Cursor cursor = mContentResolver.query(
TvContract.buildProgramsUriForChannel(channelUri),
projection, null, null, null)) {
long startTimeMs = 0;
@@ -262,11 +263,11 @@
averages[1] = Stat.getAverage(applyBatchTimes);
// Query
- applyBatchTimes = MeasureTime.measure(TRANSACTION_RUNS, new MeasureRun() {
+ applyBatchTimes = MeasureTime.measure(QUERY_RUNS, new MeasureRun() {
@Override
public void run(int i) {
int j = 0;
- try (final Cursor cursor = mContentResolver.query(Programs.CONTENT_URI, null, null,
+ try (Cursor cursor = mContentResolver.query(Programs.CONTENT_URI, null, null,
null, null)) {
while (cursor.moveToNext()) {
++j;
@@ -279,12 +280,12 @@
averages[2] = Stat.getAverage(applyBatchTimes);
// Query programs with selection
- applyBatchTimes = MeasureTime.measure(NUM_CHANNELS, new MeasureRun() {
+ applyBatchTimes = MeasureTime.measure(QUERY_RUNS, new MeasureRun() {
@Override
public void run(int i) {
Uri channelUri = channelUris.get(i);
int j = 0;
- try (final Cursor cursor = mContentResolver.query(
+ try (Cursor cursor = mContentResolver.query(
TvContract.buildProgramsUriForChannel(
channelUri, 0,
PROGRAM_DURATION_MS * TRANSACTION_SIZE / 2),