diff options
| author | 2018-07-19 22:29:32 +0000 | |
|---|---|---|
| committer | 2018-07-19 22:29:32 +0000 | |
| commit | 4560b6fd1cafce92ec916afd1617be434d54ecd1 (patch) | |
| tree | 53df56f5b5a134616b03ef65b7ce0ec3b1dddb93 | |
| parent | 0afbfd1182bccbe3913ddee7fb6343c0d450402a (diff) | |
| parent | 654c58e793d7c8c0db54d1579a9a7373ad24c7ba (diff) | |
Merge "Remove unused HdmiCec tests"
| -rw-r--r-- | core/tests/HdmiCec/Android.mk | 30 | ||||
| -rw-r--r-- | core/tests/HdmiCec/AndroidManifest.xml | 23 | ||||
| -rw-r--r-- | core/tests/HdmiCec/AndroidTest.xml | 28 | ||||
| -rw-r--r-- | core/tests/HdmiCec/HelloWorldTests_HalloWelt.config | 26 | ||||
| -rw-r--r-- | core/tests/HdmiCec/OWNERS | 3 | ||||
| -rw-r--r-- | core/tests/HdmiCec/src/android/test/example/helloworld/HelloWorldTest.java | 66 |
6 files changed, 0 insertions, 176 deletions
diff --git a/core/tests/HdmiCec/Android.mk b/core/tests/HdmiCec/Android.mk deleted file mode 100644 index 450068b18dcb..000000000000 --- a/core/tests/HdmiCec/Android.mk +++ /dev/null @@ -1,30 +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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -# Include all test java files -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := HdmiCecTests - -LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test -LOCAL_CERTIFICATE := platform -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) diff --git a/core/tests/HdmiCec/AndroidManifest.xml b/core/tests/HdmiCec/AndroidManifest.xml deleted file mode 100644 index 80129d0d9fba..000000000000 --- a/core/tests/HdmiCec/AndroidManifest.xml +++ /dev/null @@ -1,23 +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. ---> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="android.test.example.helloworld" - android:sharedUserId="android.uid.system" > - <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" /> - <application> - <uses-library android:name="android.test.runner" /> - </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" - android:targetPackage="android.test.example.helloworld" - android:label="Hello World Test"/> -</manifest> diff --git a/core/tests/HdmiCec/AndroidTest.xml b/core/tests/HdmiCec/AndroidTest.xml deleted file mode 100644 index 5af30fbd92ed..000000000000 --- a/core/tests/HdmiCec/AndroidTest.xml +++ /dev/null @@ -1,28 +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="Runs sample instrumentation test."> - <option name="test-suite-tag" value="apct"/> - <option name="test-suite-tag" value="apct-instrumentation"/> - <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup"/> - <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> - <option name="test-file-name" value="HelloWorldTests.apk"/> - </target_preparer> - <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"/> - <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"/> - <option name="test-suite-tag" value="apct"/> - <option name="test-tag" value="SampleInstrumentationTest"/> - <test class="com.android.tradefed.testtype.AndroidJUnitTest"> - <option name="package" value="android.test.example.helloworld"/> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/> - </test> -</configuration> diff --git a/core/tests/HdmiCec/HelloWorldTests_HalloWelt.config b/core/tests/HdmiCec/HelloWorldTests_HalloWelt.config deleted file mode 100644 index 902699beafe1..000000000000 --- a/core/tests/HdmiCec/HelloWorldTests_HalloWelt.config +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 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="Runs only the HalloWelt test."> - <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup" /> - <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> - <option name="test-file-name" value="HelloWorldTests.apk" /> - </target_preparer> - <option name="test-suite-tag" value="apct" /> - <option name="test-tag" value="SampleInstrumentationTest" /> - <test class="com.android.tradefed.testtype.AndroidJUnitTest" > - <option name="package" value="android.test.example.helloworld" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> - <option name="class" value="android.test.example.helloworld.HelloWorldTest" /> - <option name="method" value="testHalloWelt" /> - </test> -</configuration> diff --git a/core/tests/HdmiCec/OWNERS b/core/tests/HdmiCec/OWNERS deleted file mode 100644 index cc016f1cb565..000000000000 --- a/core/tests/HdmiCec/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -amyjojo@google.com -nchalko@google.com -shubang@google.com
\ No newline at end of file diff --git a/core/tests/HdmiCec/src/android/test/example/helloworld/HelloWorldTest.java b/core/tests/HdmiCec/src/android/test/example/helloworld/HelloWorldTest.java deleted file mode 100644 index 09321adfa2cb..000000000000 --- a/core/tests/HdmiCec/src/android/test/example/helloworld/HelloWorldTest.java +++ /dev/null @@ -1,66 +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 android.test.example.helloworld; - -import android.support.test.filters.SmallTest; -import android.util.Log; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -@RunWith(JUnit4.class) -public class HelloWorldTest { - private static final String TAG = HelloWorldTest.class.getSimpleName(); - - @BeforeClass - public static void beforeClass() { - Log.d(TAG, "beforeClass()"); - } - - @AfterClass - public static void afterClass() { - Log.d(TAG, "afterClass()"); - } - - @Before - public void before() { - Log.d(TAG, "before()"); - } - - @After - public void after() { - Log.d(TAG, "after()"); - } - - @Test - @SmallTest - public void testHelloWorld() { - Log.d(TAG, "testHelloWorld()"); - Assert.assertNotEquals("Hello", "world"); - } - - @Test - @SmallTest - public void testHalloWelt() { - Log.d(TAG, "testHalloWelt()"); - Assert.assertNotEquals("Hallo", "Welt"); - } -} |