enable setting default iteration count via annotation

Bug: 19125024
Change-Id: Ib5dc4b1e766db429546abb867fff262d7421c246

2 files changed, 4 insertions, 3 deletions

diff --git a/src/android/support/test/jank/JankTest.java b/src/android/support/test/jank/JankTest.java
index 67726ac..45a386b 100644
--- a/src/android/support/test/jank/JankTest.java
+++ b/src/android/support/test/jank/JankTest.java
@@ -32,6 +32,9 @@ public @interface JankTest {
     /** The minimum number of frames expected */
     int expectedFrames();
 
+    /** Default iteration count to run if not specified by command line **/
+    int defaultIterationCount() default 20;
+
     /**
      * Alternate method to execute before the test method
      * <p>
diff --git a/src/android/support/test/jank/JankTestBase.java b/src/android/support/test/jank/JankTestBase.java
index 821090b..fd85fab 100644
--- a/src/android/support/test/jank/JankTestBase.java
+++ b/src/android/support/test/jank/JankTestBase.java
@@ -46,8 +46,6 @@ public class JankTestBase extends InstrumentationTestCase {
     public static final String KEY_AVG_FPS = "avg-fps";
     public static final String KEY_AVG_MAX_FRAME_DURATION = "avg-max-frame-duration";
 
-    public static final String DEFAULT_ITERATIONS = "20";
-
     private Bundle arguments = null;
     private int mCurrentIteration = 0;
 
@@ -112,7 +110,7 @@ public class JankTestBase extends InstrumentationTestCase {
 
         // Execute the test several times according to the "iteration" parameter
         int iterations = Integer.valueOf(getArguments().getString("iterations",
-                DEFAULT_ITERATIONS));
+                Integer.toString(annotation.defaultIterationCount())));
         for (; mCurrentIteration < iterations; mCurrentIteration++) {
             // Loop setup
             beforeLoop.invoke(this, (Object[])null);