diff options
author | Nathan Zoltan Poag <poag@google.com> | 2021-03-31 02:23:05 -0500 |
---|---|---|
committer | Alex Buynytskyy <alexbuy@google.com> | 2021-04-17 14:59:01 +0000 |
commit | a03870ce520fa4c0cd07f500faff959912259076 (patch) | |
tree | 9d818500ab52f3eb69056fa899e028e3e8ec665b | |
parent | 65ad0c5148f8c17ea775778d1d476e8e93460b9c (diff) | |
download | csuite-a03870ce520fa4c0cd07f500faff959912259076.tar.gz |
Add incremental installation option to AppLaunchTest.
(This is a cherry-pick of ag/14045737 with minor formatting fixes by java-format)
Bug: 162147271
Test: atest csuite-harness-tests
Change-Id: Iada54ee8dfb26f345c4deb1bab2d558a2a10a65d
Merged-In: Iada54ee8dfb26f345c4deb1bab2d558a2a10a65d
-rw-r--r-- | harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java | 15 | ||||
-rw-r--r-- | harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java | 18 |
2 files changed, 33 insertions, 0 deletions
diff --git a/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java b/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java index 8757996..12e30f7 100644 --- a/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java +++ b/harness/src/main/java/com/android/compatibility/targetprep/AppSetupPreparer.java @@ -20,7 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument; import com.android.csuite.core.SystemPackageUninstaller; import com.android.tradefed.build.IBuildInfo; +import com.android.tradefed.config.ConfigurationException; import com.android.tradefed.config.Option; +import com.android.tradefed.config.OptionSetter; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; import com.android.tradefed.invoker.TestInformation; @@ -59,6 +61,7 @@ public final class AppSetupPreparer implements ITargetPreparer { @VisibleForTesting static final String OPTION_SETUP_TIMEOUT_MILLIS = "setup-timeout-millis"; @VisibleForTesting static final String OPTION_MAX_RETRY = "max-retry"; @VisibleForTesting static final String OPTION_AAPT_VERSION = "aapt-version"; + @VisibleForTesting static final String OPTION_INCREMENTAL_INSTALL = "incremental"; @Option(name = "package-name", description = "Package name of testing app.") private String mPackageName; @@ -78,6 +81,11 @@ public final class AppSetupPreparer implements ITargetPreparer { + "including leading dash, e.g. \"-d\"") private final List<String> mInstallArgs = new ArrayList<>(); + @Option( + name = OPTION_INCREMENTAL_INSTALL, + description = "Enable packages to be installed incrementally.") + private boolean mIncrementalInstallation = false; + @Option(name = OPTION_MAX_RETRY, description = "Max number of retries upon TargetSetupError.") private int mMaxRetry = 0; @@ -178,6 +186,13 @@ public final class AppSetupPreparer implements ITargetPreparer { throws DeviceNotAvailableException, BuildError, TargetSetupError { mTestAppInstallSetup.setAaptVersion(mAaptVersion); + try { + OptionSetter setter = new OptionSetter(mTestAppInstallSetup); + setter.setOptionValue("incremental", String.valueOf(mIncrementalInstallation)); + } catch (ConfigurationException e) { + throw new TargetSetupError(e.getMessage(), e); + } + if (mPackageName != null) { SystemPackageUninstaller.uninstallPackage(mPackageName, device); } diff --git a/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java b/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java index a3c8ea7..e2e4352 100644 --- a/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java +++ b/harness/src/test/java/com/android/compatibility/targetprep/AppSetupPreparerTest.java @@ -16,6 +16,7 @@ package com.android.compatibility.targetprep; import com.android.tradefed.build.IBuildInfo; +import com.android.tradefed.config.ArgsOptionParser; import com.android.tradefed.config.ConfigurationException; import com.android.tradefed.config.OptionSetter; import com.android.tradefed.device.DeviceNotAvailableException; @@ -327,6 +328,23 @@ public final class AppSetupPreparerTest { } @Test + public void setUp_installIncrementalOptionSet_forwardsToInstaller() throws Exception { + TestAppInstallSetup installer = mock(TestAppInstallSetup.class); + + AppSetupPreparer preparer = + new PreparerBuilder() + .setInstaller(installer) + .setOption(AppSetupPreparer.OPTION_INCREMENTAL_INSTALL, "true") + .build(); + + preparer.setUp(NULL_DEVICE, NULL_BUILD_INFO); + String result = ArgsOptionParser.getOptionHelp(false, installer); + System.out.println(result); + + assertThat(result).contains("incremental"); + } + + @Test public void setUp_aaptVersionOptionSet_forwardsToInstaller() throws Exception { TestAppInstallSetup installer = mock(TestAppInstallSetup.class); ArgumentCaptor<AaptVersion> captor = ArgumentCaptor.forClass(AaptVersion.class); |