Rename VirtualizationTestHelper to MicrodroidHostTestHelper
This is a common base class for Microdroid host tests. Make the name
reflect the purpose.
Test: m MicrodroidHostTestCases
Change-Id: I746d76205c9c26ce71f5e8c1025257bf6057f913
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index dfc2f2b..24288ee 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -13,7 +13,7 @@
"tradefed",
],
static_libs: [
- "VirtualizationTestHelper",
+ "MicrodroidHostTestHelper",
],
per_testcase_directory: true,
data: [
diff --git a/tests/hostside/helper/Android.bp b/tests/hostside/helper/Android.bp
index 6ab02f8..f7caca2 100644
--- a/tests/hostside/helper/Android.bp
+++ b/tests/hostside/helper/Android.bp
@@ -3,7 +3,7 @@
}
java_library_host {
- name: "VirtualizationTestHelper",
+ name: "MicrodroidHostTestHelper",
srcs: ["java/**/*.java"],
libs: [
"compatibility-tradefed",
diff --git a/tests/hostside/helper/java/android/virt/test/CommandResultSubject.java b/tests/hostside/helper/java/com/android/microdroid/test/CommandResultSubject.java
similarity index 98%
rename from tests/hostside/helper/java/android/virt/test/CommandResultSubject.java
rename to tests/hostside/helper/java/com/android/microdroid/test/CommandResultSubject.java
index 5312f5a..2271325 100644
--- a/tests/hostside/helper/java/android/virt/test/CommandResultSubject.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/CommandResultSubject.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.virt.test;
+package com.android.microdroid.test;
import static com.google.common.truth.Truth.assertAbout;
diff --git a/tests/hostside/helper/java/android/virt/test/CommandRunner.java b/tests/hostside/helper/java/com/android/microdroid/test/CommandRunner.java
similarity index 98%
rename from tests/hostside/helper/java/android/virt/test/CommandRunner.java
rename to tests/hostside/helper/java/com/android/microdroid/test/CommandRunner.java
index f1bdb8e..2f9b3df 100644
--- a/tests/hostside/helper/java/android/virt/test/CommandRunner.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/CommandRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.virt.test;
+package com.android.microdroid.test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.fail;
diff --git a/tests/hostside/helper/java/android/virt/test/LogArchiver.java b/tests/hostside/helper/java/com/android/microdroid/test/LogArchiver.java
similarity index 97%
rename from tests/hostside/helper/java/android/virt/test/LogArchiver.java
rename to tests/hostside/helper/java/com/android/microdroid/test/LogArchiver.java
index b6cae95..be638ab 100644
--- a/tests/hostside/helper/java/android/virt/test/LogArchiver.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/LogArchiver.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.virt.test;
+package com.android.microdroid.test;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
diff --git a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/MicrodroidHostTestCaseBase.java
similarity index 97%
rename from tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
rename to tests/hostside/helper/java/com/android/microdroid/test/MicrodroidHostTestCaseBase.java
index 10d1e8e..635d54e 100644
--- a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/MicrodroidHostTestCaseBase.java
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-package android.virt.test;
+package com.android.microdroid.test;
-import static android.virt.test.CommandResultSubject.assertThat;
-import static android.virt.test.CommandResultSubject.command_results;
-
+import static com.android.microdroid.test.CommandResultSubject.assertThat;
+import static com.android.microdroid.test.CommandResultSubject.command_results;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
import static com.google.common.truth.Truth.assertWithMessage;
@@ -46,7 +45,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public abstract class VirtualizationTestCaseBase extends BaseHostJUnit4Test {
+public abstract class MicrodroidHostTestCaseBase extends BaseHostJUnit4Test {
protected static final String TEST_ROOT = "/data/local/tmp/virt/";
protected static final String VIRT_APEX = "/apex/com.android.virt/";
protected static final String LOG_PATH = TEST_ROOT + "log.txt";
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
similarity index 98%
rename from tests/hostside/java/android/virt/test/MicrodroidTestCase.java
rename to tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
index d25868e..f3062c6 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package android.virt.test;
+package com.android.microdroid.test;
-import static android.virt.test.CommandResultSubject.command_results;
-
+import static com.android.microdroid.test.CommandResultSubject.command_results;
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
import static com.google.common.truth.Truth.assertThat;
@@ -63,7 +62,7 @@
import java.util.regex.Pattern;
@RunWith(DeviceJUnit4ClassRunner.class)
-public class MicrodroidTestCase extends VirtualizationTestCaseBase {
+public class MicrodroidTestCase extends MicrodroidHostTestCaseBase {
private static final String APK_NAME = "MicrodroidTestApp.apk";
private static final String PACKAGE_NAME = "com.android.microdroid.test";
private static final String SHELL_PACKAGE_NAME = "com.android.shell";