Merge "Fix AndroidJUnitTest sharding with empty runner" into pie-cts-dev

am: e673160e59

Change-Id: Ib40cfb1916e3735522fdf0be37e402f3f4175ff1

2 files changed, 16 insertions, 0 deletions

diff --git a/src/com/android/tradefed/testtype/AndroidJUnitTest.java b/src/com/android/tradefed/testtype/AndroidJUnitTest.java
index db501082a..8e8ce8190 100644
--- a/src/com/android/tradefed/testtype/AndroidJUnitTest.java
+++ b/src/com/android/tradefed/testtype/AndroidJUnitTest.java
@@ -404,6 +404,11 @@ public class AndroidJUnitTest extends InstrumentationTest implements IRuntimeHin
      * Helper to return if the runner is one that support sharding.
      */
     private boolean isShardable() {
+        // Edge toward shardable if no explicit runner specified. The runner will be determined
+        // later and if not shardable only the first shard will run.
+        if (getRunnerName() == null) {
+            return true;
+        }
         return ListInstrumentationParser.SHARDABLE_RUNNERS.contains(getRunnerName());
     }
 
diff --git a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java
index aaefa60d4..c291318e0 100644
--- a/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java
+++ b/tests/src/com/android/tradefed/testtype/AndroidJUnitTestTest.java
@@ -31,6 +31,7 @@ import junit.framework.TestCase;
 import org.easymock.EasyMock;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -376,6 +377,16 @@ public class AndroidJUnitTestTest extends TestCase {
         assertNull(mAndroidJUnitTest.split());
     }
 
+    /** Test that {@link AndroidJUnitTest#split()} returns the split if no runner specified. */
+    public void testSplit_noRunner() {
+        AndroidJUnitTest test = new AndroidJUnitTest();
+        test.setRunnerName(null);
+        assertNull(test.getRunnerName());
+        Collection<IRemoteTest> listTests = test.split(4);
+        assertNotNull(listTests);
+        assertEquals(4, listTests.size());
+    }
+
     /** Test that {@link AndroidJUnitTest#split(int)} returns 3 shards when requested to do so. */
     public void testSplit_threeShards() throws Exception {
         mAndroidJUnitTest = new AndroidJUnitTest();