diff options
Diffstat (limited to 'tests/src/com/android/tradefed/UnitTests.java')
| -rw-r--r-- | tests/src/com/android/tradefed/UnitTests.java | 208 |
1 files changed, 178 insertions, 30 deletions
diff --git a/tests/src/com/android/tradefed/UnitTests.java b/tests/src/com/android/tradefed/UnitTests.java index 2d35fb7a2..2429be360 100644 --- a/tests/src/com/android/tradefed/UnitTests.java +++ b/tests/src/com/android/tradefed/UnitTests.java @@ -28,6 +28,7 @@ import com.android.tradefed.build.OtaZipfileBuildProviderTest; import com.android.tradefed.build.SdkBuildInfoTest; import com.android.tradefed.command.CommandFileParserTest; import com.android.tradefed.command.CommandFileWatcherTest; +import com.android.tradefed.command.CommandInterrupterTest; import com.android.tradefed.command.CommandOptionsTest; import com.android.tradefed.command.CommandRunnerTest; import com.android.tradefed.command.CommandSchedulerTest; @@ -46,6 +47,9 @@ import com.android.tradefed.config.OptionCopierTest; import com.android.tradefed.config.OptionSetterTest; import com.android.tradefed.config.OptionUpdateRuleTest; import com.android.tradefed.config.SandboxConfigurationFactoryTest; +import com.android.tradefed.config.gcs.GCSConfigurationFactoryTest; +import com.android.tradefed.config.gcs.GCSConfigurationServerTest; +import com.android.tradefed.device.AndroidDebugBridgeWrapperTest; import com.android.tradefed.device.BackgroundDeviceActionTest; import com.android.tradefed.device.CpuStatsCollectorTest; import com.android.tradefed.device.DeviceManagerTest; @@ -63,10 +67,31 @@ import com.android.tradefed.device.TestDeviceTest; import com.android.tradefed.device.TopHelperTest; import com.android.tradefed.device.WaitDeviceRecoveryTest; import com.android.tradefed.device.WifiHelperTest; -import com.android.tradefed.device.metric.ScheduledDeviceMetricCollectorTest; +import com.android.tradefed.device.contentprovider.ContentProviderHandlerTest; +import com.android.tradefed.device.metric.AtraceCollectorTest; +import com.android.tradefed.device.metric.AtraceRunMetricCollectorTest; import com.android.tradefed.device.metric.BaseDeviceMetricCollectorTest; +import com.android.tradefed.device.metric.BuddyInfoMetricCollectorTest; +import com.android.tradefed.device.metric.BugreportzMetricCollectorTest; +import com.android.tradefed.device.metric.DeviceMetricDataTest; +import com.android.tradefed.device.metric.DumpHeapCollectorTest; +import com.android.tradefed.device.metric.FilePullerDeviceMetricCollectorTest; +import com.android.tradefed.device.metric.FilePullerLogCollectorTest; +import com.android.tradefed.device.metric.GraphicsStatsMetricCollectorTest; +import com.android.tradefed.device.metric.IonHeapInfoMetricCollectorTest; +import com.android.tradefed.device.metric.MemInfoMetricCollectorTest; +import com.android.tradefed.device.metric.PagetypeInfoMetricCollectorTest; +import com.android.tradefed.device.metric.ProcessMaxMemoryCollectorTest; +import com.android.tradefed.device.metric.ScheduleMultipleDeviceMetricCollectorTest; +import com.android.tradefed.device.metric.ScheduledDeviceMetricCollectorTest; +import com.android.tradefed.device.metric.TemperatureCollectorTest; +import com.android.tradefed.device.metric.TraceMetricCollectorTest; +import com.android.tradefed.guice.InvocationScopeTest; import com.android.tradefed.invoker.InvocationContextTest; +import com.android.tradefed.invoker.InvocationExecutionTest; +import com.android.tradefed.invoker.SandboxedInvocationExecutionTest; import com.android.tradefed.invoker.ShardListenerTest; +import com.android.tradefed.invoker.ShardMasterResultForwarderTest; import com.android.tradefed.invoker.TestInvocationMultiTest; import com.android.tradefed.invoker.TestInvocationTest; import com.android.tradefed.invoker.shard.ShardHelperTest; @@ -76,13 +101,6 @@ import com.android.tradefed.log.FileLoggerTest; import com.android.tradefed.log.HistoryLoggerTest; import com.android.tradefed.log.LogRegistryTest; import com.android.tradefed.log.TerribleFailureEmailHandlerTest; -import com.android.tradefed.profiler.AggregatingProfilerTest; -import com.android.tradefed.profiler.MetricOutputDataTest; -import com.android.tradefed.profiler.recorder.NumericAggregateFunctionTest; -import com.android.tradefed.profiler.recorder.TraceMetricTest; -import com.android.tradefed.profiler.recorder.TraceMetricsRecorderTest; -import com.android.tradefed.profiler.recorder.TraceParserTest; -import com.android.tradefed.result.AggregatingProfilerListenerTest; import com.android.tradefed.result.BugreportCollectorTest; import com.android.tradefed.result.CollectingTestListenerTest; import com.android.tradefed.result.ConsoleResultReporterTest; @@ -95,25 +113,39 @@ import com.android.tradefed.result.FileSystemLogSaverTest; import com.android.tradefed.result.InvocationFailureEmailResultReporterTest; import com.android.tradefed.result.InvocationToJUnitResultForwarderTest; import com.android.tradefed.result.JUnitToInvocationResultForwarderTest; +import com.android.tradefed.result.LegacySubprocessResultsReporterTest; import com.android.tradefed.result.LogFileSaverTest; +import com.android.tradefed.result.LogcatCrashResultForwarderTest; +import com.android.tradefed.result.MetricsXMLResultReporterTest; import com.android.tradefed.result.SnapshotInputStreamSourceTest; import com.android.tradefed.result.SubprocessResultsReporterTest; +import com.android.tradefed.result.TestDescriptionTest; import com.android.tradefed.result.TestFailureEmailResultReporterTest; +import com.android.tradefed.result.TestRunResultTest; import com.android.tradefed.result.TestSummaryTest; import com.android.tradefed.result.XmlResultReporterTest; +import com.android.tradefed.result.ddmlib.TestRunToTestInvocationForwarderTest; +import com.android.tradefed.result.suite.FormattedGeneratorReporterTest; +import com.android.tradefed.result.suite.XmlSuiteResultFormatterTest; import com.android.tradefed.sandbox.SandboxConfigDumpTest; import com.android.tradefed.sandbox.SandboxConfigUtilTest; +import com.android.tradefed.sandbox.SandboxInvocationRunnerTest; import com.android.tradefed.sandbox.TradefedSandboxTest; import com.android.tradefed.suite.checker.ActivityStatusCheckerTest; +import com.android.tradefed.suite.checker.DeviceSettingCheckerTest; import com.android.tradefed.suite.checker.KeyguardStatusCheckerTest; import com.android.tradefed.suite.checker.SystemServerFileDescriptorCheckerTest; import com.android.tradefed.suite.checker.SystemServerStatusCheckerTest; +import com.android.tradefed.suite.checker.TimeStatusCheckerTest; +import com.android.tradefed.suite.checker.UserCheckerTest; import com.android.tradefed.targetprep.AllTestAppsInstallSetupTest; import com.android.tradefed.targetprep.AppSetupTest; import com.android.tradefed.targetprep.BuildInfoAttributePreparerTest; import com.android.tradefed.targetprep.DefaultTestsZipInstallerTest; import com.android.tradefed.targetprep.DeviceFlashPreparerTest; import com.android.tradefed.targetprep.DeviceSetupTest; +import com.android.tradefed.targetprep.DeviceStorageFillerTest; +import com.android.tradefed.targetprep.DeviceStringPusherTest; import com.android.tradefed.targetprep.FastbootDeviceFlasherTest; import com.android.tradefed.targetprep.FlashingResourcesParserTest; import com.android.tradefed.targetprep.InstallAllTestZipAppsSetupTest; @@ -123,15 +155,22 @@ import com.android.tradefed.targetprep.KernelFlashPreparerTest; import com.android.tradefed.targetprep.PreloadedClassesPreparerTest; import com.android.tradefed.targetprep.PushFilePreparerTest; import com.android.tradefed.targetprep.PythonVirtualenvPreparerTest; +import com.android.tradefed.targetprep.RebootTargetPreparerTest; +import com.android.tradefed.targetprep.RestartSystemServerTargetPreparerTest; +import com.android.tradefed.targetprep.RootTargetPreparerTest; import com.android.tradefed.targetprep.RunCommandTargetPreparerTest; import com.android.tradefed.targetprep.RunHostCommandTargetPreparerTest; import com.android.tradefed.targetprep.SdkAvdPreparerTest; import com.android.tradefed.targetprep.StopServicesSetupTest; +import com.android.tradefed.targetprep.SwitchUserTargetPreparerTest; import com.android.tradefed.targetprep.SystemUpdaterDeviceFlasherTest; import com.android.tradefed.targetprep.TestAppInstallSetupTest; import com.android.tradefed.targetprep.TestFilePushSetupTest; +import com.android.tradefed.targetprep.TimeSetterTargetPreparerTest; +import com.android.tradefed.targetprep.multi.MergeMultiBuildTargetPreparerTest; import com.android.tradefed.targetprep.suite.SuiteApkInstallerTest; import com.android.tradefed.testtype.AndroidJUnitTestTest; +import com.android.tradefed.testtype.CodeCoverageListenerTest; import com.android.tradefed.testtype.CodeCoverageTestBaseTest; import com.android.tradefed.testtype.DeviceBatteryLevelCheckerTest; import com.android.tradefed.testtype.DeviceSuiteTest; @@ -149,8 +188,8 @@ import com.android.tradefed.testtype.InstalledInstrumentationsTestTest; import com.android.tradefed.testtype.InstrumentationFileTestTest; import com.android.tradefed.testtype.InstrumentationSerialTestTest; import com.android.tradefed.testtype.InstrumentationTestTest; -import com.android.tradefed.testtype.JackCodeCoverageTestTest; import com.android.tradefed.testtype.JacocoCodeCoverageTestTest; +import com.android.tradefed.testtype.JarHostTestTest; import com.android.tradefed.testtype.NativeBenchmarkTestParserTest; import com.android.tradefed.testtype.NativeBenchmarkTestTest; import com.android.tradefed.testtype.NativeStressTestParserTest; @@ -160,21 +199,39 @@ import com.android.tradefed.testtype.PythonUnitTestResultParserTest; import com.android.tradefed.testtype.PythonUnitTestRunnerTest; import com.android.tradefed.testtype.TfTestLauncherTest; import com.android.tradefed.testtype.VersionedTfLauncherTest; +import com.android.tradefed.testtype.host.CoverageMeasurementForwarderTest; +import com.android.tradefed.testtype.junit4.BaseHostJUnit4TestTest; +import com.android.tradefed.testtype.junit4.DeviceParameterizedRunnerTest; +import com.android.tradefed.testtype.junit4.LongevityHostRunnerTest; +import com.android.tradefed.testtype.metricregression.DetectRegressionTest; +import com.android.tradefed.testtype.metricregression.MetricsTest; +import com.android.tradefed.testtype.python.PythonBinaryHostTestTest; +import com.android.tradefed.testtype.suite.AtestRunnerTest; +import com.android.tradefed.testtype.suite.BaseTestSuiteTest; +import com.android.tradefed.testtype.suite.GranularRetriableTestWrapperTest; import com.android.tradefed.testtype.suite.ITestSuiteIntegrationTest; import com.android.tradefed.testtype.suite.ITestSuiteMultiTest; import com.android.tradefed.testtype.suite.ITestSuiteTest; +import com.android.tradefed.testtype.suite.ModuleDefinitionMultiTest; import com.android.tradefed.testtype.suite.ModuleDefinitionTest; import com.android.tradefed.testtype.suite.ModuleListenerTest; import com.android.tradefed.testtype.suite.ModuleMergerTest; import com.android.tradefed.testtype.suite.ModuleSplitterTest; +import com.android.tradefed.testtype.suite.SuiteModuleLoaderTest; import com.android.tradefed.testtype.suite.TestFailureListenerTest; +import com.android.tradefed.testtype.suite.TestMappingSuiteRunnerTest; +import com.android.tradefed.testtype.suite.TestSuiteInfoTest; import com.android.tradefed.testtype.suite.TfSuiteRunnerTest; import com.android.tradefed.testtype.suite.ValidateSuiteConfigHelperTest; +import com.android.tradefed.testtype.suite.module.BaseModuleControllerTest; +import com.android.tradefed.testtype.suite.module.CarModuleControllerTest; +import com.android.tradefed.testtype.suite.module.NativeBridgeModuleControllerTest; import com.android.tradefed.testtype.testdefs.XmlDefsParserTest; import com.android.tradefed.testtype.testdefs.XmlDefsTestTest; import com.android.tradefed.util.AaptParserTest; import com.android.tradefed.util.AbiFormatterTest; import com.android.tradefed.util.AbiUtilsTest; +import com.android.tradefed.util.AppVersionFetcherTest; import com.android.tradefed.util.ArrayUtilTest; import com.android.tradefed.util.BluetoothUtilsTest; import com.android.tradefed.util.BugreportTest; @@ -194,6 +251,7 @@ import com.android.tradefed.util.JUnitXmlParserTest; import com.android.tradefed.util.KeyguardControllerStateTest; import com.android.tradefed.util.ListInstrumentationParserTest; import com.android.tradefed.util.LogcatUpdaterEventParserTest; +import com.android.tradefed.util.MetricsXmlParserTest; import com.android.tradefed.util.MultiMapTest; import com.android.tradefed.util.NullUtilTest; import com.android.tradefed.util.PairTest; @@ -210,11 +268,14 @@ import com.android.tradefed.util.SizeLimitedOutputStreamTest; import com.android.tradefed.util.StreamUtilTest; import com.android.tradefed.util.StringEscapeUtilsTest; import com.android.tradefed.util.SubprocessTestResultsParserTest; +import com.android.tradefed.util.TableBuilderTest; import com.android.tradefed.util.TableFormatterTest; import com.android.tradefed.util.TarUtilTest; import com.android.tradefed.util.TestLoaderTest; +import com.android.tradefed.util.TestMappingTest; import com.android.tradefed.util.TimeUtilTest; import com.android.tradefed.util.TimeValTest; +import com.android.tradefed.util.UserUtilTest; import com.android.tradefed.util.ZipUtil2Test; import com.android.tradefed.util.ZipUtilTest; import com.android.tradefed.util.hostmetric.AbstractHostMonitorTest; @@ -224,6 +285,7 @@ import com.android.tradefed.util.keystore.JSONFileKeyStoreFactoryTest; import com.android.tradefed.util.net.HttpHelperTest; import com.android.tradefed.util.net.HttpMultipartPostTest; import com.android.tradefed.util.net.XmlRpcHelperTest; +import com.android.tradefed.util.proto.TfMetricProtoUtilTest; import com.android.tradefed.util.sl4a.Sl4aClientTest; import com.android.tradefed.util.sl4a.Sl4aEventDispatcherTest; import com.android.tradefed.util.xml.AndroidManifestWriterTest; @@ -257,6 +319,7 @@ import org.junit.runners.Suite.SuiteClasses; // command CommandFileParserTest.class, CommandFileWatcherTest.class, + CommandInterrupterTest.class, CommandOptionsTest.class, CommandRunnerTest.class, CommandSchedulerTest.class, @@ -280,7 +343,12 @@ import org.junit.runners.Suite.SuiteClasses; OptionUpdateRuleTest.class, SandboxConfigurationFactoryTest.class, + // config.gcs + GCSConfigurationServerTest.class, + GCSConfigurationFactoryTest.class, + // device + AndroidDebugBridgeWrapperTest.class, BackgroundDeviceActionTest.class, CpuStatsCollectorTest.class, DeviceManagerTest.class, @@ -300,13 +368,38 @@ import org.junit.runners.Suite.SuiteClasses; WaitDeviceRecoveryTest.class, WifiHelperTest.class, + // device.contentprovider + ContentProviderHandlerTest.class, + // device.metric - ScheduledDeviceMetricCollectorTest.class, + AtraceCollectorTest.class, + AtraceRunMetricCollectorTest.class, BaseDeviceMetricCollectorTest.class, + BuddyInfoMetricCollectorTest.class, + BugreportzMetricCollectorTest.class, + DeviceMetricDataTest.class, + DumpHeapCollectorTest.class, + FilePullerDeviceMetricCollectorTest.class, + FilePullerLogCollectorTest.class, + GraphicsStatsMetricCollectorTest.class, + IonHeapInfoMetricCollectorTest.class, + MemInfoMetricCollectorTest.class, + PagetypeInfoMetricCollectorTest.class, + ProcessMaxMemoryCollectorTest.class, + ScheduledDeviceMetricCollectorTest.class, + ScheduleMultipleDeviceMetricCollectorTest.class, + TemperatureCollectorTest.class, + TraceMetricCollectorTest.class, + + // Guice + InvocationScopeTest.class, // invoker InvocationContextTest.class, + InvocationExecutionTest.class, + SandboxedInvocationExecutionTest.class, ShardListenerTest.class, + ShardMasterResultForwarderTest.class, TestInvocationMultiTest.class, TestInvocationTest.class, @@ -321,19 +414,10 @@ import org.junit.runners.Suite.SuiteClasses; LogRegistryTest.class, TerribleFailureEmailHandlerTest.class, - // profiler subdirs - AggregatingProfilerTest.class, - MetricOutputDataTest.class, - NumericAggregateFunctionTest.class, - TraceMetricsRecorderTest.class, - TraceMetricTest.class, - TraceParserTest.class, - // result - AggregatingProfilerListenerTest.class, BugreportCollectorTest.class, - ConsoleResultReporterTest.class, CollectingTestListenerTest.class, + ConsoleResultReporterTest.class, DeviceFileReporterTest.class, DeviceUnavailEmailResultReporterTest.class, EmailResultReporterTest.class, @@ -344,13 +428,24 @@ import org.junit.runners.Suite.SuiteClasses; InvocationFailureEmailResultReporterTest.class, InvocationToJUnitResultForwarderTest.class, JUnitToInvocationResultForwarderTest.class, + LogcatCrashResultForwarderTest.class, LogFileSaverTest.class, + MetricsXMLResultReporterTest.class, SnapshotInputStreamSourceTest.class, SubprocessResultsReporterTest.class, - TestSummaryTest.class, + TestDescriptionTest.class, TestFailureEmailResultReporterTest.class, + TestRunResultTest.class, + TestSummaryTest.class, XmlResultReporterTest.class, + // result.ddmlib + TestRunToTestInvocationForwarderTest.class, + + // result.suite + FormattedGeneratorReporterTest.class, + XmlSuiteResultFormatterTest.class, + // targetprep AllTestAppsInstallSetupTest.class, AppSetupTest.class, @@ -358,6 +453,8 @@ import org.junit.runners.Suite.SuiteClasses; DefaultTestsZipInstallerTest.class, DeviceFlashPreparerTest.class, DeviceSetupTest.class, + DeviceStorageFillerTest.class, + DeviceStringPusherTest.class, FastbootDeviceFlasherTest.class, FlashingResourcesParserTest.class, InstallAllTestZipAppsSetupTest.class, @@ -367,6 +464,9 @@ import org.junit.runners.Suite.SuiteClasses; PreloadedClassesPreparerTest.class, PushFilePreparerTest.class, PythonVirtualenvPreparerTest.class, + RebootTargetPreparerTest.class, + RestartSystemServerTargetPreparerTest.class, + RootTargetPreparerTest.class, RunCommandTargetPreparerTest.class, RunHostCommandTargetPreparerTest.class, SdkAvdPreparerTest.class, @@ -374,6 +474,11 @@ import org.junit.runners.Suite.SuiteClasses; SystemUpdaterDeviceFlasherTest.class, TestAppInstallSetupTest.class, TestFilePushSetupTest.class, + TimeSetterTargetPreparerTest.class, + SwitchUserTargetPreparerTest.class, + + // targetprep.multi + MergeMultiBuildTargetPreparerTest.class, // targetprep.suite SuiteApkInstallerTest.class, @@ -381,17 +486,23 @@ import org.junit.runners.Suite.SuiteClasses; // sandbox SandboxConfigDumpTest.class, SandboxConfigUtilTest.class, + SandboxInvocationRunnerTest.class, TradefedSandboxTest.class, // suite/checker ActivityStatusCheckerTest.class, + DeviceSettingCheckerTest.class, KeyguardStatusCheckerTest.class, SystemServerFileDescriptorCheckerTest.class, SystemServerStatusCheckerTest.class, + TimeStatusCheckerTest.class, + UserCheckerTest.class, // testtype AndroidJUnitTestTest.class, + CodeCoverageListenerTest.class, CodeCoverageTestBaseTest.class, + CoverageMeasurementForwarderTest.class, DeviceBatteryLevelCheckerTest.class, DeviceSuiteTest.class, DeviceTestCaseTest.class, @@ -408,8 +519,8 @@ import org.junit.runners.Suite.SuiteClasses; InstrumentationSerialTestTest.class, InstrumentationFileTestTest.class, InstrumentationTestTest.class, - JackCodeCoverageTestTest.class, JacocoCodeCoverageTestTest.class, + JarHostTestTest.class, NativeBenchmarkTestParserTest.class, NativeBenchmarkTestTest.class, NativeStressTestParserTest.class, @@ -420,18 +531,42 @@ import org.junit.runners.Suite.SuiteClasses; TfTestLauncherTest.class, VersionedTfLauncherTest.class, + // testtype/junit4 + BaseHostJUnit4TestTest.class, + DeviceParameterizedRunnerTest.class, + LongevityHostRunnerTest.class, + + // testtype/metricregression + DetectRegressionTest.class, + MetricsTest.class, + + // testtype/python + PythonBinaryHostTestTest.class, + // testtype/suite + AtestRunnerTest.class, + BaseTestSuiteTest.class, + GranularRetriableTestWrapperTest.class, ITestSuiteIntegrationTest.class, ITestSuiteMultiTest.class, ITestSuiteTest.class, + ModuleDefinitionMultiTest.class, ModuleDefinitionTest.class, ModuleListenerTest.class, ModuleMergerTest.class, ModuleSplitterTest.class, + SuiteModuleLoaderTest.class, TestFailureListenerTest.class, + TestMappingSuiteRunnerTest.class, + TestSuiteInfoTest.class, TfSuiteRunnerTest.class, ValidateSuiteConfigHelperTest.class, + // testtype/suite/module + BaseModuleControllerTest.class, + CarModuleControllerTest.class, + NativeBridgeModuleControllerTest.class, + // testtype/testdefs XmlDefsParserTest.class, XmlDefsTestTest.class, @@ -440,6 +575,7 @@ import org.junit.runners.Suite.SuiteClasses; AaptParserTest.class, AbiFormatterTest.class, AbiUtilsTest.class, + AppVersionFetcherTest.class, ArrayUtilTest.class, BluetoothUtilsTest.class, BugreportTest.class, @@ -454,12 +590,12 @@ import org.junit.runners.Suite.SuiteClasses; FileUtilTest.class, FixedByteArrayOutputStreamTest.class, HprofAllocSiteParserTest.class, - HttpHelperTest.class, - HttpMultipartPostTest.class, JUnitXmlParserTest.class, KeyguardControllerStateTest.class, + LegacySubprocessResultsReporterTest.class, ListInstrumentationParserTest.class, LogcatUpdaterEventParserTest.class, + MetricsXmlParserTest.class, MultiMapTest.class, NullUtilTest.class, PairTest.class, @@ -475,27 +611,39 @@ import org.junit.runners.Suite.SuiteClasses; StreamUtilTest.class, StringEscapeUtilsTest.class, SubprocessTestResultsParserTest.class, + TableBuilderTest.class, TableFormatterTest.class, TarUtilTest.class, TestLoaderTest.class, + TestMappingTest.class, TimeUtilTest.class, TimeValTest.class, - XmlRpcHelperTest.class, + UserUtilTest.class, ZipUtilTest.class, ZipUtil2Test.class, - //util/hostmetric + // util/hostmetric AbstractHostMonitorTest.class, HeapHostMonitorTest.class, - // util subdirs - AndroidManifestWriterTest.class, - Sl4aClientTest.class, - Sl4aEventDispatcherTest.class, + // util/net + HttpHelperTest.class, + HttpMultipartPostTest.class, + XmlRpcHelperTest.class, // util/keystore JSONFileKeyStoreClientTest.class, JSONFileKeyStoreFactoryTest.class, + + // util/proto + TfMetricProtoUtilTest.class, + + // util/sl4a + Sl4aClientTest.class, + Sl4aEventDispatcherTest.class, + + // util/xml + AndroidManifestWriterTest.class, }) public class UnitTests { // empty of purpose |