Add ClangCodeCoverageCollector as an AutoLogCollector.

Move ClangCodeCoverageListener to
device/metric/ClangCodeCoverageCollector.

Test: Unit tests
Bug: 163063008
Change-Id: If7479c00a89b28820e21d3e44ee73a3564886a0a
Merged-In: If7479c00a89b28820e21d3e44ee73a3564886a0a

6 files changed, 13 insertions, 10 deletions

diff --git a/src/com/android/tradefed/device/metric/AutoLogCollector.java b/src/com/android/tradefed/device/metric/AutoLogCollector.java
index ecc4bf105..105a175bd 100644
--- a/src/com/android/tradefed/device/metric/AutoLogCollector.java
+++ b/src/com/android/tradefed/device/metric/AutoLogCollector.java
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTargetException;
 /** Enumeration describing which collector can automatically be handled by the harness. */
 public enum AutoLogCollector {
     BUGREPORTZ_ON_FAILURE(BugreportzOnFailureCollector.class),
+    CLANG_COVERAGE(ClangCodeCoverageCollector.class),
     HOSTLOG_ON_FAILURE(DebugHostLogOnFailureCollector.class),
     JAVA_COVERAGE(JavaCodeCoverageCollector.class),
     LOGCAT_ON_FAILURE(LogcatOnFailureCollector.class),
diff --git a/test_framework/com/android/tradefed/testtype/ClangCodeCoverageListener.java b/src/com/android/tradefed/device/metric/ClangCodeCoverageCollector.java
index 1a32b5611..7c76498bb 100644
--- a/test_framework/com/android/tradefed/testtype/ClangCodeCoverageListener.java
+++ b/src/com/android/tradefed/device/metric/ClangCodeCoverageCollector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tradefed.testtype;
+package com.android.tradefed.device.metric;
 
 import static com.android.tradefed.testtype.coverage.CoverageOptions.Toolchain.CLANG;
 import static com.google.common.base.Verify.verify;
@@ -55,7 +55,7 @@ import java.util.Set;
  * A {@link BaseDeviceMetricCollector} that will pull Clang coverage measurements off of the device
  * and log them as test artifacts.
  */
-public final class ClangCodeCoverageListener extends BaseDeviceMetricCollector
+public final class ClangCodeCoverageCollector extends BaseDeviceMetricCollector
         implements IConfigurationReceiver {
 
     private static final String NATIVE_COVERAGE_DEVICE_PATH = "/data/misc/trace";
diff --git a/test_framework/com/android/tradefed/testtype/GTest.java b/test_framework/com/android/tradefed/testtype/GTest.java
index db170fcf2..9954186de 100644
--- a/test_framework/com/android/tradefed/testtype/GTest.java
+++ b/test_framework/com/android/tradefed/testtype/GTest.java
@@ -28,6 +28,7 @@ import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.device.metric.ClangCodeCoverageCollector;
 import com.android.tradefed.invoker.IInvocationContext;
 import com.android.tradefed.invoker.TestInformation;
 import com.android.tradefed.log.LogUtil.CLog;
@@ -494,7 +495,7 @@ public class GTest extends GTestBase implements IDeviceTest {
         CoverageOptions options = getConfiguration().getCoverageOptions();
 
         if (options.isCoverageEnabled() && options.getCoverageToolchains().contains(CLANG)) {
-            ClangCodeCoverageListener clangListener = new ClangCodeCoverageListener();
+            ClangCodeCoverageCollector clangListener = new ClangCodeCoverageCollector();
             clangListener.setConfiguration(getConfiguration());
             listener = clangListener.init(context, listener);
         }
diff --git a/test_framework/com/android/tradefed/testtype/InstrumentationTest.java b/test_framework/com/android/tradefed/testtype/InstrumentationTest.java
index 92df21248..39433145d 100644
--- a/test_framework/com/android/tradefed/testtype/InstrumentationTest.java
+++ b/test_framework/com/android/tradefed/testtype/InstrumentationTest.java
@@ -37,6 +37,7 @@ import com.android.tradefed.config.Option.Importance;
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.device.metric.ClangCodeCoverageCollector;
 import com.android.tradefed.device.metric.IMetricCollector;
 import com.android.tradefed.device.metric.IMetricCollectorReceiver;
 import com.android.tradefed.device.metric.JavaCodeCoverageCollector;
@@ -1038,7 +1039,7 @@ public class InstrumentationTest
         }
         if (mConfiguration.getCoverageOptions().isCoverageEnabled()
                 && mConfiguration.getCoverageOptions().getCoverageToolchains().contains(CLANG)) {
-            ClangCodeCoverageListener clangListener = new ClangCodeCoverageListener();
+            ClangCodeCoverageCollector clangListener = new ClangCodeCoverageCollector();
             clangListener.setConfiguration(mConfiguration);
             listener = clangListener.init(testInfo.getContext(), listener);
         }
diff --git a/tests/src/com/android/tradefed/UnitTests.java b/tests/src/com/android/tradefed/UnitTests.java
index 5c06ed280..cdb446c00 100644
--- a/tests/src/com/android/tradefed/UnitTests.java
+++ b/tests/src/com/android/tradefed/UnitTests.java
@@ -99,6 +99,7 @@ import com.android.tradefed.device.metric.BaseDeviceMetricCollectorTest;
 import com.android.tradefed.device.metric.BuddyInfoMetricCollectorTest;
 import com.android.tradefed.device.metric.BugreportzMetricCollectorTest;
 import com.android.tradefed.device.metric.BugreportzOnFailureCollectorTest;
+import com.android.tradefed.device.metric.ClangCodeCoverageCollectorTest;
 import com.android.tradefed.device.metric.DebugHostLogOnFailureCollectorTest;
 import com.android.tradefed.device.metric.DeviceMetricDataTest;
 import com.android.tradefed.device.metric.DumpHeapCollectorTest;
@@ -260,7 +261,6 @@ import com.android.tradefed.targetprep.multi.MixImageZipPreparerTest;
 import com.android.tradefed.targetprep.suite.SuiteApkInstallerTest;
 import com.android.tradefed.testtype.AndroidJUnitTestTest;
 import com.android.tradefed.testtype.ArtRunTestTest;
-import com.android.tradefed.testtype.ClangCodeCoverageListenerTest;
 import com.android.tradefed.testtype.DeviceBatteryLevelCheckerTest;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunnerTest;
 import com.android.tradefed.testtype.DeviceSuiteTest;
@@ -535,6 +535,7 @@ import org.junit.runners.Suite.SuiteClasses;
     BuddyInfoMetricCollectorTest.class,
     BugreportzMetricCollectorTest.class,
     BugreportzOnFailureCollectorTest.class,
+    ClangCodeCoverageCollectorTest.class,
     DebugHostLogOnFailureCollectorTest.class,
     DeviceMetricDataTest.class,
     DumpHeapCollectorTest.class,
@@ -753,7 +754,6 @@ import org.junit.runners.Suite.SuiteClasses;
     // testtype
     AndroidJUnitTestTest.class,
     ArtRunTestTest.class,
-    ClangCodeCoverageListenerTest.class,
     CoverageMeasurementForwarderTest.class,
     DeviceBatteryLevelCheckerTest.class,
     DeviceJUnit4ClassRunnerTest.class,
diff --git a/tests/src/com/android/tradefed/testtype/ClangCodeCoverageListenerTest.java b/tests/src/com/android/tradefed/device/metric/ClangCodeCoverageCollectorTest.java
index 67f614410..19844a796 100644
--- a/tests/src/com/android/tradefed/testtype/ClangCodeCoverageListenerTest.java
+++ b/tests/src/com/android/tradefed/device/metric/ClangCodeCoverageCollectorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tradefed.testtype;
+package com.android.tradefed.device.metric;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -70,7 +70,7 @@ import java.util.zip.ZipOutputStream;
 
 /** Unit tests for {@link ClangCodeCoverageListener}. */
 @RunWith(JUnit4.class)
-public class ClangCodeCoverageListenerTest {
+public class ClangCodeCoverageCollectorTest {
 
     private static final String RUN_NAME = "SomeTest";
     private static final int TEST_COUNT = 5;
@@ -96,7 +96,7 @@ public class ClangCodeCoverageListenerTest {
     OptionSetter mCoverageOptionsSetter = null;
 
     /** Object under test. */
-    ClangCodeCoverageListener mListener;
+    ClangCodeCoverageCollector mListener;
 
     @Before
     public void setUp() throws Exception {
@@ -114,7 +114,7 @@ public class ClangCodeCoverageListenerTest {
 
         doReturn(ImmutableList.of(mMockDevice)).when(mMockContext).getDevices();
 
-        mListener = new ClangCodeCoverageListener();
+        mListener = new ClangCodeCoverageCollector();
         mListener.setConfiguration(mMockConfiguration);
         mListener.setRunUtil(mCommandArgumentCaptor);
         mListener.init(mMockContext, mFakeListener);