diff options
| author | Guang Zhu <guangzhu@google.com> | 2017-05-30 18:37:49 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2017-06-01 20:17:16 +0000 |
| commit | f959f30c73b704695ff6c61c72a05d603cb68547 (patch) | |
| tree | 9554adbae8e49c111e43a78230cbe7d00789da3b | |
| parent | d3a59810693f3150d25699d6505a36b246d9191d (diff) | |
| download | tradefederation-f959f30c73b704695ff6c61c72a05d603cb68547.tar.gz | |
allow injection of metadata for testing purpose
... and so adds some constant definitions into ModuleDefinition
(moved over from IModuleDef)
Bug: 36140955
Bug: 35360169
Test: new & existing unit tests
Change-Id: Ia6e7a26b25314f44bb0b894b9d9a44f6012ce00c
Merged-In: I1ad7b2c3258f8d9839b4cf05e72f0554baa25346
| -rw-r--r-- | src/com/android/tradefed/config/ConfigurationDescriptor.java | 7 | ||||
| -rw-r--r-- | src/com/android/tradefed/testtype/suite/ModuleDefinition.java | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/tradefed/config/ConfigurationDescriptor.java b/src/com/android/tradefed/config/ConfigurationDescriptor.java index 08a8bc713..bdfba7a28 100644 --- a/src/com/android/tradefed/config/ConfigurationDescriptor.java +++ b/src/com/android/tradefed/config/ConfigurationDescriptor.java @@ -17,6 +17,8 @@ package com.android.tradefed.config; import com.android.tradefed.util.MultiMap; +import com.google.common.annotations.VisibleForTesting; + import java.util.ArrayList; import java.util.List; @@ -54,4 +56,9 @@ public class ConfigurationDescriptor { public List<String> getMetaData(String name) { return mMetaData.get(name); } + + @VisibleForTesting + public void setMetaData(MultiMap<String, String> metadata) { + mMetaData = metadata; + } } diff --git a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java index 77346caac..87d2f2d34 100644 --- a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java +++ b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java @@ -22,6 +22,7 @@ import com.android.tradefed.build.IBuildInfo; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.DeviceUnresponsiveException; import com.android.tradefed.device.ITestDevice; +import com.android.tradefed.invoker.IInvocationContext; import com.android.tradefed.log.LogUtil.CLog; import com.android.tradefed.result.ITestInvocationListener; import com.android.tradefed.result.ResultForwarder; @@ -49,6 +50,10 @@ import java.util.Map; */ public class ModuleDefinition implements Comparable<ModuleDefinition>, ITestCollector { + /** key names used for saving module info into {@link IInvocationContext} */ + public static final String MODULE_NAME = "module-name"; + public static final String MODULE_ABI = "module-abi"; + protected static final String MODULE_INCOMPLETE_MSG = "Module did not run all its tests."; private final String mId; |