Internal change

PiperOrigin-RevId: 710853691

Author: DeviceInfra

src/devtools/mobileharness/infra/ats/console/result/proto/BUILD

@@ -50,10 +50,12 @@ java_proto_library(
         "//src/java/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin:__pkg__",
         "//src/java/com/google/devtools/mobileharness/infra/ats/console/result:__subpackages__",
         "//src/java/com/google/devtools/mobileharness/infra/ats/console/util/result:__pkg__",
+        "//src/java/com/google/devtools/mobileharness/infra/ats/console/util/verifier:__subpackages__",
         "//src/java/com/google/devtools/mobileharness/infra/ats/server:__subpackages__",
         "//src/java/com/google/devtools/mobileharness/platform/android/xts/suite:__subpackages__",
         "//src/javatests/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin:__subpackages__",
         "//src/javatests/com/google/devtools/mobileharness/infra/ats/console/result:__subpackages__",
+        "//src/javatests/com/google/devtools/mobileharness/infra/ats/console/util/verifier:__pkg__",
         "//src/javatests/com/google/devtools/mobileharness/infra/ats/server:__subpackages__",
         "//src/javatests/com/google/devtools/mobileharness/platform/android/xts/suite:__subpackages__",
     ],

src/java/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin/BUILD

@@ -176,6 +176,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/infra/ats/common:session_result_handler_util",
         "//src/java/com/google/devtools/mobileharness/infra/ats/common/jobcreator:xts_job_creator",
         "//src/java/com/google/devtools/mobileharness/infra/ats/console/util/result:result_lister_helper",
+        "//src/java/com/google/devtools/mobileharness/infra/ats/console/util/verifier:verifier_result_helper",
         "//src/java/com/google/devtools/mobileharness/infra/client/longrunningservice/constant:session_properties",
         "//src/java/com/google/devtools/mobileharness/infra/client/longrunningservice/model:session_info",
         "//src/java/com/google/devtools/mobileharness/platform/android/xts/common/util:xts_constants",
@@ -188,6 +189,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/shared/util/file/local",
         "//src/java/com/google/devtools/mobileharness/shared/util/flags",
         "//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
+        "//src/java/com/google/wireless/qa/mobileharness/shared/constant:property",
         "//src/java/com/google/wireless/qa/mobileharness/shared/model/job",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_guava_guava",

src/java/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin/RunCommandHandler.java

@@ -17,13 +17,16 @@
 package com.google.devtools.mobileharness.infra.ats.console.controller.sessionplugin;
 
 import static com.google.common.base.Ascii.toUpperCase;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.devtools.mobileharness.shared.constant.LogRecordImportance.IMPORTANCE;
 import static com.google.devtools.mobileharness.shared.constant.LogRecordImportance.Importance.IMPORTANT;
 import static com.google.devtools.mobileharness.shared.util.base.ProtoTextFormat.shortDebugString;
+import static java.util.Arrays.stream;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.flogger.FluentLogger;
 import com.google.devtools.mobileharness.api.model.error.MobileHarnessException;
 import com.google.devtools.mobileharness.infra.ats.common.SessionRequestHandlerUtil;
@@ -38,6 +41,7 @@
 import com.google.devtools.mobileharness.infra.ats.console.controller.proto.SessionPluginProto.RunCommandState;
 import com.google.devtools.mobileharness.infra.ats.console.result.proto.ReportProto.Result;
 import com.google.devtools.mobileharness.infra.ats.console.util.result.ResultListerHelper;
+import com.google.devtools.mobileharness.infra.ats.console.util.verifier.VerifierResultHelper;
 import com.google.devtools.mobileharness.infra.client.longrunningservice.constant.SessionProperties;
 import com.google.devtools.mobileharness.infra.client.longrunningservice.model.SessionInfo;
 import com.google.devtools.mobileharness.platform.android.xts.common.util.XtsConstants;
@@ -47,13 +51,15 @@
 import com.google.devtools.mobileharness.platform.android.xts.suite.retry.RetryType;
 import com.google.devtools.mobileharness.shared.util.file.local.LocalFileUtil;
 import com.google.devtools.mobileharness.shared.util.flags.Flags;
