Update tests to use proto metrics interface

Test: unit tests
Bug: 73163359
Change-Id: Icef16f337fa45992c46894ce072a3a42162aa357

17 files changed, 49 insertions, 31 deletions

diff --git a/src/com/android/media/tests/AudioJitterTest.java b/src/com/android/media/tests/AudioJitterTest.java
index 36e5e89..df10da1 100644
--- a/src/com/android/media/tests/AudioJitterTest.java
+++ b/src/com/android/media/tests/AudioJitterTest.java
@@ -24,6 +24,7 @@ import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.TestDescription;
 import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -120,12 +121,12 @@ public class AudioJitterTest implements IDeviceTest, IRemoteTest {
         if (errMsg != null) {
             CLog.e(errMsg);
             listener.testFailed(testId, errMsg);
-            listener.testEnded(testId, metrics);
+            listener.testEnded(testId, TfMetricProtoUtil.upgradeConvert(metrics));
             listener.testRunFailed(errMsg);
         } else {
             long durationMs = System.currentTimeMillis() - testStartTime;
-            listener.testEnded(testId, metrics);
-            listener.testRunEnded(durationMs, metrics);
+            listener.testEnded(testId, TfMetricProtoUtil.upgradeConvert(metrics));
+            listener.testRunEnded(durationMs, TfMetricProtoUtil.upgradeConvert(metrics));
         }
     }
 
diff --git a/src/com/android/media/tests/CameraLatencyTest.java b/src/com/android/media/tests/CameraLatencyTest.java
index f44fd59..9689e49 100644
--- a/src/com/android/media/tests/CameraLatencyTest.java
+++ b/src/com/android/media/tests/CameraLatencyTest.java
@@ -33,6 +33,7 @@ import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.RegexTrie;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import junit.framework.TestCase;
 
@@ -174,7 +175,7 @@ public class CameraLatencyTest implements IDeviceTest, IRemoteTest {
             InputStreamSource bugreport = mTestDevice.getBugreport();
             listener.testLog(String.format("bugreport-%s.txt", test.mTestName),
                     LogDataType.BUGREPORT, bugreport);
-            bugreport.cancel();
+            bugreport.close();
         }
     }
 
