summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Desprez <jdesprez@google.com>2024-02-21 14:52:03 -0800
committerJulien Desprez <jdesprez@google.com>2024-02-21 14:52:03 -0800
commitc82496a545de4fe7bdda5afacaf71458ff425187 (patch)
tree5f37249b721ebdc5d9372b7a1910ea0c58bc0b22
parent8e4cc5307cc8eb3162fd3356741581e370216048 (diff)
downloadsuite_harness-c82496a545de4fe7bdda5afacaf71458ff425187.tar.gz
Update TestStatus to new one
Test: presubmit Bug: 322204420 Change-Id: I5edd63baf34bf710be622d08503b0e217c65c4a2
-rw-r--r--common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java2
-rw-r--r--common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java
index 9e8b57c2..b63acc4d 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/suite/CertificationChecksumHelper.java
@@ -16,10 +16,10 @@
package com.android.compatibility.common.tradefed.result.suite;
import com.android.compatibility.common.util.ChecksumReporter.ChecksumValidationException;
-import com.android.ddmlib.testrunner.TestResult.TestStatus;
import com.android.tradefed.result.TestDescription;
import com.android.tradefed.result.TestResult;
import com.android.tradefed.result.TestRunResult;
+import com.android.tradefed.result.TestStatus;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.hash.BloomFilter;
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java
index 123572a8..391e4aa6 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java
@@ -17,7 +17,6 @@
package com.android.compatibility.common.tradefed.targetprep;
import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.ddmlib.testrunner.TestResult.TestStatus;
import com.android.tradefed.config.IConfiguration;
import com.android.tradefed.config.IConfigurationReceiver;
import com.android.tradefed.config.Option;
@@ -31,6 +30,7 @@ import com.android.tradefed.result.CollectingTestListener;
import com.android.tradefed.result.TestDescription;
import com.android.tradefed.result.TestResult;
import com.android.tradefed.result.TestRunResult;
+import com.android.tradefed.result.TestStatus;
import com.android.tradefed.result.error.DeviceErrorIdentifier;
import com.android.tradefed.result.error.InfraErrorIdentifier;
import com.android.tradefed.targetprep.BuildError;
@@ -161,7 +161,7 @@ public class ApkInstrumentationPreparer extends PreconditionPreparer
TestRunResult result = listener.getCurrentRunResults();
for (Entry<TestDescription, TestResult> results : result.getTestResults().entrySet()) {
- if (TestStatus.FAILURE.equals(results.getValue().getStatus())) {
+ if (TestStatus.FAILURE.equals(results.getValue().getResultStatus())) {
if (mThrowError) {
CLog.e(
"Target preparation step %s failed.\n%s",