+import com.google.wireless.qa.mobileharness.shared.constant.PropertyName.Test;
 import com.google.wireless.qa.mobileharness.shared.model.job.JobInfo;
 import java.io.File;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.concurrent.ThreadLocalRandom;
 import javax.annotation.Nullable;
@@ -76,6 +82,7 @@ class RunCommandHandler {
   private final XtsJobCreator xtsJobCreator;
   private final PreviousResultLoader previousResultLoader;
   private final ResultListerHelper resultListerHelper;
+  private final VerifierResultHelper verifierResultHelper;
 
   /** Set in {@link #initialize}. */
   private volatile boolean initialized;
@@ -92,7 +99,8 @@ class RunCommandHandler {
       SuiteResultReporter suiteResultReporter,
       XtsJobCreator xtsJobCreator,
       PreviousResultLoader previousResultLoader,
-      ResultListerHelper resultListerHelper) {
+      ResultListerHelper resultListerHelper,
+      VerifierResultHelper verifierResultHelper) {
     this.localFileUtil = localFileUtil;
     this.sessionRequestHandlerUtil = sessionRequestHandlerUtil;
     this.sessionResultHandlerUtil = sessionResultHandlerUtil;
@@ -101,6 +109,7 @@ class RunCommandHandler {
     this.xtsJobCreator = xtsJobCreator;
     this.previousResultLoader = previousResultLoader;
     this.resultListerHelper = resultListerHelper;
+    this.verifierResultHelper = verifierResultHelper;
   }
 
   void initialize(RunCommand command) throws MobileHarnessException, InterruptedException {
@@ -231,6 +240,20 @@ void handleResultProcessing(RunCommand command, RunCommandState runCommandState)
           }
         }
       }
