Move the retry wrapper to /suite/ since it's specific
Test: unit tests
Bug: 74208815
Change-Id: I91942ac2b722db79cb2fc72c1bdacefa0d370584
diff --git a/src/com/android/tradefed/testtype/GranularRetriableTestWrapper.java b/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapper.java
similarity index 95%
rename from src/com/android/tradefed/testtype/GranularRetriableTestWrapper.java
rename to src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapper.java
index 818a28c..88c8911 100644
--- a/src/com/android/tradefed/testtype/GranularRetriableTestWrapper.java
+++ b/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.tradefed.testtype;
+package com.android.tradefed.testtype.suite;
import com.android.tradefed.config.IConfiguration;
import com.android.tradefed.device.DeviceNotAvailableException;
@@ -27,9 +27,9 @@
import com.android.tradefed.result.ITestInvocationListener;
import com.android.tradefed.result.LogSaverResultForwarder;
import com.android.tradefed.result.TestRunResult;
-import com.android.tradefed.testtype.suite.ModuleDefinition;
-import com.android.tradefed.testtype.suite.ModuleListener;
-import com.android.tradefed.testtype.suite.TestFailureListener;
+import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.testtype.ITestFilterReceiver;
+
import com.google.common.annotations.VisibleForTesting;
import java.util.ArrayList;
@@ -144,9 +144,10 @@
/**
* Initialize a new {@link ModuleListener} for each test run.
*
- * @return a {@link ResultForwarder} listener which contains the new {@link ModuleListener}, the
- * main {@link ITestInvocationListener} and main {@link TestFailureListener}, and wrapped by
- * RunMetricsCollector and Module MetricCollector (if not initialized).
+ * @return a {@link ITestInvocationListener} listener which contains the new {@link
+ * ModuleListener}, the main {@link ITestInvocationListener} and main {@link
+ * TestFailureListener}, and wrapped by RunMetricsCollector and Module MetricCollector (if
+ * not initialized).
*/
private ITestInvocationListener prepareRunListener() {
ModuleListener moduleListener = createModuleListener();
diff --git a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java
index 1c2b64b..99d5342 100644
--- a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java
+++ b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java
@@ -44,7 +44,6 @@
import com.android.tradefed.targetprep.ITargetPreparer;
import com.android.tradefed.targetprep.TargetSetupError;
import com.android.tradefed.targetprep.multi.IMultiTargetPreparer;
-import com.android.tradefed.testtype.GranularRetriableTestWrapper;
import com.android.tradefed.testtype.IBuildReceiver;
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IInvocationContextReceiver;
diff --git a/tests/src/com/android/tradefed/UnitTests.java b/tests/src/com/android/tradefed/UnitTests.java
index e4b7000..85ff6a8 100644
--- a/tests/src/com/android/tradefed/UnitTests.java
+++ b/tests/src/com/android/tradefed/UnitTests.java
@@ -175,7 +175,6 @@
import com.android.tradefed.testtype.GTestXmlResultParserTest;
import com.android.tradefed.testtype.GoogleBenchmarkResultParserTest;
import com.android.tradefed.testtype.GoogleBenchmarkTestTest;
-import com.android.tradefed.testtype.GranularRetriableTestWrapperTest;
import com.android.tradefed.testtype.HostTestTest;
import com.android.tradefed.testtype.InstalledInstrumentationsTestTest;
import com.android.tradefed.testtype.InstrumentationFileTestTest;
@@ -201,6 +200,7 @@
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;
@@ -486,7 +486,6 @@
FakeTestTest.class,
GoogleBenchmarkResultParserTest.class,
GoogleBenchmarkTestTest.class,
- GranularRetriableTestWrapperTest.class,
GTestListTestParserTest.class,
GTestResultParserTest.class,
GTestTest.class,
@@ -523,6 +522,7 @@
// testtype/suite
AtestRunnerTest.class,
BaseTestSuiteTest.class,
+ GranularRetriableTestWrapperTest.class,
ITestSuiteIntegrationTest.class,
ITestSuiteMultiTest.class,
ITestSuiteTest.class,
diff --git a/tests/src/com/android/tradefed/testtype/GranularRetriableTestWrapperTest.java b/tests/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapperTest.java
similarity index 96%
rename from tests/src/com/android/tradefed/testtype/GranularRetriableTestWrapperTest.java
rename to tests/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapperTest.java
index 3c94dc5..f29cece 100644
--- a/tests/src/com/android/tradefed/testtype/GranularRetriableTestWrapperTest.java
+++ b/tests/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapperTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.tradefed.testtype;
+package com.android.tradefed.testtype.suite;
import com.android.ddmlib.testrunner.TestResult.TestStatus;
import com.android.tradefed.config.IConfiguration;
@@ -22,7 +22,7 @@
import com.android.tradefed.device.metric.IMetricCollector;
import com.android.tradefed.invoker.InvocationContext;
import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
-import com.android.tradefed.testtype.suite.ModuleListener;
+import com.android.tradefed.testtype.IRemoteTest;
import com.android.tradefed.result.CollectingTestListener;
import com.android.tradefed.result.FileSystemLogSaver;
import com.android.tradefed.result.ITestInvocationListener;
@@ -43,7 +43,7 @@
import java.util.HashMap;
import java.util.Map;
-/** Unit tests for {@link GranularRetriableTestWrapper}. */
+/** Unit tests for {@link com.android.tradefed.testtype.suite.GranularRetriableTestWrapper}. */
@RunWith(JUnit4.class)
public class GranularRetriableTestWrapperTest {
@@ -102,7 +102,7 @@
@Test(expected = DeviceNotAvailableException.class)
public void testRun_catchDeviceNotAvailableException() throws Exception {
IRemoteTest mockTest = Mockito.mock(IRemoteTest.class);
- Mockito.doThrow(new DeviceNotAvailableException("fake message"))
+ Mockito.doThrow(new DeviceNotAvailableException("fake message", "serial"))
.when(mockTest)
.run(Mockito.any(ITestInvocationListener.class));
GranularRetriableTestWrapper granularTestWrapper = createGranularTestWrapper(mockTest);
@@ -116,7 +116,7 @@
@Test
public void testRun_catchDeviceUnresponsiveException() throws Exception {
IRemoteTest mockTest = Mockito.mock(IRemoteTest.class);
- Mockito.doThrow(new DeviceUnresponsiveException("fake message"))
+ Mockito.doThrow(new DeviceUnresponsiveException("fake message", "serial"))
.when(mockTest)
.run(Mockito.any(ITestInvocationListener.class));
ModuleListener mockRunListener = Mockito.mock(ModuleListener.class);