RESTRICT AUTOMERGE: Revert "Initial commit of the test code for ART Service"
This reverts commit bfd622abc23c77ffc8799f376df7241f15d6550a.
Test: m
Bug: 184281926
Change-Id: I0e80a0f9286de982169761df8fd01f89cfcd678c
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5930f7a..61e8d9d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -856,9 +856,6 @@
"name": "BootImageProfileTest"
},
{
- "name": "ArtServiceTests"
- },
- {
"name": "art-run-test-001-HelloWorld"
},
{
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index c83b3d1..461a70c 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -136,8 +136,6 @@
art_imgdiag_tests \
art_libartbase_tests \
art_libartpalette_tests \
- art_libartservice_tests \
- art_libarttools_tests \
art_libdexfile_external_tests \
art_libdexfile_support_static_tests \
art_libdexfile_support_tests \
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 0be4660..9deb1e8 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -347,8 +347,6 @@
"art_imgdiag_tests",
"art_libartbase_tests",
"art_libartpalette_tests",
- "art_libartservice_tests",
- "art_libarttools_tests",
"art_libdexfile_tests",
"art_libdexfile_support_tests",
"art_libprofile_tests",
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 10de7e3..591457e 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -746,8 +746,6 @@
self._checker.check_art_test_executable('art_imgdiag_tests')
self._checker.check_art_test_executable('art_libartbase_tests')
self._checker.check_art_test_executable('art_libartpalette_tests')
- self._checker.check_art_test_executable('art_libartservice_tests')
- self._checker.check_art_test_executable('art_libarttools_tests')
self._checker.check_art_test_executable('art_libdexfile_support_tests')
self._checker.check_art_test_executable('art_libdexfile_tests')
self._checker.check_art_test_executable('art_libprofile_tests')
diff --git a/libartservice/Android.bp b/libartservice/Android.bp
index 6e91911..90df77b 100644
--- a/libartservice/Android.bp
+++ b/libartservice/Android.bp
@@ -149,17 +149,3 @@
plugins: ["java_api_finder"],
}
-
-art_cc_test {
- name: "art_libartservice_tests",
- defaults: [
- "art_gtest_defaults",
- ],
- srcs: [
- "service/native/service_test.cc",
- ],
- shared_libs: [
- "libbase",
- "libartservice",
- ],
-}
diff --git a/libartservice/service/native/service_test.cc b/libartservice/service/native/service_test.cc
deleted file mode 100644
index eb84b73..0000000
--- a/libartservice/service/native/service_test.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-#include "service.h"
-#include "gtest/gtest.h"
-
-namespace art {
-
-class ArtServiceTest : public testing::Test {};
-
-TEST_F(ArtServiceTest, Hello) {
- EXPECT_EQ("hello world!", art::service::getMsg());
-}
-
-} // namespace art
diff --git a/libartservice/tests/Android.bp b/libartservice/tests/Android.bp
deleted file mode 100644
index 450e3d2..0000000
--- a/libartservice/tests/Android.bp
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Copyright (C) 2021 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.
-//
-
-//########################################################################
-// Build ArtServiceTests package
-//########################################################################
-
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "art_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["art_license"],
-}
-
-java_test {
- name: "ArtManagerLocalTests",
-
- // Include all test java files.
- srcs: [
- "src/**/*.java",
- ],
-
- static_libs: [
- "junit",
- "service-art.impl",
- ],
-
- platform_apis: true,
- test_suites: ["general-tests"],
-}
diff --git a/libartservice/tests/src/com/android/server/art/ArtManagerLocalTests.java b/libartservice/tests/src/com/android/server/art/ArtManagerLocalTests.java
deleted file mode 100644
index f80ee1a..0000000
--- a/libartservice/tests/src/com/android/server/art/ArtManagerLocalTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2021 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.server.art;
-
-import static org.junit.Assert.assertEquals;
-
-import com.android.server.art.ArtManagerLocal;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-public class ArtManagerLocalTests {
- private ArtManagerLocal mArtManagerLocal;
-
- @Before
- public void setup() {
- mArtManagerLocal = new ArtManagerLocal();
- }
-}
\ No newline at end of file
diff --git a/libarttools/Android.bp b/libarttools/Android.bp
index 5e654bb..a042d69 100644
--- a/libarttools/Android.bp
+++ b/libarttools/Android.bp
@@ -45,17 +45,3 @@
],
export_shared_lib_headers: ["libbase"],
}
-
-art_cc_test {
- name: "art_libarttools_tests",
- defaults: [
- "art_gtest_defaults",
- ],
- srcs: [
- "tools/tools_test.cc",
- ],
- shared_libs: [
- "libbase",
- "libarttools",
- ],
-}
diff --git a/libarttools/tools/tools_test.cc b/libarttools/tools/tools_test.cc
deleted file mode 100644
index 6eaa8f6..0000000
--- a/libarttools/tools/tools_test.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-#include "tools.h"
-#include "gtest/gtest.h"
-
-namespace art {
-
-class ArtToolsTest : public testing::Test {};
-
-TEST_F(ArtToolsTest, Hello) {
- EXPECT_EQ("hello world!", art::tools::getMsg());
-}
-
-} // namespace art
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index e213dec..e5750ad 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -617,7 +617,6 @@
other_presubmit_tests = [
"CtsJdwpTestCases",
"BootImageProfileTest",
- "ArtServiceTests",
]
presubmit_run_tests = run_test_module_names[0:num_presubmit_run_tests]
presubmit_tests = other_presubmit_tests + presubmit_run_tests