summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJake Hamby <jhamby@google.com>2011-02-07 18:21:25 -0800
committerJake Hamby <jhamby@google.com>2011-03-01 18:44:36 -0800
commit436b29e68e6608bed9e8e7d54385b8f62d89208e (patch)
tree60696619f093e2a9f8c9161804029b35d078a9bd /tests
parent2adae4e274c00f0b05b405d60b8def23d9b28469 (diff)
downloadpackages_apps_settings-436b29e68e6608bed9e8e7d54385b8f62d89208e.zip
packages_apps_settings-436b29e68e6608bed9e8e7d54385b8f62d89208e.tar.gz
packages_apps_settings-436b29e68e6608bed9e8e7d54385b8f62d89208e.tar.bz2
Refactor Bluetooth settings for readability and performance.
Major refactoring of Bluetooth settings classes. - Moved all functionality from LocalBluetoothManager into new LocalBluetoothAdapter and LocalBluetoothPreferences, and into existing classes. - Refactored functionality from BluetoothEventRedirector into new BluetoothEventManager class, deleting the original version. New version uses a HashMap from action Strings to implementers of the BluetoothEventManager.Handler interface. - Created new BluetoothDiscoveryReceiver to update shared preferences timestamp for Bluetooth discovery start/finish. This is the only event handling we need to do when the settings app is not visible, so it has its own receiver entry in AndroidManifest.xml. Edits are written using QueuedWork.singleThreadExecutor(), which BroadcastReceiver knows about and will wait for completion, eliminating the need for PendingResult. - Miscellaneous cleanups to code style and logic for readability. - Pulled some large switch statement code blocks into new methods. - Changed all Bluetooth state references to the new BluetoothProfile constants. - Changed use of deprecated Notification constructor in BluetoothPairingRequest to use Notification.Builder. - Moved Utf8ByteLengthFilter helper function from BluetoothNamePreference into its own class, and moved test cases into the same package. - Moved all LocalBluetoothProfileManager functionality related to specific profiles into new top-level classes (A2dpProfile, etc.), all implementing the LocalBluetoothProfile interface. - Moved all UI-related methods from CachedBluetoothDevice into the class that uses the method, or into the static Utils class for shared methods. Change-Id: I6d49b7f4ae0c7d7dcf62551ee40b51ecb5fe4f47
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/settings/SettingsHookTests.java6
-rw-r--r--tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java (renamed from tests/src/com/android/settings/tests/Utf8ByteLengthFilterTest.java)10
2 files changed, 9 insertions, 7 deletions
diff --git a/tests/src/com/android/settings/SettingsHookTests.java b/tests/src/com/android/settings/SettingsHookTests.java
index 5b2ac10..ec438cb 100644
--- a/tests/src/com/android/settings/SettingsHookTests.java
+++ b/tests/src/com/android/settings/SettingsHookTests.java
@@ -93,7 +93,7 @@ public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings
result = true;
}
}
- assertTrue("Intent-filer not found", result);
+ assertTrue("Intent-filter not found", result);
}
/**
@@ -111,7 +111,7 @@ public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings
result = true;
}
}
- assertTrue("Intent-filer not found", result);
+ assertTrue("Intent-filter not found", result);
}
/**
@@ -119,6 +119,7 @@ public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings
* application.
*/
public void testOperatorPreferenceAvailable() {
+// TODO: fix this test case to work with fragments
// PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
// Preference operatorPreference = root.findPreference(KEY_SETTINGS_OPERATOR);
// assertNotNull(operatorPreference);
@@ -129,6 +130,7 @@ public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings
* application.
*/
public void testManufacturerPreferenceAvailable() {
+// TODO: fix this test case to work with fragments
// PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
// Preference manufacturerHook = root.findPreference(KEY_SETTINGS_MANUFACTURER);
// assertNotNull(manufacturerHook);
diff --git a/tests/src/com/android/settings/tests/Utf8ByteLengthFilterTest.java b/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
index c03f9c0..0ed7812 100644
--- a/tests/src/com/android/settings/tests/Utf8ByteLengthFilterTest.java
+++ b/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-package com.android.settings.tests;
+package com.android.settings.bluetooth;
import android.test.AndroidTestCase;
import android.text.InputFilter;
import android.text.SpannableStringBuilder;
-import com.android.settings.bluetooth.BluetoothNamePreference;
+import com.android.settings.bluetooth.Utf8ByteLengthFilter;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-@TestTargetClass(BluetoothNamePreference.Utf8ByteLengthFilter.class)
+@TestTargetClass(Utf8ByteLengthFilter.class)
public class Utf8ByteLengthFilterTest extends AndroidTestCase {
@TestTargets({
@@ -39,7 +39,7 @@ public class Utf8ByteLengthFilterTest extends AndroidTestCase {
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "BluetoothNamePreference.Utf8ByteLengthFilter",
+ method = "Utf8ByteLengthFilter",
args = {int.class}
)
})
@@ -48,7 +48,7 @@ public class Utf8ByteLengthFilterTest extends AndroidTestCase {
CharSequence source;
SpannableStringBuilder dest;
// Constructor to create a LengthFilter
- BluetoothNamePreference.Utf8ByteLengthFilter lengthFilter = new BluetoothNamePreference.Utf8ByteLengthFilter(10);
+ InputFilter lengthFilter = new Utf8ByteLengthFilter(10);
InputFilter[] filters = {lengthFilter};
// filter() implicitly invoked. If the total length > filter length, the filter will