+      if (Flags.instance().enableCtsVerifierResultReporter.getNonNull() && result != null) {
+        ImmutableSet<String> serials =
+            allJobs.stream()
+                .flatMap(jobInfo -> jobInfo.tests().getAll().values().stream())
+                .map(testInfo -> testInfo.properties().getOptional(Test.DEVICE_ID_LIST))
+                .filter(Optional::isPresent)
+                .flatMap(ids -> stream(ids.get().split(",")))
+                .collect(toImmutableSet());
+        logger
+            .atInfo()
+            .with(IMPORTANCE, IMPORTANT)
+            .log("Push cts-v-interactive results to %s", serials);
+        verifierResultHelper.broadcastResults(result, serials);
+      }
     } finally {
       sessionResultHandlerUtil.cleanUpJobGenDirs(allJobs);
 

src/java/com/google/devtools/mobileharness/infra/ats/console/util/verifier/BUILD

@@ -0,0 +1,38 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(default_applicable_licenses = ["//:license"])
+
+java_library(
+    name = "verifier_result_helper",
+    srcs = ["VerifierResultHelper.java"],
+    visibility = [
+        "//src/java/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin:__pkg__",
+        "//src/javatests/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin:__pkg__",
+        "//src/javatests/com/google/devtools/mobileharness/infra/ats/console/util/verifier:__pkg__",
+    ],
+    deps = [
+        "//src/devtools/mobileharness/infra/ats/console/result/proto:report_java_proto",
+        "//src/java/com/google/devtools/deviceinfra/platform/android/lightning/internal/sdk/adb",
+        "//src/java/com/google/devtools/mobileharness/api/model/error",
+        "//src/java/com/google/devtools/mobileharness/shared/util/auto:auto_value",
+        "//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
+        "@maven//:com_google_code_gson_gson",
+        "@maven//:com_google_guava_guava",
+        "@maven//:javax_inject_jsr330_api",
+    ],
+)

src/java/com/google/devtools/mobileharness/infra/ats/console/util/verifier/VerifierResultHelper.java

@@ -0,0 +1,146 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.devtools.mobileharness.infra.ats.console.util.verifier;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.flogger.FluentLogger;
+import com.google.devtools.deviceinfra.platform.android.lightning.internal.sdk.adb.Adb;
+import com.google.devtools.mobileharness.api.model.error.MobileHarnessException;
+import com.google.devtools.mobileharness.infra.ats.console.result.proto.ReportProto.Module;
+import com.google.devtools.mobileharness.infra.ats.console.result.proto.ReportProto.Result;
+import com.google.devtools.mobileharness.infra.ats.console.result.proto.ReportProto.Test;
+import com.google.devtools.mobileharness.infra.ats.console.result.proto.ReportProto.TestCase;
+import com.google.gson.Gson;
+import java.util.Collection;
+import javax.inject.Inject;
+
+/** Helper class to broadcast results to CTS-V * */
+public class VerifierResultHelper {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+  private static final String BROADCAST_TEST_RESULT_PASS = "PASS";
+  private static final String BROADCAST_TEST_RESULT_FAIL = "FAIL";
+  private static final String FAIL_RESULT = "fail";
+
+  private static final int MAX_DETAIL_LENGTH = 100;
+
+  @VisibleForTesting
+  static final String START_INTERACTIVE_ACTIVITY_COMMAND =
+      "am start com.android.cts.verifier/.InteractiveTestsActivity --activity-brought-to-front";
+
+  @VisibleForTesting
+  static final String BROADCAST_COMMAND =
+      "am broadcast -a com.android.cts.verifier.ACTION_HOST_TEST_RESULT --es"
+          + " com.android.cts.verifier.extra.HOST_TEST_RESULT ";
+
+  private final Adb adb;
+
+  @Inject
+  VerifierResultHelper(Adb adb) {
+    this.adb = adb;
+  }
+
+  public void broadcastResults(Result result, Collection<String> serials)
+      throws InterruptedException {
+    startInteractiveActivity(serials);
+    Gson gson = new Gson();
+    for (Module module : result.getModuleInfoList()) {
+      ImmutableMap.Builder<String, VerifierResult> testCases = new ImmutableMap.Builder<>();
+      for (TestCase testCase : module.getTestCaseList()) {
+        ImmutableMap.Builder<String, VerifierResult> tests = new ImmutableMap.Builder<>();
+        for (Test test : testCase.getTestList()) {
+          if (test.getResult().isEmpty()) {
+            continue;
+          }
+          tests.put(
+              test.getName(),
+              VerifierResult.of(
+                  getTestResult(test),
+                  test.hasFailure() ? getShortDetails(test.getFailure().getMsg()) : "",
+                  ImmutableMap.of()));
+        }
+        testCases.put(testCase.getName(), VerifierResult.of("", "", tests.buildOrThrow()));
+      }
+      ImmutableMap<String, VerifierResult> modules =
+          ImmutableMap.of(
+              module.getName(),
+              VerifierResult.of(
+                  getModuleResult(module),
+                  module.hasReason() ? getShortDetails(module.getReason().getMsg()) : "",
+                  testCases.buildOrThrow()));
+      broadcastResult(serials, gson.toJson(modules));
+    }
+  }
+
+  private void startInteractiveActivity(Collection<String> serials) throws InterruptedException {
+    for (String serial : serials) {
+      try {
+        var unused = adb.runShell(serial, START_INTERACTIVE_ACTIVITY_COMMAND);
+      } catch (MobileHarnessException e) {
+        logger.atInfo().withCause(e).log("Unable to start interactive activity on %s", serial);
+      }
+    }
+  }
+
+  private void broadcastResult(Collection<String> serials, String msg) throws InterruptedException {
+    logger.atInfo().log("Broadcast result size: %d", msg.length());
+    for (String serial : serials) {
+      try {
+        var unused = adb.runShell(serial, BROADCAST_COMMAND + String.format("'%s'", msg));
+      } catch (MobileHarnessException e) {
+        logger.atInfo().withCause(e).log("Unable to broadcast results to %s", serial);
+      }
+    }
+  }
+
+  private String getShortDetails(String details) {
+    if (details.length() <= MAX_DETAIL_LENGTH) {
+      return details;
+    }
+    return details.substring(0, MAX_DETAIL_LENGTH) + "...";
+  }
+
+  private String getModuleResult(Module module) {
+    return module.getDone() && module.getFailedTests() == 0
+        ? BROADCAST_TEST_RESULT_PASS
+        : BROADCAST_TEST_RESULT_FAIL;
+  }
+
+  private String getTestResult(Test test) {
+    // IGNORE and ASSUMPTION_FAILURE are regarded as pass
+    return test.getResult().equals(FAIL_RESULT)
+        ? BROADCAST_TEST_RESULT_FAIL
+        : BROADCAST_TEST_RESULT_PASS;
+  }
+
+  /** Represents a CTS-V result. */
+  @AutoValue
+  public abstract static class VerifierResult {
+    public abstract String result();
+
+    public abstract String details();
+
+    public abstract ImmutableMap<String, VerifierResult> subtests();
+
+    public static VerifierResult of(
+        String result, String details, ImmutableMap<String, VerifierResult> subtests) {
+      return new AutoValue_VerifierResultHelper_VerifierResult(result, details, subtests);
+    }
+  }
+}

src/java/com/google/devtools/mobileharness/shared/util/flags/Flags.java

@@ -761,6 +761,14 @@ public class Flags {
       converter = Flag.BooleanConverter.class)
   public Flag<Boolean> enableCloudFileTransfer = enableCloudFileTransferDefault;
 
+  private static final Flag<Boolean> enableCtsVerifierResultReporterDefault = Flag.value(false);
+
+  @com.beust.jcommander.Parameter(
+      names = "--enable_cts_verifier_result_reporter",
+      description = "Whether enable result reporter for cts verifier.",
+      converter = Flag.BooleanConverter.class)
+  public Flag<Boolean> enableCtsVerifierResultReporter = enableCtsVerifierResultReporterDefault;
+
   private static final Flag<Boolean> enableDebugModeDefault = Flag.value(false);
 
   @com.beust.jcommander.Parameter(

src/javatests/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin/BUILD

@@ -51,6 +51,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/infra/ats/console/result/report:compatibility_report_merger",
         "//src/java/com/google/devtools/mobileharness/infra/ats/console/result/report:compatibility_report_parser",
         "//src/java/com/google/devtools/mobileharness/infra/ats/console/util/result:result_lister_helper",
+        "//src/java/com/google/devtools/mobileharness/infra/ats/console/util/verifier:verifier_result_helper",
         "//src/java/com/google/devtools/mobileharness/infra/client/api/controller/device:querier",
         "//src/java/com/google/devtools/mobileharness/infra/client/longrunningservice:annotations",
         "//src/java/com/google/devtools/mobileharness/infra/client/longrunningservice/model:session_info",

src/javatests/com/google/devtools/mobileharness/infra/ats/console/controller/sessionplugin/RunCommandHandlerTest.java

@@ -42,6 +42,7 @@
 import com.google.devtools.mobileharness.infra.ats.console.result.report.CompatibilityReportMerger;
 import com.google.devtools.mobileharness.infra.ats.console.result.report.CompatibilityReportParser;
 import com.google.devtools.mobileharness.infra.ats.console.util.result.ResultListerHelper;
+import com.google.devtools.mobileharness.infra.ats.console.util.verifier.VerifierResultHelper;
 import com.google.devtools.mobileharness.infra.client.api.controller.device.DeviceQuerier;
 import com.google.devtools.mobileharness.infra.client.longrunningservice.Annotations.SessionGenDir;
 import com.google.devtools.mobileharness.infra.client.longrunningservice.Annotations.SessionTempDir;
@@ -113,6 +114,7 @@ public final class RunCommandHandlerTest {
   @Bind @Mock private XtsJobCreator xtsJobCreator;
   @Bind @Mock private PreviousResultLoader previousResultLoader;
   @Bind @Mock private ResultListerHelper resultListerHelper;
+  @Bind @Mock private VerifierResultHelper verifierResultHelper;
 
   private RunCommandHandler runCommandHandler;
   @Inject private SessionRequestHandlerUtil sessionRequestHandlerUtil;
@@ -152,7 +154,8 @@ public void setUp() throws Exception {
             suiteResultReporter,
             xtsJobCreator,
             previousResultLoader,
-            resultListerHelper);
+            resultListerHelper,
+            verifierResultHelper);
   }
 
   @Test