commit 88026aa12a05f9c27bfd4805a7f754e7baf1565b
author Jiakai Zhang <jiakaiz@google.com> Wed Sep 21 16:27:00 2022 +0100
committer Jiakai Zhang <jiakaiz@google.com> Wed Sep 28 10:42:54 2022 +0000
tree 413a83b913258d6706c048f142f89d0ebcc23360
parent 6acd32ad4a2436296fd2e3ae8dea62c3f06881d5

Address all API design review feedback.

See the latest design doc at go/art-services-apis.

Bug: 242990781
Test: atest ArtServiceTests
Ignore-AOSP-First: ART Services.
Change-Id: I5afb0142427e31dc1bc95206abea2c970a1981cf

libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java

diff --git a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java b/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
index 5e2314e..095d828 100644
--- a/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
+++ b/libartservice/service/javatests/com/android/server/art/DexOptHelperTest.java
@@ -16,7 +16,7 @@
 
 package com.android.server.art;
 
-import static com.android.server.art.model.OptimizeResult.DexFileOptimizeResult;
+import static com.android.server.art.model.OptimizeResult.DexContainerFileOptimizeResult;
 import static com.android.server.art.model.OptimizeResult.PackageOptimizeResult;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -77,13 +77,13 @@
 
     private final OptimizeParams mParams =
             new OptimizeParams.Builder("install").setCompilerFilter("speed-profile").build();
-    private final List<DexFileOptimizeResult> mPrimaryResults =
-            List.of(new DexFileOptimizeResult("/data/app/foo/base.apk", "arm64", "verify",
-                            OptimizeResult.OPTIMIZE_PERFORMED, 100 /* dex2oatWallTimeMillis */,
-                            400 /* dex2oatCpuTimeMillis */),
-                    new DexFileOptimizeResult("/data/app/foo/base.apk", "arm", "verify",
-                            OptimizeResult.OPTIMIZE_FAILED, 100 /* dex2oatWallTimeMillis */,
-                            400 /* dex2oatCpuTimeMillis */));
+    private final List<DexContainerFileOptimizeResult> mPrimaryResults = List.of(
+            new DexContainerFileOptimizeResult("/data/app/foo/base.apk", true /* isPrimaryAbi */,
+                    "arm64-v8a", "verify", OptimizeResult.OPTIMIZE_PERFORMED,
+                    100 /* dex2oatWallTimeMillis */, 400 /* dex2oatCpuTimeMillis */),
+            new DexContainerFileOptimizeResult("/data/app/foo/base.apk", false /* isPrimaryAbi */,
+                    "armeabi-v7a", "verify", OptimizeResult.OPTIMIZE_FAILED,
+                    100 /* dex2oatWallTimeMillis */, 400 /* dex2oatCpuTimeMillis */));
 
     private DexOptHelper mDexOptHelper;
 
@@ -123,7 +123,7 @@
 
         PackageOptimizeResult packageResult = result.getPackageOptimizeResults().get(0);
         assertThat(packageResult.getPackageName()).isEqualTo(PKG_NAME);
-        assertThat(packageResult.getDexFileOptimizeResults())
+        assertThat(packageResult.getDexContainerFileOptimizeResults())
                 .containsExactlyElementsIn(mPrimaryResults);
 
         InOrder inOrder = inOrder(mPrimaryDexOptimizer, mWakeLock);
@@ -140,7 +140,8 @@
                 mock(PackageDataSnapshot.class), mPkgState, mPkg, mParams, mCancellationSignal);
 
         assertThat(result.getFinalStatus()).isEqualTo(OptimizeResult.OPTIMIZE_SKIPPED);
-        assertThat(result.getPackageOptimizeResults().get(0).getDexFileOptimizeResults()).isEmpty();
+        assertThat(result.getPackageOptimizeResults().get(0).getDexContainerFileOptimizeResults())
+                .isEmpty();
     }
 
     @Test
@@ -151,7 +152,8 @@
                 mock(PackageDataSnapshot.class), mPkgState, mPkg, mParams, mCancellationSignal);
 
         assertThat(result.getFinalStatus()).isEqualTo(OptimizeResult.OPTIMIZE_SKIPPED);
-        assertThat(result.getPackageOptimizeResults().get(0).getDexFileOptimizeResults()).isEmpty();
+        assertThat(result.getPackageOptimizeResults().get(0).getDexContainerFileOptimizeResults())
+                .isEmpty();
     }
 
     @Test
@@ -166,7 +168,7 @@
         OptimizeResult result = mDexOptHelper.dexopt(
                 mock(PackageDataSnapshot.class), mPkgState, mPkg, mParams, mCancellationSignal);
 
-        assertThat(result.getPackageOptimizeResults().get(0).getDexFileOptimizeResults())
+        assertThat(result.getPackageOptimizeResults().get(0).getDexContainerFileOptimizeResults())
                 .containsExactlyElementsIn(mPrimaryResults);
     }