Merge "Fix Not executed test count" into nyc-dev
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
index c609163..83283b8 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
@@ -249,8 +249,8 @@
*/
@Override
public void testIgnored(TestIdentifier test) {
- mCurrentResult.notExecuted();
logResult("%s ignored", test);
+ // Ignored tests are not reported
}
/**
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java
index 8714c1d..25d6930 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java
@@ -22,7 +22,10 @@
import com.android.tradefed.result.ITestInvocationListener;
import com.android.tradefed.targetprep.ITargetPreparer;
import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.testtype.IRuntimeHintProvider;
+import com.android.tradefed.testtype.ITestCollector;
import com.android.tradefed.testtype.ITestFilterReceiver;
import junit.framework.TestCase;
@@ -62,7 +65,8 @@
assertEquals("Incorrect exclude filter", TEST_1, mockTest.mExcludeFilters.get(0));
}
- private class MockRemoteTest implements IRemoteTest, ITestFilterReceiver {
+ private class MockRemoteTest implements IRemoteTest, ITestFilterReceiver, IAbiReceiver,
+ IRuntimeHintProvider, ITestCollector {
private final List<String> mIncludeFilters = new ArrayList<>();
private final List<String> mExcludeFilters = new ArrayList<>();
@@ -92,6 +96,20 @@
// Do nothing
}
+ @Override
+ public void setAbi(IAbi abi) {
+ // Do nothing
+ }
+
+ @Override
+ public long getRuntimeHint() {
+ return 1L;
+ }
+
+ @Override
+ public void setCollectTestsOnly(boolean shouldCollectTest) {
+ // Do nothing
+ }
}
private class MockListener extends NoOpTestInvocationListener {}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java
index 52a1aad..d3fe2a7 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java
@@ -19,16 +19,23 @@
import com.android.tradefed.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
import com.android.tradefed.testtype.IBuildReceiver;
import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.testtype.IRuntimeHintProvider;
import com.android.tradefed.testtype.IShardableTest;
+import com.android.tradefed.testtype.ITestCollector;
+import com.android.tradefed.testtype.ITestFilterReceiver;
import junit.framework.Assert;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
-public class ShardableTestStub implements IRemoteTest, IShardableTest, IBuildReceiver {
+public class ShardableTestStub implements IRemoteTest, IShardableTest, IBuildReceiver,
+ IAbiReceiver, IRuntimeHintProvider, ITestCollector, ITestFilterReceiver {
@Option(name = "module")
String mModule;
@@ -70,4 +77,40 @@
}
return mShards;
}
+
+ @Override
+ public void setAbi(IAbi abi) {
+ // Do nothing
+ }
+
+ @Override
+ public long getRuntimeHint() {
+ return 1L;
+ }
+
+ @Override
+ public void setCollectTestsOnly(boolean shouldCollectTest) {
+ // Do nothing
+ }
+
+ @Override
+ public void addIncludeFilter(String filter) {
+
+ }
+
+ @Override
+ public void addAllIncludeFilters(List<String> filters) {
+
+ }
+
+ @Override
+ public void addExcludeFilter(String filter) {
+
+ }
+
+ @Override
+ public void addAllExcludeFilters(List<String> filters) {
+
+ }
+
}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java
index 8a6ab69..3acbcb9 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java
@@ -18,9 +18,19 @@
import com.android.tradefed.config.Option;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.testtype.IRuntimeHintProvider;
+import com.android.tradefed.testtype.IShardableTest;
+import com.android.tradefed.testtype.ITestCollector;
+import com.android.tradefed.testtype.ITestFilterReceiver;
-public class TestStub implements IRemoteTest {
+import java.util.List;
+
+public class TestStub implements IRemoteTest, IAbiReceiver, IRuntimeHintProvider, ITestCollector,
+ ITestFilterReceiver {
@Option(name = "module")
String mModule;
@@ -37,4 +47,39 @@
// Do nothing
}
+ @Override
+ public void setAbi(IAbi abi) {
+ // Do nothing
+ }
+
+ @Override
+ public long getRuntimeHint() {
+ return 1L;
+ }
+
+ @Override
+ public void setCollectTestsOnly(boolean shouldCollectTest) {
+ // Do nothing
+ }
+
+ @Override
+ public void addIncludeFilter(String filter) {
+
+ }
+
+ @Override
+ public void addAllIncludeFilters(List<String> filters) {
+
+ }
+
+ @Override
+ public void addExcludeFilter(String filter) {
+
+ }
+
+ @Override
+ public void addAllExcludeFilters(List<String> filters) {
+
+ }
+
}