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