From b525f089cf0f580ccb26e80bbb0db1376ba554cc Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 27 May 2011 17:09:06 -0700 Subject: [PATCH] Move bluetooth tests to their own package. Bug 4501764 Change-Id: Id65de5d96516720e75dfbb5d522f465187e73913 --- core/tests/bluetoothtests/Android.mk | 17 + core/tests/bluetoothtests/AndroidManifest.xml | 32 ++ .../bluetooth/BluetoothRebootStressTest.java | 0 .../bluetooth/BluetoothStressTest.java | 6 + .../bluetooth/BluetoothTestRunner.java | 0 .../android/bluetooth/BluetoothTestUtils.java | 0 core/tests/coretests/AndroidManifest.xml | 5 - .../src/android/bluetooth/AtParserTest.java | 348 ------------------ 8 files changed, 55 insertions(+), 353 deletions(-) create mode 100644 core/tests/bluetoothtests/Android.mk create mode 100644 core/tests/bluetoothtests/AndroidManifest.xml rename core/tests/{coretests => bluetoothtests}/src/android/bluetooth/BluetoothRebootStressTest.java (100%) rename core/tests/{coretests => bluetoothtests}/src/android/bluetooth/BluetoothStressTest.java (99%) rename core/tests/{coretests => bluetoothtests}/src/android/bluetooth/BluetoothTestRunner.java (100%) rename core/tests/{coretests => bluetoothtests}/src/android/bluetooth/BluetoothTestUtils.java (100%) delete mode 100644 core/tests/coretests/src/android/bluetooth/AtParserTest.java diff --git a/core/tests/bluetoothtests/Android.mk b/core/tests/bluetoothtests/Android.mk new file mode 100644 index 0000000000000..4a1d18cb5c054 --- /dev/null +++ b/core/tests/bluetoothtests/Android.mk @@ -0,0 +1,17 @@ +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)) diff --git a/core/tests/bluetoothtests/AndroidManifest.xml b/core/tests/bluetoothtests/AndroidManifest.xml new file mode 100644 index 0000000000000..96db035d3e443 --- /dev/null +++ b/core/tests/bluetoothtests/AndroidManifest.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothRebootStressTest.java b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothRebootStressTest.java similarity index 100% rename from core/tests/coretests/src/android/bluetooth/BluetoothRebootStressTest.java rename to core/tests/bluetoothtests/src/android/bluetooth/BluetoothRebootStressTest.java diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothStressTest.java similarity index 99% rename from core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java rename to core/tests/bluetoothtests/src/android/bluetooth/BluetoothStressTest.java index 7f13791a1ca68..abd7d9af224a8 100644 --- a/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java +++ b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothStressTest.java @@ -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); diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothTestRunner.java b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestRunner.java similarity index 100% rename from core/tests/coretests/src/android/bluetooth/BluetoothTestRunner.java rename to core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestRunner.java diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java similarity index 100% rename from core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java rename to core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index fadf1ec3961fd..6c9a68e648be5 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -1236,9 +1236,4 @@ - - - diff --git a/core/tests/coretests/src/android/bluetooth/AtParserTest.java b/core/tests/coretests/src/android/bluetooth/AtParserTest.java deleted file mode 100644 index c5aa52b07059a..0000000000000 --- a/core/tests/coretests/src/android/bluetooth/AtParserTest.java +++ /dev/null @@ -1,348 +0,0 @@ -/* - * Copyright (C) 2007 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.bluetooth; - -import android.bluetooth.AtCommandHandler; -import android.bluetooth.AtCommandResult; -import android.bluetooth.AtParser; - -import java.util.*; -import junit.framework.*; - -public class AtParserTest extends TestCase { - - /* An AtCommandHandler instrumented for testing purposes - */ - private class HandlerTest extends AtCommandHandler { - boolean mBasicCalled, mActionCalled, mReadCalled, mTestCalled, - mSetCalled; - int mBasicReturn, mActionReturn, mReadReturn, mTestReturn, mSetReturn; - Object[] mSetArgs; - String mBasicArgs; - - HandlerTest() { - this(AtCommandResult.ERROR, AtCommandResult.ERROR, - AtCommandResult.ERROR, AtCommandResult.ERROR, - AtCommandResult.ERROR); - } - - HandlerTest(int a, int b, int c, int d, int e) { - mBasicReturn = a; - mActionReturn = b; - mReadReturn = c; - mSetReturn = d; - mTestReturn = e; - reset(); - } - public void reset() { - mBasicCalled = false; - mActionCalled = false; - mReadCalled = false; - mSetCalled = false; - mTestCalled = false; - mSetArgs = null; - mBasicArgs = null; - } - public boolean wasCalled() { // helper - return mBasicCalled || mActionCalled || mReadCalled || - mTestCalled || mSetCalled; - } - @Override - public AtCommandResult handleBasicCommand(String args) { - mBasicCalled = true; - mBasicArgs = args; - return new AtCommandResult(mBasicReturn); - } - @Override - public AtCommandResult handleActionCommand() { - mActionCalled = true; - return new AtCommandResult(mActionReturn); - } - @Override - public AtCommandResult handleReadCommand() { - mReadCalled = true; - return new AtCommandResult(mReadReturn); - } - @Override - public AtCommandResult handleSetCommand(Object[] args) { - mSetCalled = true; - mSetArgs = args; - return new AtCommandResult(mSetReturn); - } - @Override - public AtCommandResult handleTestCommand() { - mTestCalled = true; - return new AtCommandResult(mTestReturn); - } - } - - private AtParser mParser; - - @Override - protected void setUp() throws Exception { - super.setUp(); - mParser = new AtParser(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - - - /* Test that the right method is being called - */ -/* public void testBasic1() throws Exception { - HandlerTest D = new HandlerTest(0, 1, 1, 1, 1); - HandlerTest A = new HandlerTest(0, 1, 1, 1, 1); - mParser.register('D', D); - mParser.register('A', A); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process(" A T D = ? T 1 2 3 4 ").toStrings())); - assertTrue(D.mBasicCalled); - assertFalse(D.mActionCalled); - assertFalse(D.mTestCalled); - assertFalse(D.mSetCalled); - assertFalse(D.mReadCalled); - assertFalse(A.wasCalled()); - assertEquals("=?T1234", D.mBasicArgs); - } -*/ - /* Test some crazy strings - *//* - public void testBasic2() throws Exception { - HandlerTest A = new HandlerTest(0, 1, 1, 1, 1); - mParser.register('A', A); - - assertTrue(Arrays.equals( - new String[]{}, - mParser.process(" ").toStrings())); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process(" a T a t \"\" 1 2 3 a 4 ") - .toStrings())); - assertEquals("T\"\"123A4", A.mBasicArgs); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process(" a T a t \"foo BaR12Z\" 1 2 3 a 4 ") - .toStrings())); - assertEquals("T\"foo BaR12Z\"123A4", A.mBasicArgs); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("ATA\"").toStrings())); - assertEquals("\"\"", A.mBasicArgs); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("ATA\"a").toStrings())); - assertEquals("\"a\"", A.mBasicArgs); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("ATa\" ").toStrings())); - assertEquals("\" \"", A.mBasicArgs); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("ATA \"one \" two \"t hr ee ") - .toStrings())); - assertEquals("\"one \"TWO\"t hr ee \"", A.mBasicArgs); - }*/ - - /* Simple extended commands - *//* - public void testExt1() throws Exception { - HandlerTest A = new HandlerTest(1, 0, 0, 0, 0); - mParser.register("+A", A); - - assertTrue(Arrays.equals( - new String[]{"ERROR"}, - mParser.process("AT+B").toStrings())); - assertFalse(A.wasCalled()); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+A").toStrings())); - assertTrue(A.mActionCalled); - A.mActionCalled = false; - assertFalse(A.wasCalled()); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+A=").toStrings())); - assertTrue(A.mSetCalled); - A.mSetCalled = false; - assertFalse(A.wasCalled()); - assertEquals(1, A.mSetArgs.length); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+A=?").toStrings())); - assertTrue(A.mTestCalled); - A.mTestCalled = false; - assertFalse(A.wasCalled()); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+A?").toStrings())); - assertTrue(A.mReadCalled); - A.mReadCalled = false; - assertFalse(A.wasCalled()); - A.reset(); - } -*/ - - - /* Test chained commands - *//* - public void testChain1() throws Exception { - HandlerTest A = new HandlerTest(0, 1, 1, 1, 1); - HandlerTest B = new HandlerTest(1, 0, 0, 0, 0); - HandlerTest C = new HandlerTest(1, 1, 1, 1, 1); - mParser.register('A', A); - mParser.register("+B", B); - mParser.register("+C", C); - - assertTrue(Arrays.equals( - new String[]{"ERROR"}, - mParser.process("AT+B;+C").toStrings())); - assertTrue(B.mActionCalled); - assertTrue(C.mActionCalled); - B.reset(); - C.reset(); - - assertTrue(Arrays.equals( - new String[]{"ERROR"}, - mParser.process("AT+C;+B").toStrings())); - assertFalse(B.wasCalled()); - assertTrue(C.mActionCalled); - B.reset(); - C.reset(); - }*/ - - /* Test Set command - *//* - public void testSet1() throws Exception { - HandlerTest A = new HandlerTest(1, 1, 1, 0, 1); - mParser.register("+AAAA", A); - Object[] expectedResult; - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=1").toStrings())); - expectedResult = new Object[]{(Integer)1}; - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=1,2,3").toStrings())); - expectedResult = new Object[]{(Integer)1, (Integer)2, (Integer)3}; - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=3,0,0,1").toStrings())); - expectedResult = new Object[]{(Integer)3, (Integer)0, (Integer)0, - (Integer)1}; - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=\"foo\",1,\"b,ar").toStrings())); - expectedResult = new Object[]{"\"foo\"", 1, "\"b,ar\""}; - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=").toStrings())); - expectedResult = new Object[]{""}; - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=,").toStrings())); - expectedResult = new Object[]{"", ""}; - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=,,,").toStrings())); - expectedResult = new Object[]{"", "", "", ""}; - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("AT+AAAA=,1,,\"foo\",").toStrings())); - expectedResult = new Object[]{"", 1, "", "\"foo\"", ""}; - assertEquals(5, A.mSetArgs.length); - assertTrue(Arrays.equals(expectedResult, A.mSetArgs)); - A.reset(); - }*/ - - /* Test repeat command "A/" - *//* - public void testRepeat() throws Exception { - HandlerTest A = new HandlerTest(0, 0, 0, 0, 0); - mParser.register('A', A); - - // Try repeated command on fresh parser - assertTrue(Arrays.equals( - new String[]{}, - mParser.process("A/").toStrings())); - assertFalse(A.wasCalled()); - A.reset(); - - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("ATA").toStrings())); - assertTrue(A.mBasicCalled); - assertEquals("", A.mBasicArgs); - A.reset(); - - // Now repeat the command - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("A/").toStrings())); - assertTrue(A.mBasicCalled); - assertEquals("", A.mBasicArgs); - A.reset(); - - // Multiple repeats - assertTrue(Arrays.equals( - new String[]{"OK"}, - mParser.process("A/").toStrings())); - assertTrue(A.mBasicCalled); - assertEquals("", A.mBasicArgs); - A.reset(); - - }*/ -}