Rename host test helper package to com.android.microdroid.test.host
This CL renames host test heper com.android.microdroid.test to
com.android.microdroid.test.host package to eventually have two
separate separate packages for the device test helper and host
test helper.
Test: atest ComposTestCase
Change-Id: I527fcb91299d87a7155ad2818fbd9b499a381f29
diff --git a/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java b/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
index fcd6753..0ade0ba 100644
--- a/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
+++ b/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
@@ -16,8 +16,8 @@
package com.android.virt.fs;
-import static com.android.microdroid.test.CommandResultSubject.assertThat;
-import static com.android.microdroid.test.LogArchiver.archiveLogThenDelete;
+import static com.android.microdroid.test.host.CommandResultSubject.assertThat;
+import static com.android.microdroid.test.host.LogArchiver.archiveLogThenDelete;
import static com.android.tradefed.device.TestDevice.MicrodroidBuilder;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
@@ -32,7 +32,7 @@
import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
import com.android.compatibility.common.util.PollingCheck;
-import com.android.microdroid.test.CommandRunner;
+import com.android.microdroid.test.host.CommandRunner;
import com.android.tradefed.build.IBuildInfo;
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
diff --git a/compos/tests/java/android/compos/test/ComposTestCase.java b/compos/tests/java/android/compos/test/ComposTestCase.java
index 4f33afd..d8504f7 100644
--- a/compos/tests/java/android/compos/test/ComposTestCase.java
+++ b/compos/tests/java/android/compos/test/ComposTestCase.java
@@ -16,8 +16,8 @@
package android.compos.test;
-import static com.android.microdroid.test.CommandResultSubject.assertThat;
-import static com.android.microdroid.test.CommandResultSubject.command_results;
+import static com.android.microdroid.test.host.CommandResultSubject.assertThat;
+import static com.android.microdroid.test.host.CommandResultSubject.command_results;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
import static com.google.common.truth.Truth.assertThat;
@@ -25,8 +25,8 @@
import android.platform.test.annotations.RootPermissionTest;
-import com.android.microdroid.test.CommandRunner;
-import com.android.microdroid.test.MicrodroidHostTestCaseBase;
+import com.android.microdroid.test.host.CommandRunner;
+import com.android.microdroid.test.host.MicrodroidHostTestCaseBase;
import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.result.FileInputStreamSource;
import com.android.tradefed.result.LogDataType;
diff --git a/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java b/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
index 21f2d6d..49d2fe4 100644
--- a/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
+++ b/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
@@ -25,9 +25,9 @@
import android.platform.test.annotations.RootPermissionTest;
-import com.android.microdroid.test.CommandRunner;
-import com.android.microdroid.test.MicrodroidHostTestCaseBase;
import com.android.microdroid.test.common.MetricsProcessor;
+import com.android.microdroid.test.host.CommandRunner;
+import com.android.microdroid.test.host.MicrodroidHostTestCaseBase;
import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.util.CommandResult;
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/CommandResultSubject.java b/tests/hostside/helper/java/com/android/microdroid/test/host/CommandResultSubject.java
similarity index 98%
rename from tests/hostside/helper/java/com/android/microdroid/test/CommandResultSubject.java
rename to tests/hostside/helper/java/com/android/microdroid/test/host/CommandResultSubject.java
index 2271325..2e9d078 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/CommandResultSubject.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/CommandResultSubject.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.microdroid.test;
+package com.android.microdroid.test.host;
import static com.google.common.truth.Truth.assertAbout;
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/CommandRunner.java b/tests/hostside/helper/java/com/android/microdroid/test/host/CommandRunner.java
similarity index 98%
rename from tests/hostside/helper/java/com/android/microdroid/test/CommandRunner.java
rename to tests/hostside/helper/java/com/android/microdroid/test/host/CommandRunner.java
index 2f9b3df..846531d 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/CommandRunner.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/CommandRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.microdroid.test;
+package com.android.microdroid.test.host;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.fail;
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/LogArchiver.java b/tests/hostside/helper/java/com/android/microdroid/test/host/LogArchiver.java
similarity index 97%
rename from tests/hostside/helper/java/com/android/microdroid/test/LogArchiver.java
rename to tests/hostside/helper/java/com/android/microdroid/test/host/LogArchiver.java
index be638ab..96ab543 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/LogArchiver.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/LogArchiver.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.microdroid.test;
+package com.android.microdroid.test.host;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
similarity index 98%
rename from tests/hostside/helper/java/com/android/microdroid/test/MicrodroidHostTestCaseBase.java
rename to tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
index c84513a..cff06d5 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/MicrodroidHostTestCaseBase.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.microdroid.test;
+package com.android.microdroid.test.host;
-import static com.android.microdroid.test.CommandResultSubject.assertThat;
-import static com.android.microdroid.test.CommandResultSubject.command_results;
+import static com.android.microdroid.test.host.CommandResultSubject.assertThat;
+import static com.android.microdroid.test.host.CommandResultSubject.command_results;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
import static com.google.common.truth.Truth.assertWithMessage;
diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
index 0f461aa..1beee45 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
@@ -16,7 +16,7 @@
package com.android.microdroid.test;
-import static com.android.microdroid.test.CommandResultSubject.command_results;
+import static com.android.microdroid.test.host.CommandResultSubject.command_results;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
import static com.google.common.truth.Truth.assertThat;
@@ -38,6 +38,8 @@
import android.cts.statsdatom.lib.ReportUtils;
import com.android.compatibility.common.util.CddTest;
+import com.android.microdroid.test.host.CommandRunner;
+import com.android.microdroid.test.host.MicrodroidHostTestCaseBase;
import com.android.os.AtomsProto;
import com.android.os.StatsLog;
import com.android.tradefed.device.DeviceNotAvailableException;