Merge "Substitute apex_e2e_tests with CtsStagedInstallHostTestCases" into qt-dev

4 files changed, 3 insertions, 101 deletions

diff --git a/tests/Android.bp b/tests/Android.bp
index b34f056a..6f514728 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -13,24 +13,6 @@
 // limitations under the License.
 
 java_test_host {
-    name: "apex_e2e_tests",
-
-    srcs:  ["src/**/ApexPackageStageActivateUninstallHostTest.java"],
-
-    libs: ["tradefed"],
-
-    static_libs: ["apex_e2e_base_test"],
-
-    data: [
-            ":apex.test",
-    ],
-
-    test_config: "apex-e2e-tests.xml",
-
-    test_suites: ["general-tests"],
-}
-
-java_test_host {
     name: "timezone_data_e2e_tests",
 
     srcs:  ["src/**/TimezoneDataHostTest.java"],
diff --git a/tests/TEST_MAPPING b/tests/TEST_MAPPING
index d7fecf71..59b54992 100644
--- a/tests/TEST_MAPPING
+++ b/tests/TEST_MAPPING
@@ -1,9 +1,6 @@
 {
   "presubmit": [
     {
-      "name": "apex_e2e_tests"
-    },
-    {
       "name": "apex_targetprep_tests"
     },
     {
@@ -14,6 +11,9 @@
     },
     {
       "name": "media_swcodec_e2e_tests"
+    },
+    {
+      "name": "CtsStagedInstallHostTestCases"
     }
   ]
 }
diff --git a/tests/apex-e2e-tests.xml b/tests/apex-e2e-tests.xml
deleted file mode 100644
index 348ea6ac..00000000
--- a/tests/apex-e2e-tests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<configuration description="Config for apex install/uninstall test cases">
-    <option name="test-suite-tag" value="apex_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="apex_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:apex.test.apex" />
-    </test>
-</configuration>
-
diff --git a/tests/src/com/android/tests/apex/ApexPackageStageActivateUninstallHostTest.java b/tests/src/com/android/tests/apex/ApexPackageStageActivateUninstallHostTest.java
deleted file mode 100644
index 6489ec4f..00000000
--- a/tests/src/com/android/tests/apex/ApexPackageStageActivateUninstallHostTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.log.LogUtil.CLog;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.IOException;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class ApexPackageStageActivateUninstallHostTest extends ApexE2EBaseHostTest {
-
-    /**
-     * Tests that if Apex package can be staged, activated and uninstalled successfully.
-     */
-    @Test
-    public void testStageActivateUninstallApexPackage()
-                                throws DeviceNotAvailableException, IOException {
-        doTestStageActivateUninstallApexPackage();
-    }
-
-    @Test
-    public void testStageActivatUninstallTwice() throws Exception {
-        doTestStageActivateUninstallApexPackage();
-        CLog.i("Installing the same apex second time");
-        doTestStageActivateUninstallApexPackage();
-    }
-
-    @Override
-    public void additionalCheck() {
-      // Nothing to do here.
-    }
-}