Merge change 7787 into donut
* changes:
Integrate unsubmitted cupcake change 131603: CTS: add test cases for media.FaceDetector, MediaScannerConnection and SoundPool
diff --git a/tests/src/android/content/cts/MockSRSProvider.java b/tests/src/android/content/cts/MockSRSProvider.java
new file mode 100644
index 0000000..a6c28e9
--- /dev/null
+++ b/tests/src/android/content/cts/MockSRSProvider.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2009 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.content.cts;
+
+import android.content.SearchRecentSuggestionsProvider;
+
+public class MockSRSProvider extends SearchRecentSuggestionsProvider {
+ final static String AUTHORITY = "android.content.cts.MockSRSProvider";
+ final static int MODE = DATABASE_MODE_QUERIES + DATABASE_MODE_2LINES;
+
+ public static boolean setupSuggestCalled;
+ private boolean mOnCreateCalled;
+
+ public MockSRSProvider() {
+ super();
+ setupSuggestions(AUTHORITY, MODE);
+ }
+
+ public MockSRSProvider(String tag) {
+ super();
+ }
+
+ @Override
+ public void setupSuggestions(String authority, int mode) {
+ setupSuggestCalled = true;
+ super.setupSuggestions(authority, mode);
+ }
+
+ @Override
+ public boolean onCreate() {
+ mOnCreateCalled = true;
+ return super.onCreate();
+ }
+
+ public boolean isOnCreateCalled() {
+ return mOnCreateCalled;
+ }
+}
diff --git a/tests/tests/content/src/android/content/cts/SearchRecentSuggestionsProviderTest.java b/tests/tests/content/src/android/content/cts/SearchRecentSuggestionsProviderTest.java
new file mode 100644
index 0000000..b152990
--- /dev/null
+++ b/tests/tests/content/src/android/content/cts/SearchRecentSuggestionsProviderTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2009 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.content.cts;
+
+import android.app.SearchManager;
+import android.content.ContentValues;
+import android.content.SearchRecentSuggestionsProvider;
+import android.database.Cursor;
+import android.net.Uri;
+import android.test.AndroidTestCase;
+import android.test.IsolatedContext;
+import android.test.RenamingDelegatingContext;
+import android.test.mock.MockContentResolver;
+import android.test.mock.MockContext;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
+@TestTargetClass(SearchRecentSuggestionsProvider.class)
+public class SearchRecentSuggestionsProviderTest extends AndroidTestCase {
+ private final static String AUTHORITY_HEAD = "content://" + MockSRSProvider.AUTHORITY;
+ private final static Uri TEST_URI = Uri.parse(AUTHORITY_HEAD + "/suggestions");
+
+ private IsolatedContext mProviderContext;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ final String filenamePrefix = "test.";
+ final RenamingDelegatingContext targetContextWrapper = new RenamingDelegatingContext(
+ new MockContext(), getContext(), filenamePrefix);
+ mProviderContext = new IsolatedContext(new MockContentResolver(), targetContextWrapper);
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "SearchRecentSuggestionsProvider",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setupSuggestions",
+ args = {String.class, int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "onCreate",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getType",
+ args = {Uri.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "update",
+ args = {Uri.class, ContentValues.class, String.class, String[].class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "query",
+ args = {Uri.class, String[].class, String.class, String[].class, String.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "insert",
+ args = {Uri.class, ContentValues.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "delete",
+ args = {Uri.class, String.class, String[].class}
+ )
+ })
+ public void testSearchRecentSuggestionsProvider() {
+ assertFalse(MockSRSProvider.setupSuggestCalled);
+ final MockSRSProvider s = new MockSRSProvider();
+ assertTrue(MockSRSProvider.setupSuggestCalled);
+
+ assertFalse(s.isOnCreateCalled());
+ s.attachInfo(mProviderContext, null);
+ assertTrue(s.isOnCreateCalled());
+
+ assertNotNull(s.getType(TEST_URI));
+
+ final String uriStr = AUTHORITY_HEAD + '/' + SearchManager.SUGGEST_URI_PATH_QUERY;
+ final Uri contentUri = Uri.parse(uriStr);
+ String[] selArgs = new String[] { null };
+
+ Cursor c = s.query(contentUri, null, null, selArgs, null);
+ assertEquals(0, c.getCount());
+
+ s.insert(TEST_URI, new ContentValues());
+ c = s.query(contentUri, null, null, selArgs, null);
+ assertEquals(1, c.getCount());
+
+ s.insert(TEST_URI, new ContentValues());
+ c = s.query(contentUri, null, null, selArgs, null);
+ assertEquals(2, c.getCount());
+
+ s.delete(TEST_URI, null, null);
+ c = s.query(contentUri, null, null, selArgs, null);
+ assertEquals(0, c.getCount());
+
+ try {
+ s.update(TEST_URI, null, null, null);
+ fail("testUpdate failed");
+ } catch (UnsupportedOperationException e) {
+ // expected
+ }
+ }
+}
diff --git a/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java b/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java
index 393e7d1..7aad01d 100644
--- a/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java
+++ b/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java
@@ -31,7 +31,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test charAt(int off)",
method = "charAt",
args = {int.class}
)
@@ -64,7 +63,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getChars(int start, int end, char[] dest, int off)",
method = "getChars",
args = {int.class, int.class, char[].class, int.class}
)
@@ -102,7 +100,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test length()",
method = "length",
args = {}
)
@@ -119,7 +116,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test make method",
method = "make",
args = {java.lang.CharSequence.class, char[].class, int.class, int.class}
)
@@ -143,7 +139,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test subSequence(int start, int end)",
method = "subSequence",
args = {int.class, int.class}
)
@@ -165,7 +160,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test toString()",
method = "toString",
args = {}
)
diff --git a/tests/tests/text/src/android/text/cts/AnnotationTest.java b/tests/tests/text/src/android/text/cts/AnnotationTest.java
index 4521963..2e412b3 100644
--- a/tests/tests/text/src/android/text/cts/AnnotationTest.java
+++ b/tests/tests/text/src/android/text/cts/AnnotationTest.java
@@ -43,7 +43,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor",
method = "Annotation",
args = {java.lang.String.class, java.lang.String.class}
)
@@ -54,7 +53,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getValue()",
method = "getValue",
args = {}
)
@@ -68,7 +66,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getKey()",
method = "getKey",
args = {}
)
@@ -82,7 +79,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getSpanTypeId()",
method = "getSpanTypeId",
args = {}
)
@@ -95,15 +91,18 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test writeToParcel",
method = "writeToParcel",
args = {Parcel.class, int.class}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor create from parcel",
method = "Annotation",
args = {Parcel.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "describeContents",
+ args = {}
)
})
public void testWriteToParcel() {
@@ -114,5 +113,7 @@
Annotation out = new Annotation(dest);
assertEquals(out.getKey(), mAnnotation.getKey());
assertEquals(out.getValue(), mAnnotation.getValue());
+
+ assertEquals(0, out.describeContents());
}
}
diff --git a/tests/tests/text/src/android/text/cts/AutoTextTest.java b/tests/tests/text/src/android/text/cts/AutoTextTest.java
index dbc8618..3ab301d 100644
--- a/tests/tests/text/src/android/text/cts/AutoTextTest.java
+++ b/tests/tests/text/src/android/text/cts/AutoTextTest.java
@@ -29,8 +29,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test {@link AutoText#get(CharSequence, int, int, View)}"
- + ".It simply get a word value according to the word key.",
method = "get",
args = {java.lang.CharSequence.class, int.class, int.class, android.view.View.class}
)
@@ -79,5 +77,17 @@
assertNotNull(actual);
assertEquals("can", actual);
}
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getSize",
+ args = {android.view.View.class}
+ )
+ public void testGetSize() {
+ Locale.setDefault(Locale.ENGLISH);
+ View view = new View(getContext());
+ // Returns the size of the auto text dictionary. Just make sure it is bigger than 0.
+ assertTrue(AutoText.getSize(view) > 0);
+ }
}
diff --git a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
index e0aac11..01da716 100644
--- a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
@@ -65,7 +65,6 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor",
method = "BoringLayout",
args = {java.lang.CharSequence.class, android.text.TextPaint.class, int.class,
android.text.Layout.Alignment.class, float.class, float.class,
@@ -73,7 +72,6 @@
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor",
method = "BoringLayout",
args = {java.lang.CharSequence.class, android.text.TextPaint.class, int.class,
android.text.Layout.Alignment.class, float.class, float.class,
@@ -82,7 +80,7 @@
)
})
public void testConstructors() {
- BoringLayout boringLayout = new BoringLayout(DEFAULT_CHAR_SEQUENCE,
+ new BoringLayout(DEFAULT_CHAR_SEQUENCE,
DEFAULT_PAINT,
DEFAULT_OUTER_WIDTH,
DEFAULT_ALIGN,
@@ -90,7 +88,8 @@
SPACING_ADD_NO_SCALE,
DEFAULT_METRICS,
true);
- boringLayout = new BoringLayout(DEFAULT_CHAR_SEQUENCE,
+
+ new BoringLayout(DEFAULT_CHAR_SEQUENCE,
DEFAULT_PAINT,
DEFAULT_OUTER_WIDTH,
DEFAULT_ALIGN,
@@ -385,13 +384,11 @@
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getBottomPadding",
method = "getBottomPadding",
args = {}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getLineDescent",
method = "getLineDescent",
args = {int.class}
)
@@ -432,7 +429,6 @@
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test isBoring",
method = "isBoring",
args = {java.lang.CharSequence.class, android.text.TextPaint.class,
android.text.BoringLayout.Metrics.class}
@@ -456,7 +452,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getLineDirections(int line)",
method = "getLineDirections",
args = {int.class}
)
@@ -468,7 +463,6 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test make",
method = "make",
args = {java.lang.CharSequence.class, android.text.TextPaint.class, int.class,
android.text.Layout.Alignment.class, float.class, float.class,
@@ -476,7 +470,6 @@
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test make",
method = "make",
args = {java.lang.CharSequence.class, android.text.TextPaint.class, int.class,
android.text.Layout.Alignment.class, float.class, float.class,
@@ -511,7 +504,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test draw",
method = "draw",
args = {android.graphics.Canvas.class, android.graphics.Path.class,
android.graphics.Paint.class, int.class}
diff --git a/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java b/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java
index 62cb162..acb723f 100644
--- a/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java
+++ b/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java
@@ -29,13 +29,11 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test toString()",
method = "toString",
args = {}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor",
method = "BoringLayout.Metrics",
args = {}
)
diff --git a/tests/tests/text/src/android/text/cts/ClipboardManagerTest.java b/tests/tests/text/src/android/text/cts/ClipboardManagerTest.java
new file mode 100644
index 0000000..336f0ce
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/ClipboardManagerTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2008 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.text.cts;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
+import android.content.Context;
+import android.test.AndroidTestCase;
+import android.text.ClipboardManager;
+
+/**
+ * Test {@link ClipboardManager}.
+ */
+@TestTargetClass(ClipboardManager.class)
+public class ClipboardManagerTest extends AndroidTestCase {
+ private ClipboardManager mClipboardManager;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mClipboardManager = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setText",
+ args = {CharSequence.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getText",
+ args = {}
+ )
+ })
+ public void testAccessText() {
+ // set the expected value
+ CharSequence expected = "test";
+ mClipboardManager.setText(expected);
+ assertEquals(expected, mClipboardManager.getText());
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "hasText",
+ args = {}
+ )
+ public void testHasText() {
+ mClipboardManager.setText("");
+ assertFalse(mClipboardManager.hasText());
+
+ mClipboardManager.setText("test");
+ assertTrue(mClipboardManager.hasText());
+
+ mClipboardManager.setText(null);
+ assertFalse(mClipboardManager.hasText());
+ }
+}
diff --git a/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java b/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
index bb6e020..3e73150 100644
--- a/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
+++ b/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
@@ -20,10 +20,9 @@
import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.Editable.Factory;
-import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
@TestTargetClass(Editable.Factory.class)
public class Editable_FactoryTest extends AndroidTestCase {
diff --git a/tests/tests/text/src/android/text/cts/HtmlTest.java b/tests/tests/text/src/android/text/cts/HtmlTest.java
index e8fed3c..7f86914 100644
--- a/tests/tests/text/src/android/text/cts/HtmlTest.java
+++ b/tests/tests/text/src/android/text/cts/HtmlTest.java
@@ -45,13 +45,11 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class}
),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class, ImageGetter.class, TagHandler.class}
)
@@ -81,13 +79,11 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class}
),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class, ImageGetter.class, TagHandler.class}
)
@@ -113,13 +109,11 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class}
),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class, ImageGetter.class, TagHandler.class}
)
@@ -137,13 +131,11 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class}
),
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: fromHtml",
method = "fromHtml",
args = {String.class, ImageGetter.class, TagHandler.class}
)
@@ -173,7 +165,6 @@
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: toHtml",
method = "toHtml",
args = {Spanned.class}
)
@@ -193,7 +184,6 @@
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: toHtml",
method = "toHtml",
args = {Spanned.class}
)
@@ -213,7 +203,6 @@
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: toHtml",
method = "toHtml",
args = {Spanned.class}
)
@@ -230,7 +219,6 @@
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: toHtml",
method = "toHtml",
args = {Spanned.class}
)
@@ -281,7 +269,6 @@
@TestTargetNew(
level = TestLevel.PARTIAL_COMPLETE,
- notes = "Test method: toHtml",
method = "toHtml",
args = {Spanned.class}
)
diff --git a/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java b/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java
index 60660ce..df77e60 100644
--- a/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java
+++ b/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java
@@ -31,14 +31,12 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test filter",
method = "filter",
args = {java.lang.CharSequence.class, int.class, int.class, android.text.Spanned.class,
int.class, int.class}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor",
method = "InputFilter.LengthFilter",
args = {int.class}
)
diff --git a/tests/tests/text/src/android/text/cts/LoginFilterTest.java b/tests/tests/text/src/android/text/cts/LoginFilterTest.java
index d5028d9..b436ec7 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilterTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilterTest.java
@@ -21,14 +21,14 @@
import android.text.SpannableString;
import android.text.Spanned;
import android.text.SpannedString;
-import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
import dalvik.annotation.ToBeFixed;
@TestTargetClass(LoginFilter.class)
public class LoginFilterTest extends TestCase {
+
@ToBeFixed(bug="1448885", explanation="LoginFilter is an abstract class and its" +
" constructors are all package private, we can not extends it directly" +
" to test. So, we try to extends its subclass UsernameFilterGeneric to test")
@@ -40,7 +40,7 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "filter",
- args = {java.lang.CharSequence.class, int.class, int.class, android.text.Spanned.class,
+ args = {java.lang.CharSequence.class, int.class, int.class, android.text.Spanned.class,
int.class, int.class}
)
@ToBeFixed(bug="1417734", explanation="should add @throws clause into javadoc " +
@@ -135,37 +135,37 @@
loginFilter.filter(source1, 0, source1.length(), dest1, dest1.length(), 0);
}
+ // This method does nothing. we only test onInvalidCharacter function here,
+ // the callback should be tested in testFilter()
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "onInvalidCharacter",
args = {char.class}
)
- // This method does nothing. we only test onInvalidCharacter function here,
- // the callback should be tested in testFilter()
public void testOnInvalidCharacter() {
LoginFilter loginFilter = new MockLoginFilter();
loginFilter.onInvalidCharacter('a');
}
+ // This method does nothing. we only test onStop function here,
+ // the callback should be tested in testFilter()
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "onStop",
args = {}
)
- // This method does nothing. we only test onStop function here,
- // the callback should be tested in testFilter()
public void testOnStop() {
LoginFilter loginFilter = new MockLoginFilter();
loginFilter.onStop();
}
+ // This method does nothing. we only test onStart function here,
+ // the callback should be tested in testFilter()
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "onStart",
args = {}
)
- // This method does nothing. we only test onStart function here,
- // the callback should be tested in testFilter()
public void testOnStart() {
LoginFilter loginFilter = new LoginFilter.UsernameFilterGeneric();
loginFilter.onStart();
diff --git a/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java b/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java
index 59fed16..fa4ed6e 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java
@@ -28,16 +28,15 @@
@TestTargetClass(PasswordFilterGMail.class)
public class LoginFilter_PasswordFilterGMailTest extends TestCase {
- @TestTargets({
+
+@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor(s) of PasswordFilterGMail.",
method = "LoginFilter.PasswordFilterGMail",
args = {}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor(s) of PasswordFilterGMail.",
method = "LoginFilter.PasswordFilterGMail",
args = {boolean.class}
)
@@ -51,7 +50,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test isAllowed(char c).",
method = "isAllowed",
args = {char.class}
)
diff --git a/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java b/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java
index d57f969..2421855 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java
@@ -28,16 +28,15 @@
@TestTargetClass(UsernameFilterGeneric.class)
public class LoginFilter_UsernameFilterGenericTest extends TestCase {
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor(s) of UsernameFilterGeneric.",
method = "LoginFilter.UsernameFilterGeneric",
args = {}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor(s) of UsernameFilterGeneric.",
method = "LoginFilter.UsernameFilterGeneric",
args = {boolean.class}
)
diff --git a/tests/tests/text/src/android/text/cts/SelectionTest.java b/tests/tests/text/src/android/text/cts/SelectionTest.java
index 4270b0c..11ba854 100644
--- a/tests/tests/text/src/android/text/cts/SelectionTest.java
+++ b/tests/tests/text/src/android/text/cts/SelectionTest.java
@@ -17,23 +17,19 @@
package android.text.cts;
import android.test.AndroidTestCase;
-import android.text.Layout;
import android.text.Selection;
-import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.StaticLayout;
import android.text.TextPaint;
-import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
import dalvik.annotation.ToBeFixed;
@TestTargetClass(Selection.class)
public class SelectionTest extends AndroidTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getSelectionStart(CharSequence text).",
method = "getSelectionStart",
args = {java.lang.CharSequence.class}
)
@@ -56,7 +52,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test getSelectionEnd(CharSequence text).",
method = "getSelectionEnd",
args = {java.lang.CharSequence.class}
)
@@ -79,7 +74,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test setSelection(Spannable text, int start, int stop).",
method = "setSelection",
args = {android.text.Spannable.class, int.class, int.class}
)
@@ -122,7 +116,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test setSelection(Spannable text, int index).",
method = "setSelection",
args = {android.text.Spannable.class, int.class}
)
@@ -162,7 +155,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test removeSelection(Spannable text).",
method = "removeSelection",
args = {android.text.Spannable.class}
)
@@ -194,7 +186,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test selectAll(Spannable text).",
method = "selectAll",
args = {android.text.Spannable.class}
)
@@ -233,7 +224,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test moveLeft(Spannable text, Layout layout).",
method = "moveLeft",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -292,7 +282,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test moveRight(Spannable text, Layout layout).",
method = "moveRight",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -355,7 +344,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test moveUp(Spannable text, Layout layout).",
method = "moveUp",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -404,7 +392,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test moveDown(Spannable text, Layout layout).",
method = "moveDown",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -462,7 +449,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test extendSelection(Spannable text, int index).",
method = "extendSelection",
args = {android.text.Spannable.class, int.class}
)
@@ -516,7 +502,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test extendLeft(Spannable text, Layout layout).",
method = "extendLeft",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -574,7 +559,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test extendRight(Spannable text, Layout layout).",
method = "extendRight",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -628,7 +612,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test extendUp(Spannable text, Layout layout).",
method = "extendUp",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -677,7 +660,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test extendDown(Spannable text, Layout layout).",
method = "extendDown",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -730,7 +712,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test extendToLeftEdge(Spannable text, Layout layout).",
method = "extendToLeftEdge",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -784,7 +765,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test extendToRightEdge(Spannable text, Layout layout).",
method = "extendToRightEdge",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -836,7 +816,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test moveToLeftEdge(Spannable text, Layout layout).",
method = "moveToLeftEdge",
args = {android.text.Spannable.class, android.text.Layout.class}
)
@@ -886,7 +865,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test moveToRightEdge(Spannable text, Layout layout).",
method = "moveToRightEdge",
args = {android.text.Spannable.class, android.text.Layout.class}
)
diff --git a/tests/tests/text/src/android/text/cts/TextPaintTest.java b/tests/tests/text/src/android/text/cts/TextPaintTest.java
index 8987ad0..175a130 100644
--- a/tests/tests/text/src/android/text/cts/TextPaintTest.java
+++ b/tests/tests/text/src/android/text/cts/TextPaintTest.java
@@ -37,19 +37,16 @@
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor(s) of {@link TextPaint}",
method = "TextPaint",
args = {}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor(s) of {@link TextPaint}",
method = "TextPaint",
args = {int.class}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test constructor(s) of {@link TextPaint}",
method = "TextPaint",
args = {android.graphics.Paint.class}
)
@@ -86,7 +83,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- notes = "Test {@link TextPaint#set(TextPaint)}",
method = "set",
args = {android.text.TextPaint.class}
)