diff options
author | Yuriy Solodkyy <solodkyy@google.com> | 2022-03-02 13:32:19 +0000 |
---|---|---|
committer | Yuriy Solodkyy <solodkyy@google.com> | 2022-03-02 14:22:15 +0000 |
commit | 02d70addb7d7f662988fc5f34d1f390a73a7b83c (patch) | |
tree | cd6fb370c867dd2f025852377a498a64aecaf9be /android/testSrc | |
parent | 643a0f10158de12ce9a2d6a25175e6cc4f1df8a7 (diff) | |
download | idea-02d70addb7d7f662988fc5f34d1f390a73a7b83c.tar.gz |
Move run configuration validation from ApkProvider's
to `AndroidProjectSystem`.
`ApkProvider`s are not necessarily bound to a run configuration and
validation requires them being instantiated too soon making the overall
design too complicated. This change separates validation and makes
further simplification of apk providers possible.
Bug: n/a
Test: n/a
Change-Id: I3a53a59c3dce8a5da77805ff3f6693e7129237bf
Diffstat (limited to 'android/testSrc')
-rw-r--r-- | android/testSrc/com/android/tools/idea/run/activity/launch/DefaultActivityLaunchTest.kt | 5 | ||||
-rw-r--r-- | android/testSrc/com/android/tools/idea/run/editor/NoApksProvider.java | 8 |
2 files changed, 0 insertions, 13 deletions
diff --git a/android/testSrc/com/android/tools/idea/run/activity/launch/DefaultActivityLaunchTest.kt b/android/testSrc/com/android/tools/idea/run/activity/launch/DefaultActivityLaunchTest.kt index f9009885544..b0248eb2753 100644 --- a/android/testSrc/com/android/tools/idea/run/activity/launch/DefaultActivityLaunchTest.kt +++ b/android/testSrc/com/android/tools/idea/run/activity/launch/DefaultActivityLaunchTest.kt @@ -22,7 +22,6 @@ import com.android.tools.idea.run.AndroidRunConfigurationType import com.android.tools.idea.run.ApkInfo import com.android.tools.idea.run.ApkProvider import com.android.tools.idea.run.ApkProvisionException -import com.android.tools.idea.run.ValidationError import com.android.tools.idea.run.configuration.execution.createApp import org.jetbrains.android.AndroidTestCase import org.mockito.ArgumentMatchers @@ -59,9 +58,5 @@ class DefaultActivityLaunchTest : AndroidTestCase() { override fun getApks(device: IDevice): Collection<ApkInfo> { return listOf(ApkInfo(File(apkFile), appId)) } - - override fun validate(): List<ValidationError> { - return ArrayList() - } } }
\ No newline at end of file diff --git a/android/testSrc/com/android/tools/idea/run/editor/NoApksProvider.java b/android/testSrc/com/android/tools/idea/run/editor/NoApksProvider.java index 0cb2b1c8b60..bbb9f34f76c 100644 --- a/android/testSrc/com/android/tools/idea/run/editor/NoApksProvider.java +++ b/android/testSrc/com/android/tools/idea/run/editor/NoApksProvider.java @@ -19,10 +19,8 @@ import com.android.ddmlib.IDevice; import com.android.tools.idea.run.ApkInfo; import com.android.tools.idea.run.ApkProvider; import com.android.tools.idea.run.ApkProvisionException; -import com.android.tools.idea.run.ValidationError; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import org.jetbrains.annotations.NotNull; public class NoApksProvider implements ApkProvider { @@ -31,10 +29,4 @@ public class NoApksProvider implements ApkProvider { public Collection<ApkInfo> getApks(@NotNull IDevice device) throws ApkProvisionException { return new ArrayList<>(); } - - @NotNull - @Override - public List<ValidationError> validate() { - return new ArrayList<>(); - } } |