@@ -273,7 +274,7 @@ public class CameraLatencyTest implements IDeviceTest, IRemoteTest {
         // Create an empty testRun to report the parsed runMetrics
         CLog.d("About to report metrics for %s: %s", test.mTestMetricsName, metrics);
         listener.testRunStarted(test.mTestMetricsName, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 
     @Override
diff --git a/src/com/android/media/tests/CameraPerformanceTest.java b/src/com/android/media/tests/CameraPerformanceTest.java
index 8e3855c..f928a9c 100644
--- a/src/com/android/media/tests/CameraPerformanceTest.java
+++ b/src/com/android/media/tests/CameraPerformanceTest.java
@@ -22,6 +22,7 @@ import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.TestDescription;
 import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -132,7 +133,7 @@ public class CameraPerformanceTest extends CameraTestBase {
                 Map<String, String> runMetrics) {
             // Report metrics at the end of test run.
             Map<String, String> result = parseResult(getAggregatedMetrics());
-            listener.testRunEnded(getTestDurationMs(), result);
+            listener.testRunEnded(getTestDurationMs(), TfMetricProtoUtil.upgradeConvert(result));
         }
     }
 
@@ -508,7 +509,6 @@ public class CameraPerformanceTest extends CameraTestBase {
         private static final String JSON_RESULT_FILE =
                 "/sdcard/report-log-files/CtsCameraTestCases.reportlog.json";
         private static final String CAMERA_ID_KEY = "camera_id";
-        private static final String AVERAGE_LATENCY_KEY = "average_latency";
         private static final String REPROCESS_TYPE_KEY = "reprocess_type";
         private static final String CAPTURE_MESSAGE_KEY = "capture_message";
         private static final String LATENCY_KEY = "latency";
diff --git a/src/com/android/media/tests/CameraSettingsTest.java b/src/com/android/media/tests/CameraSettingsTest.java
index d5fe0dd..5f098b0 100644
--- a/src/com/android/media/tests/CameraSettingsTest.java
+++ b/src/com/android/media/tests/CameraSettingsTest.java
@@ -30,6 +30,7 @@ import com.android.tradefed.result.LogDataType;
 import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -213,10 +214,10 @@ public class CameraSettingsTest implements IDeviceTest, IRemoteTest {
             Map<String, String> metrics) {
         InputStreamSource bugreport = mTestDevice.getBugreport();
         listener.testLog("bugreport", LogDataType.BUGREPORT, bugreport);
-        bugreport.cancel();
+        bugreport.close();
 
         CLog.d(String.format("About to report metrics: %s", metrics));
         listener.testRunStarted(runName, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 }
diff --git a/src/com/android/media/tests/CameraShotToShotLatencyTest.java b/src/com/android/media/tests/CameraShotToShotLatencyTest.java
index c30d5c0..faaff6b 100644
--- a/src/com/android/media/tests/CameraShotToShotLatencyTest.java
+++ b/src/com/android/media/tests/CameraShotToShotLatencyTest.java
@@ -28,6 +28,7 @@ import com.android.tradefed.result.InputStreamSource;
 import com.android.tradefed.result.LogDataType;
 import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -175,10 +176,10 @@ public class CameraShotToShotLatencyTest implements IDeviceTest, IRemoteTest {
             Map<String, String> metrics) {
         InputStreamSource bugreport = mTestDevice.getBugreport();
         listener.testLog("bugreport", LogDataType.BUGREPORT, bugreport);
-        bugreport.cancel();
+        bugreport.close();
 
         CLog.d(String.format("About to report metrics: %s", metrics));
         listener.testRunStarted(runName, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 }
diff --git a/src/com/android/media/tests/CameraStartupTest.java b/src/com/android/media/tests/CameraStartupTest.java
index cda1bb3..8cd9be4 100644
--- a/src/com/android/media/tests/CameraStartupTest.java
+++ b/src/com/android/media/tests/CameraStartupTest.java
@@ -20,6 +20,7 @@ import com.android.tradefed.config.Option;
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.TestDescription;
 import com.android.tradefed.targetprep.BuildError;
@@ -27,10 +28,10 @@ import com.android.tradefed.targetprep.ITargetPreparer;
 import com.android.tradefed.targetprep.TargetSetupError;
 import com.android.tradefed.targetprep.TemperatureThrottlingWaiter;
 import com.android.tradefed.util.MultiMap;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -112,11 +113,12 @@ public class CameraStartupTest extends CameraTestBase {
         CLog.e("The instrumentation result not found. Test runs may have failed due to exceptions."
                 + " Test results will not be posted. errorMsg: %s", errorMessage);
         listener.testRunFailed(errorMessage);
-        listener.testRunEnded(mTestRunsDurationMs, Collections.<String, String>emptyMap());
+        listener.testRunEnded(mTestRunsDurationMs, new HashMap<String, Metric>());
     }
 
     private void postMultipleRunMetrics(ITestInvocationListener listener) {
-        listener.testRunEnded(mTestRunsDurationMs, getAverageMultipleRunMetrics());
+        listener.testRunEnded(mTestRunsDurationMs,
+                TfMetricProtoUtil.upgradeConvert(getAverageMultipleRunMetrics()));
     }
 
     private void postSetupTestRun() throws DeviceNotAvailableException {
diff --git a/src/com/android/media/tests/CameraStressTest.java b/src/com/android/media/tests/CameraStressTest.java
index def3f39..64521d9 100644
--- a/src/com/android/media/tests/CameraStressTest.java
+++ b/src/com/android/media/tests/CameraStressTest.java
@@ -33,6 +33,7 @@ import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.RegexTrie;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import junit.framework.TestCase;
 
@@ -354,7 +355,7 @@ public class CameraStressTest implements IDeviceTest, IRemoteTest {
         Log.e(LOG_TAG, String.format("About to report metrics for %s: %s", test.mTestMetricsName,
                 metrics));
         listener.testRunStarted(test.mTestMetricsName, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 
     @Override
diff --git a/src/com/android/media/tests/CameraTestBase.java b/src/com/android/media/tests/CameraTestBase.java
index cd5c940..41ecf39 100644
--- a/src/com/android/media/tests/CameraTestBase.java
+++ b/src/com/android/media/tests/CameraTestBase.java
@@ -37,6 +37,7 @@ import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.IRunUtil;
 import com.android.tradefed.util.RunUtil;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -284,7 +285,7 @@ public class CameraTestBase implements IDeviceTest, IRemoteTest, IConfigurationR
             super.testEnded(test, endTime, testMetrics);
             handleMetricsOnTestEnded(test, testMetrics);
             stopDumping(test);
-            mListener.testEnded(test, endTime, testMetrics);
+            mListener.testEnded(test, endTime, TfMetricProtoUtil.upgradeConvert(testMetrics));
         }
 
         @Override
@@ -426,7 +427,7 @@ public class CameraTestBase implements IDeviceTest, IRemoteTest, IConfigurationR
         public void handleTestRunEnded(ITestInvocationListener listener, long elapsedTime,
                 Map<String, String> runMetrics) {
             // Post aggregated metrics at the end of test run.
-            listener.testRunEnded(getTestDurationMs(), getAggregatedMetrics());
+            listener.testRunEnded(getTestDurationMs(), TfMetricProtoUtil.upgradeConvert(getAggregatedMetrics()));
         }
     }
 
diff --git a/src/com/android/media/tests/MediaMemoryTest.java b/src/com/android/media/tests/MediaMemoryTest.java
index bb09488..7269efd 100644
--- a/src/com/android/media/tests/MediaMemoryTest.java
+++ b/src/com/android/media/tests/MediaMemoryTest.java
@@ -35,6 +35,7 @@ import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -265,7 +266,7 @@ public class MediaMemoryTest implements IDeviceTest, IRemoteTest {
     void reportMetrics(ITestInvocationListener listener, Map<String, String> metrics) {
         CLog.d("About to report metrics: %s", metrics);
         listener.testRunStarted(METRICS_RUN_NAME, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 
     @Override
diff --git a/src/com/android/media/tests/MediaPlayerStressTest.java b/src/com/android/media/tests/MediaPlayerStressTest.java
index 8efab3e..80be915 100644
--- a/src/com/android/media/tests/MediaPlayerStressTest.java
+++ b/src/com/android/media/tests/MediaPlayerStressTest.java
@@ -37,6 +37,7 @@ import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.RegexTrie;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -197,7 +198,7 @@ public class MediaPlayerStressTest implements IDeviceTest, IRemoteTest {
     void reportMetrics(ITestInvocationListener listener, Map<String, String> metrics) {
         Log.d(LOG_TAG, String.format("About to report metrics: %s", metrics));
         listener.testRunStarted(mMetricsRunName, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 
     @Override
diff --git a/src/com/android/media/tests/MediaStressTest.java b/src/com/android/media/tests/MediaStressTest.java
index 189dd60..93c71a2 100644
--- a/src/com/android/media/tests/MediaStressTest.java
+++ b/src/com/android/media/tests/MediaStressTest.java
@@ -30,6 +30,7 @@ import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -176,7 +177,7 @@ public class MediaStressTest implements IDeviceTest, IRemoteTest {
         // Create an empty testRun to report the parsed runMetrics
         CLog.d("About to report metrics: %s", metrics);
         listener.testRunStarted(METRICS_RUN_NAME, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 
     /**
diff --git a/src/com/android/media/tests/PanoramaBenchMarkTest.java b/src/com/android/media/tests/PanoramaBenchMarkTest.java
index 355bbb0..2bc1fc8 100644
--- a/src/com/android/media/tests/PanoramaBenchMarkTest.java
+++ b/src/com/android/media/tests/PanoramaBenchMarkTest.java
@@ -25,6 +25,7 @@ import com.android.tradefed.result.InputStreamSource;
 import com.android.tradefed.result.LogDataType;
 import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -120,10 +121,10 @@ public class PanoramaBenchMarkTest implements IDeviceTest, IRemoteTest {
             Map<String, String> metrics) {
         InputStreamSource bugreport = mTestDevice.getBugreport();
         listener.testLog("bugreport", LogDataType.BUGREPORT, bugreport);
-        bugreport.cancel();
+        bugreport.close();
 
         CLog.d(String.format("About to report metrics: %s", metrics));
         listener.testRunStarted(runName, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 }
diff --git a/src/com/android/media/tests/TestRunHelper.java b/src/com/android/media/tests/TestRunHelper.java
index 168a130..6062a59 100644
--- a/src/com/android/media/tests/TestRunHelper.java
+++ b/src/com/android/media/tests/TestRunHelper.java
@@ -16,8 +16,10 @@
 package com.android.media.tests;
 
 import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.TestDescription;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -43,15 +45,15 @@ public class TestRunHelper {
         CLog.e(errMsg);
         mListener.testRunFailed(errMsg);
         mListener.testFailed(mTestId, errMsg);
-        mListener.testEnded(mTestId, new HashMap<String, String>());
+        mListener.testEnded(mTestId, new HashMap<String, Metric>());
         throw new TestFailureException();
     }
 
     /** @param resultDictionary */
     public void endTest(Map<String, String> resultDictionary) {
         mTestStopTime = System.currentTimeMillis();
-        mListener.testRunEnded(getTotalTestTime(), resultDictionary);
-        mListener.testEnded(mTestId, resultDictionary);
+        mListener.testRunEnded(getTotalTestTime(), TfMetricProtoUtil.upgradeConvert(resultDictionary));
+        mListener.testEnded(mTestId, TfMetricProtoUtil.upgradeConvert(resultDictionary));
     }
 
     public void startTest(int numberOfTests) {
diff --git a/src/com/android/media/tests/VideoEditingMemoryTest.java b/src/com/android/media/tests/VideoEditingMemoryTest.java
index bb58df2..94cdfc4 100644
--- a/src/com/android/media/tests/VideoEditingMemoryTest.java
+++ b/src/com/android/media/tests/VideoEditingMemoryTest.java
@@ -35,6 +35,7 @@ import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -253,7 +254,7 @@ public class VideoEditingMemoryTest implements IDeviceTest, IRemoteTest {
     void reportMetrics(ITestInvocationListener listener, String outputFile) {
         Log.d(LOG_TAG, String.format("About to report metrics: %s", mRunMetrics));
         listener.testRunStarted(mKeyMap.get(outputFile), 0);
-        listener.testRunEnded(0, mRunMetrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(mRunMetrics));
     }
 
     @Override
diff --git a/src/com/android/media/tests/VideoEditingPerformanceTest.java b/src/com/android/media/tests/VideoEditingPerformanceTest.java
index 046403e..586548a 100644
--- a/src/com/android/media/tests/VideoEditingPerformanceTest.java
+++ b/src/com/android/media/tests/VideoEditingPerformanceTest.java
@@ -35,6 +35,7 @@ import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.RegexTrie;
 import com.android.tradefed.util.StreamUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -242,7 +243,7 @@ public class VideoEditingPerformanceTest implements IDeviceTest, IRemoteTest {
             Map<String, String> metrics) {
         Log.d(LOG_TAG, String.format("About to report metrics: %s", metrics));
         listener.testRunStarted(METRICS_RUN_NAME, 0);
-        listener.testRunEnded(0, metrics);
+        listener.testRunEnded(0, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 
     @Override
diff --git a/src/com/android/media/tests/VideoMultimeterRunner.java b/src/com/android/media/tests/VideoMultimeterRunner.java
index 8dd0825..c7844fc 100644
--- a/src/com/android/media/tests/VideoMultimeterRunner.java
+++ b/src/com/android/media/tests/VideoMultimeterRunner.java
@@ -25,6 +25,7 @@ import com.android.tradefed.result.TestDescription;
 import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.CommandResult;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -89,9 +90,9 @@ public class VideoMultimeterRunner extends VideoMultimeterTest
             listener.testFailed(testId, "Failed to acquire run token");
         } finally {
             runToken.release();
-            listener.testEnded(testId, metrics);
+            listener.testEnded(testId, TfMetricProtoUtil.upgradeConvert(metrics));
             durationMs = System.currentTimeMillis() - testStartTime;
-            listener.testRunEnded(durationMs, metrics);
+            listener.testRunEnded(durationMs, TfMetricProtoUtil.upgradeConvert(metrics));
         }
     }
 
diff --git a/src/com/android/media/tests/VideoMultimeterTest.java b/src/com/android/media/tests/VideoMultimeterTest.java
index 1a0f23e..af7b527 100644
--- a/src/com/android/media/tests/VideoMultimeterTest.java
+++ b/src/com/android/media/tests/VideoMultimeterTest.java
@@ -31,6 +31,7 @@ import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.util.CommandResult;
 import com.android.tradefed.util.IRunUtil;
 import com.android.tradefed.util.RunUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
 
 import org.junit.Assert;
 
@@ -347,8 +348,8 @@ public class VideoMultimeterTest implements IDeviceTest, IRemoteTest {
         }
 
         long durationMs = System.currentTimeMillis() - testStartTime;
-        listener.testEnded(testId, metrics);
-        listener.testRunEnded(durationMs, metrics);
+        listener.testEnded(testId, TfMetricProtoUtil.upgradeConvert(metrics));
+        listener.testRunEnded(durationMs, TfMetricProtoUtil.upgradeConvert(metrics));
     }
 
     /**