Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e51b81 authored by Brett Chabot's avatar Brett Chabot Committed by Android (Google) Code Review
Browse files

Merge "Move bluetooth tests to their own package."

parents ca680af2 b525f089

core/tests/bluetoothtests/Android.mk

0 → 100644
+17 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests



# Include all test java files.

LOCAL_SRC_FILES := \

	$(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_PACKAGE_NAME := BluetoothTests

LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)



include $(call all-makefiles-under,$(LOCAL_PATH))

core/tests/bluetoothtests/AndroidManifest.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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="com.android.bluetooth.tests" >



    <uses-permission android:name="android.permission.BLUETOOTH" />

    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />



    <application >

        <uses-library android:name="android.test.runner" />

    </application>

    <instrumentation android:name="android.bluetooth.BluetoothTestRunner"

            android:targetPackage="com.android.bluetooth.tests"

            android:label="Bluetooth Tests" />



</manifest>

core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java→core/tests/bluetoothtests/src/android/bluetooth/BluetoothStressTest.java

+6 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ public class BluetoothStressTest extends InstrumentationTestCase { 
     */

    public void testEnablePan() {

        int iterations = BluetoothTestRunner.sEnablePanIterations;

        if (iterations == 0) {

            return;

        }

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        mTestUtils.disable(adapter);

        mTestUtils.enable(adapter);
@@ -170,6 +173,9 @@ public class BluetoothStressTest extends InstrumentationTestCase { 
     */

    public void testAcceptPair() {

        int iterations = BluetoothTestRunner.sPairIterations;

        if (iterations == 0) {

            return;

        }

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        BluetoothDevice device = adapter.getRemoteDevice(BluetoothTestRunner.sDeviceAddress);

        mTestUtils.disable(adapter);