am 4ea415df: Merge "Exclude DeviceSetup in the report as a TestPackage" into lmp-dev
* commit '4ea415df426a077ddbd1f22433349df9aacd464f':
Exclude DeviceSetup in the report as a TestPackage
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java b/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java
index e8d6e71..8224481 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/result/CtsXmlResultReporter.java
@@ -223,8 +223,10 @@
@Override
public void testRunStarted(String id, int numTests) {
- mCurrentPkgResult = mResults.getOrCreatePackage(id);
mIsDeviceInfoRun = DeviceInfoCollector.IDS.contains(id);
+ if (!mIsDeviceInfoRun) {
+ mCurrentPkgResult = mResults.getOrCreatePackage(id);
+ }
}
/**
@@ -232,7 +234,9 @@
*/
@Override
public void testStarted(TestIdentifier test) {
- mCurrentPkgResult.insertTest(test);
+ if (!mIsDeviceInfoRun) {
+ mCurrentPkgResult.insertTest(test);
+ }
}
/**
@@ -240,7 +244,9 @@
*/
@Override
public void testFailed(TestIdentifier test, String trace) {
- mCurrentPkgResult.reportTestFailure(test, CtsTestStatus.FAIL, trace);
+ if (!mIsDeviceInfoRun) {
+ mCurrentPkgResult.reportTestFailure(test, CtsTestStatus.FAIL, trace);
+ }
}
/**
@@ -249,7 +255,9 @@
@Override
public void testAssumptionFailure(TestIdentifier test, String trace) {
// TODO: do something different here?
- mCurrentPkgResult.reportTestFailure(test, CtsTestStatus.FAIL, trace);
+ if (!mIsDeviceInfoRun) {
+ mCurrentPkgResult.reportTestFailure(test, CtsTestStatus.FAIL, trace);
+ }
}
/**
@@ -265,7 +273,9 @@
*/
@Override
public void testEnded(TestIdentifier test, Map<String, String> testMetrics) {
- mCurrentPkgResult.reportTestEnded(test, testMetrics);
+ if (!mIsDeviceInfoRun) {
+ mCurrentPkgResult.reportTestEnded(test, testMetrics);
+ }
}
/**
diff --git a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
index 48f1ba5..b74e26c 100644
--- a/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
+++ b/tools/tradefed-host/tests/src/com/android/cts/tradefed/result/CtsXmlResultReporterTest.java
@@ -173,6 +173,21 @@
assertTrue(output.contains(failureTag));
}
+ public void testDeviceSetup() {
+ Map<String, String> emptyMap = Collections.emptyMap();
+ final TestIdentifier testId = new TestIdentifier("android.tests.devicesetup", "TestDeviceSetup");
+ mResultReporter.invocationStarted(mMockBuild);
+ mResultReporter.testRunStarted(AbiUtils.createId(UnitTests.ABI.getName(), testId.getClassName()), 1);
+ mResultReporter.testStarted(testId);
+ mResultReporter.testEnded(testId, emptyMap);
+ mResultReporter.testRunEnded(3, emptyMap);
+ mResultReporter.invocationEnded(1);
+ String output = getOutput();
+ // TODO: consider doing xml based compare
+ final String deviceSetupTag = "appPackageName=\"android.tests.devicesetup\"";
+ assertFalse(output, output.contains(deviceSetupTag));
+ }
+
/**
* Gets the output produced, stripping it of extraneous whitespace characters.
*/