From 5d6712c7e1f0e6a955e68e53961e5cc9fb33db36 Mon Sep 17 00:00:00 2001 From: Keun Soo Yim Date: Fri, 3 Feb 2017 13:50:29 -0800 Subject: [PATCH] move VTS stub files and non-functional tests (aosp) Test: mma Bug: 34976004 Merged-In: Id9c88a9778fba49f0841a474aa067d271f14e207 Change-Id: Id9c88a9778fba49f0841a474aa067d271f14e207 --- bluetooth/1.0/vts/Android.mk | 19 --- .../testcases/hal/bluetooth/hidl/Android.mk | 19 --- .../hal/bluetooth/hidl/target/Android.mk | 23 ---- .../hal/bluetooth/hidl/target/AndroidTest.xml | 29 ----- .../hidl/target_profiling/Android.mk | 23 ---- .../hidl/target_profiling/AndroidTest.xml | 30 ----- ir/1.0/vts/Android.mk | 19 --- .../testcases/hal/ir/hidl/target/Android.mk | 23 ---- .../hal/ir/hidl/target/AndroidTest.xml | 31 ----- nfc/1.0/vts/functional/Android.mk | 19 --- nfc/1.0/vts/functional/vts/Android.mk | 19 --- .../vts/functional/vts/testcases/Android.mk | 19 --- .../functional/vts/testcases/hal/Android.mk | 19 --- .../vts/testcases/hal/nfc/Android.mk | 19 --- .../vts/testcases/hal/nfc/__init__.py | 0 .../vts/testcases/hal/nfc/hidl/Android.mk | 19 --- .../vts/testcases/hal/nfc/hidl/__init__.py | 0 .../testcases/hal/nfc/hidl/host/Android.mk | 19 --- .../hal/nfc/hidl/host/NfcHidlBasicTest.py | 110 ------------------ .../testcases/hal/nfc/hidl/host/__init__.py | 0 .../hal/nfc/hidl/host/binderize/Android.mk | 23 ---- .../nfc/hidl/host/binderize/AndroidTest.xml | 30 ----- .../NfcHidlBinderizeBasicTest.config | 3 - .../hal/nfc/hidl/host/binderize/__init__.py | 0 .../hal/nfc/hidl/host/passthrough/Android.mk | 23 ---- .../nfc/hidl/host/passthrough/AndroidTest.xml | 30 ----- .../NfcHidlPassthroughBasicTest.config | 3 - .../testcases/hal/nfc/hidl/target/Android.mk | 25 ---- .../hal/nfc/hidl/target/AndroidTest.xml | 30 ----- .../hal/nfc/hidl/target_profiling/Android.mk | 23 ---- .../nfc/hidl/target_profiling/AndroidTest.xml | 31 ----- wifi/1.0/vts/Android.mk | 20 ---- wifi/1.0/vts/functional/Android.mk | 19 --- .../vts/testcases/hal/wifi/__init__.py | 0 .../vts/testcases/hal/wifi/hidl/Android.mk | 19 --- .../vts/testcases/hal/wifi/hidl/__init__.py | 0 .../testcases/hal/wifi/hidl/target/Android.mk | 23 ---- .../hal/wifi/hidl/target/AndroidTest.xml | 30 ----- 38 files changed, 791 deletions(-) delete mode 100644 bluetooth/1.0/vts/Android.mk delete mode 100644 bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/Android.mk delete mode 100644 bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/Android.mk delete mode 100644 bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/AndroidTest.xml delete mode 100644 bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/Android.mk delete mode 100644 bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/AndroidTest.xml delete mode 100644 ir/1.0/vts/Android.mk delete mode 100644 ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/Android.mk delete mode 100644 ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/AndroidTest.xml delete mode 100644 nfc/1.0/vts/functional/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml delete mode 100644 wifi/1.0/vts/Android.mk delete mode 100644 wifi/1.0/vts/functional/Android.mk delete mode 100644 wifi/1.0/vts/functional/vts/testcases/hal/wifi/__init__.py delete mode 100644 wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/Android.mk delete mode 100644 wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/__init__.py delete mode 100644 wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/Android.mk delete mode 100644 wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/AndroidTest.xml diff --git a/bluetooth/1.0/vts/Android.mk b/bluetooth/1.0/vts/Android.mk deleted file mode 100644 index 85e0c3803f..0000000000 --- a/bluetooth/1.0/vts/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(LOCAL_PATH)/functional/vts/testcases/hal/bluetooth/hidl/Android.mk diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/Android.mk b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/Android.mk b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/Android.mk deleted file mode 100644 index 98bb686cf2..0000000000 --- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2016 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) - -LOCAL_MODULE := HalBluetoothHidlTargetBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/bluetooth/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/AndroidTest.xml b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/AndroidTest.xml deleted file mode 100644 index 54fb89b442..0000000000 --- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/Android.mk b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/Android.mk deleted file mode 100644 index 81a2db9f56..0000000000 --- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -## Copyright (C) 2016 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) - -LOCAL_MODULE := BluetoothHidlTargetProfilingTest -VTS_CONFIG_SRC_DIR := testcases/hal/bluetooth/hidl/target_profiling -include test/vts/tools/build/Android.host_config.mk diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/AndroidTest.xml b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/AndroidTest.xml deleted file mode 100644 index 8052b3c756..0000000000 --- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/ir/1.0/vts/Android.mk b/ir/1.0/vts/Android.mk deleted file mode 100644 index 90c50c899d..0000000000 --- a/ir/1.0/vts/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(LOCAL_PATH)/functional/vts/testcases/hal/ir/hidl/target/Android.mk diff --git a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/Android.mk b/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/Android.mk deleted file mode 100644 index a69fd0827c..0000000000 --- a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2016 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) - -LOCAL_MODULE := HalIrHidlTargetTest -VTS_CONFIG_SRC_DIR := testcases/hal/ir/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/AndroidTest.xml b/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/AndroidTest.xml deleted file mode 100644 index bf3d2369a2..0000000000 --- a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/nfc/1.0/vts/functional/Android.mk b/nfc/1.0/vts/functional/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/Android.mk b/nfc/1.0/vts/functional/vts/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/Android.mk b/nfc/1.0/vts/functional/vts/testcases/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py deleted file mode 100644 index cb4093137b..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/env python3.4 -# -# Copyright (C) 2016 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. -# - -import logging -import time - -from vts.runners.host import asserts -from vts.runners.host import base_test_with_webdb -from vts.runners.host import test_runner -from vts.utils.python.controllers import android_device -from vts.utils.python.coverage import coverage_utils - -PASSTHROUGH_MODE_KEY = "passthrough_mode" - - -class NfcHidlBasicTest(base_test_with_webdb.BaseTestWithWebDbClass): - """A simple testcase for the NFC HIDL HAL.""" - - def setUpClass(self): - """Creates a mirror and turns on the framework-layer NFC service.""" - self.dut = self.registerController(android_device)[0] - - self.getUserParams(opt_param_names=[PASSTHROUGH_MODE_KEY]) - - self.dut.shell.InvokeTerminal("one") - self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode - self.dut.shell.one.Execute("svc nfc disable") # Turn off - time.sleep(5) - - if getattr(self, PASSTHROUGH_MODE_KEY, True): - self.dut.shell.one.Execute( - "setprop vts.hal.vts.hidl.get_stub true") - else: - self.dut.shell.one.Execute( - "setprop vts.hal.vts.hidl.get_stub false") - - self.dut.hal.InitHidlHal( - target_type="nfc", - target_basepaths=self.dut.libPaths, - target_version=1.0, - target_package="android.hardware.nfc", - target_component_name="INfc", - bits=64 if self.dut.is64Bit else 32) - - def tearDownClass(self): - """Turns off the framework-layer NFC service.""" - # Ideally, we would want to store the nfc service's state before - # turning that off in setUpClass and restore the original state. - self.dut.shell.one.Execute("svc nfc disable") # make sure it's off - - def testBase(self): - """A simple test case which just calls each registered function.""" - # TODO: extend to make realistic testcases - # For example, call after CORE_INIT_RSP is received. - # result = self.dut.hal.nfc.coreInitialized([1]) - # logging.info("coreInitialized result: %s", result) - - def send_event(NfcEvent, NfcStatus): - logging.info("callback send_event") - logging.info("arg0 %s", NfcEvent) - logging.info("arg1 %s", NfcStatus) - - def send_data(NfcData): - logging.info("callback send_data") - logging.info("arg0 %s", NfcData) - - client_callback = self.dut.hal.nfc.GetHidlCallbackInterface( - "INfcClientCallback", - sendEvent=send_event, - sendData=send_data) - - result = self.dut.hal.nfc.open(client_callback) - logging.info("open result: %s", result) - - result = self.dut.hal.nfc.prediscover() - logging.info("prediscover result: %s", result) - - result = self.dut.hal.nfc.controlGranted() - logging.info("controlGranted result: %s", result) - - result = self.dut.hal.nfc.powerCycle() - logging.info("powerCycle result: %s", result) - - nfc_types = self.dut.hal.nfc.GetHidlTypeInterface("types") - logging.info("nfc_types: %s", nfc_types) - - result = self.dut.hal.nfc.write([0, 1, 2, 3, 4, 5]) - logging.info("write result: %s", result) - - result = self.dut.hal.nfc.close() - logging.info("close result: %s", result) - - self.SetCoverageData(coverage_utils.GetGcdaDict(self.dut)) - -if __name__ == "__main__": - test_runner.main() diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk deleted file mode 100644 index cd58d323a2..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2016 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) - -LOCAL_MODULE := NfcHidlBinderizeBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/host/binderize -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml deleted file mode 100644 index 9671977683..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config deleted file mode 100644 index 5a94c6fa42..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config +++ /dev/null @@ -1,3 +0,0 @@ -{ - "passthrough_mode": False -} diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk deleted file mode 100644 index e274107d43..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2016 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) - -LOCAL_MODULE := NfcHidlPassthroughBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/host/passthrough -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml deleted file mode 100644 index 2f5fdfac8b..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config deleted file mode 100644 index 9173e1960e..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config +++ /dev/null @@ -1,3 +0,0 @@ -{ - "passthrough_mode": true -} diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk deleted file mode 100644 index da9b6af8e4..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := HalNfcHidlTargetBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml deleted file mode 100644 index 9576183e26..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk deleted file mode 100644 index c7bf8533fe..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -## Copyright (C) 2016 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) - -LOCAL_MODULE := NfcHidlTargetProfilingTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/target_profiling -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml deleted file mode 100644 index 3b570f984e..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/wifi/1.0/vts/Android.mk b/wifi/1.0/vts/Android.mk deleted file mode 100644 index d3471363c1..0000000000 --- a/wifi/1.0/vts/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (C) 2016 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 hidl test makefiles -include $(LOCAL_PATH)/functional/vts/testcases/hal/wifi/hidl/Android.mk diff --git a/wifi/1.0/vts/functional/Android.mk b/wifi/1.0/vts/functional/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/wifi/1.0/vts/functional/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/__init__.py b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/Android.mk b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2016 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 $(call all-subdir-makefiles) diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/__init__.py b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/Android.mk b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/Android.mk deleted file mode 100644 index 40f154efcd..0000000000 --- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2016 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) - -LOCAL_MODULE := HalWifiHidlTargetTest -VTS_CONFIG_SRC_DIR := testcases/hal/wifi/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/AndroidTest.xml b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/AndroidTest.xml deleted file mode 100644 index 1099a5a6e7..0000000000 --- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - -