From ae46195d4fcde85c0901ca476a5cffd015d573cb Mon Sep 17 00:00:00 2001 From: Neal Nguyen Date: Wed, 23 Dec 2009 17:26:20 -0800 Subject: [PATCH] Framework Tests Cleanup: Removing CTS duplicate files This file is basically just a wrapper around AndroidTest, which is going away as part of framework test cleanup. AndroidTests.java is just a wrapper around all the actual tests, so can be removed as well. --- .../com/android/unit_tests/AndroidTests.java | 32 ------------------- .../unit_tests/vcard/VCardTestSuite.java | 31 ------------------ 2 files changed, 63 deletions(-) delete mode 100644 tests/AndroidTests/src/com/android/unit_tests/AndroidTests.java delete mode 100644 tests/AndroidTests/src/com/android/unit_tests/vcard/VCardTestSuite.java diff --git a/tests/AndroidTests/src/com/android/unit_tests/AndroidTests.java b/tests/AndroidTests/src/com/android/unit_tests/AndroidTests.java deleted file mode 100644 index 4b86add1c7d0e..0000000000000 --- a/tests/AndroidTests/src/com/android/unit_tests/AndroidTests.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2005 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.unit_tests; - -import android.test.FrameworkTests; -import android.test.suitebuilder.TestSuiteBuilder; - -import junit.framework.TestSuite; - -public class AndroidTests extends TestSuite { - - public static TestSuite suite() { - TestSuiteBuilder suiteBuilder = new TestSuiteBuilder(AndroidTests.class); - TestSuite suite = suiteBuilder.includeAllPackagesUnderHere().build(); - - return suite; - } -} diff --git a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardTestSuite.java b/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardTestSuite.java deleted file mode 100644 index f3d1c5eebe72d..0000000000000 --- a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardTestSuite.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2009 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.unit_tests.vcard; - -import com.android.unit_tests.AndroidTests; - -import android.test.suitebuilder.TestSuiteBuilder; - -import junit.framework.TestSuite; - -public class VCardTestSuite extends TestSuite { - public static TestSuite suite() { - TestSuiteBuilder suiteBuilder = new TestSuiteBuilder(AndroidTests.class); - suiteBuilder.includeAllPackagesUnderHere(); - return suiteBuilder.build(); - } -} \ No newline at end of file