Move the TestSuiteStub class to tests/
- move the test helper class.
- small clean up for log level
- add a very basic test for runtimehint
Test: unit tests
Bug: 37211399
Change-Id: Ib3d83925180df6ad416ce0bb9bc56a878a15bf21
diff --git a/src/com/android/tradefed/testtype/suite/ITestSuite.java b/src/com/android/tradefed/testtype/suite/ITestSuite.java
index 45db8cf..0b4f3f6 100644
--- a/src/com/android/tradefed/testtype/suite/ITestSuite.java
+++ b/src/com/android/tradefed/testtype/suite/ITestSuite.java
@@ -508,7 +508,7 @@
@Override
public long getRuntimeHint() {
if (mDirectModule != null) {
- CLog.e(
+ CLog.d(
" %s: %s",
mDirectModule.getId(),
TimeUtil.formatElapsedTime(mDirectModule.getRuntimeHint()));
diff --git a/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java b/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java
index 914037f..11701a0 100644
--- a/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java
+++ b/src/com/android/tradefed/testtype/suite/ValidateSuiteConfigHelper.java
@@ -26,6 +26,8 @@
*/
public class ValidateSuiteConfigHelper {
+ private ValidateSuiteConfigHelper() {}
+
/**
* Check that a configuration is properly built to run in a suite.
*
diff --git a/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java b/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java
index 9eaadf3..3750c4d 100644
--- a/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java
+++ b/tests/src/com/android/tradefed/testtype/suite/ITestSuiteTest.java
@@ -386,4 +386,18 @@
assertTrue(test instanceof TestSuiteImpl);
}
}
+
+ /** Test that after being sharded, ITestSuite shows the module runtime that it holds. */
+ @Test
+ public void testGetRuntimeHint() {
+ // default runtime hint is 0, it is only meant to be used for sharding.
+ assertEquals(0l, mTestSuite.getRuntimeHint());
+ mTestSuite = new TestSuiteImpl(5);
+ Collection<IRemoteTest> tests = mTestSuite.split(3);
+ for (IRemoteTest test : tests) {
+ assertTrue(test instanceof TestSuiteImpl);
+ // once sharded modules from the shard start reporting their runtime.
+ assertEquals(60000l, ((TestSuiteImpl) test).getRuntimeHint());
+ }
+ }
}
diff --git a/src/com/android/tradefed/testtype/suite/TestSuiteStub.java b/tests/src/com/android/tradefed/testtype/suite/TestSuiteStub.java
similarity index 100%
rename from src/com/android/tradefed/testtype/suite/TestSuiteStub.java
rename to tests/src/com/android/tradefed/testtype/suite/TestSuiteStub.java
