From f36c94e1042f4384a22d8106136f17c2298c359f Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Wed, 9 Feb 2022 15:46:35 +0000
Subject: [PATCH] Transformer: format test analysis file to JSON

PiperOrigin-RevId: 427469350
---
 .../media3/transformer/AndroidTestUtil.java   | 67 ++++++++++---------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java
index 82f3c29f56..6fbff6917f 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java
@@ -32,6 +32,8 @@ import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 /** Utilities for instrumentation tests. */
 public final class AndroidTestUtil {
@@ -107,43 +109,21 @@ public final class AndroidTestUtil {
     return result;
   }
 
-  private static void writeResultToFile(Context context, String testId, TransformationResult result)
-      throws IOException {
+  private static void writeResultToFile(
+      Context context, String testId, TransformationResult transformationResult)
+      throws IOException, JSONException {
     File analysisFile = createExternalCacheFile(context, /* fileName= */ testId + "-result.txt");
+    String analysisContent =
+        new JSONObject()
+            .put("testId", testId)
+            .put("device", getDeviceJson())
+            .put("transformationResult", getTransformationResultJson(transformationResult))
+            .toString(/* indentSpaces= */ 2);
     try (FileWriter fileWriter = new FileWriter(analysisFile)) {
-      String fileContents =
-          "test="
-              + testId
-              + ", "
-              + getFormattedResult(result)
-              + ", deviceFingerprint="
-              + Build.FINGERPRINT
-              + ", deviceBrand="
-              + Build.MANUFACTURER
-              + ", deviceModel="
-              + Build.MODEL
-              + ", sdkVersion="
-              + Build.VERSION.SDK_INT;
-      fileWriter.write(fileContents);
+      fileWriter.write(analysisContent);
     }
   }
 
-  /** Formats a {@link TransformationResult} into a comma separated String. */
-  public static String getFormattedResult(TransformationResult result) {
-    String analysis = "";
-    if (result.fileSizeBytes != C.LENGTH_UNSET) {
-      analysis += "fileSizeBytes=" + result.fileSizeBytes;
-    }
-    if (result.averageAudioBitrate != C.RATE_UNSET_INT) {
-      analysis += ", averageAudioBitrate=" + result.averageAudioBitrate;
-    }
-    if (result.averageVideoBitrate != C.RATE_UNSET_INT) {
-      analysis += ", averageVideoBitrate=" + result.averageVideoBitrate;
-    }
-
-    return analysis;
-  }
-
   private static File createExternalCacheFile(Context context, String fileName) throws IOException {
     File file = new File(context.getExternalCacheDir(), fileName);
     checkState(!file.exists() || file.delete(), "Could not delete file: " + file.getAbsolutePath());
@@ -151,5 +131,28 @@ public final class AndroidTestUtil {
     return file;
   }
 
+  private static JSONObject getDeviceJson() throws JSONException {
+    return new JSONObject()
+        .put("manufacturer", Build.MANUFACTURER)
+        .put("model", Build.MODEL)
+        .put("sdkVersion", Build.VERSION.SDK_INT)
+        .put("fingerprint", Build.FINGERPRINT);
+  }
+
+  private static JSONObject getTransformationResultJson(TransformationResult transformationResult)
+      throws JSONException {
+    JSONObject transformationResultJson = new JSONObject();
+    if (transformationResult.fileSizeBytes != C.LENGTH_UNSET) {
+      transformationResultJson.put("fileSizeBytes", transformationResult.fileSizeBytes);
+    }
+    if (transformationResult.averageAudioBitrate != C.RATE_UNSET_INT) {
+      transformationResultJson.put("averageAudioBitrate", transformationResult.averageAudioBitrate);
+    }
+    if (transformationResult.averageVideoBitrate != C.RATE_UNSET_INT) {
+      transformationResultJson.put("averageVideoBitrate", transformationResult.averageVideoBitrate);
+    }
+    return transformationResultJson;
+  }
+
   private AndroidTestUtil() {}
 }