AI 143326: am: CL 143176 am: CL 142888 CTS annotation update
update wrong TestLevel values
update tests that were still using the old annotations
minor fixes to eliminate eclipse warnings
style fixes
Original author: sus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143326
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java
index 7e6ed64..8a49ce0 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryInfoTest.java
@@ -36,13 +36,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents function",
method = "describeContents",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents function",
method = "ActivityManager.MemoryInfo",
args = {}
@@ -53,7 +53,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel function",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -83,7 +83,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test readFromParcel function",
method = "readFromParcel",
args = {android.os.Parcel.class}
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java
index e03816f..4c28990 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerProcessErrorStateInfoTest.java
@@ -34,18 +34,17 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "ActivityManager.ProcessErrorStateInfo",
args = {}
)
public void testConstructor() {
- ActivityManager.ProcessErrorStateInfo errorStateInfo =
- new ActivityManager.ProcessErrorStateInfo();
+ new ActivityManager.ProcessErrorStateInfo();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents method",
method = "describeContents",
args = {}
@@ -55,7 +54,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel method",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -109,7 +108,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test readFromParcel method",
method = "readFromParcel",
args = {android.os.Parcel.class}
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java
index df6415c..e75af2d 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerRecentTaskInfoTest.java
@@ -36,18 +36,17 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "ActivityManager.RecentTaskInfo",
args = {}
)
public void testConstructor() {
- ActivityManager.RecentTaskInfo recentTaskInfo = new
- ActivityManager.RecentTaskInfo();
+ new ActivityManager.RecentTaskInfo();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents method",
method = "describeContents",
args = {}
@@ -57,7 +56,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel method",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -97,7 +96,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test readFromParcel method",
method = "readFromParcel",
args = {android.os.Parcel.class}
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java
index 34447eb..7bc4fd7 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerRunningTaskInfoTest.java
@@ -43,18 +43,17 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "ActivityManager.RunningTaskInfo",
args = {}
)
public void testConstructor() {
- ActivityManager.RunningTaskInfo runningTaskInfo =
- new ActivityManager.RunningTaskInfo();
+ new ActivityManager.RunningTaskInfo();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents method",
method = "describeContents",
args = {}
@@ -64,7 +63,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel method",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -98,7 +97,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test readFromParcel method",
method = "readFromParcel",
args = {android.os.Parcel.class}
diff --git a/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java b/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java
index c19c4e6..d042a25 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManager_RunningServiceInfoTest.java
@@ -50,18 +50,17 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of this class",
method = "ActivityManager.RunningServiceInfo",
args = {}
)
public void testConstructor() {
- ActivityManager.RunningServiceInfo runningServiceInfo =
- new ActivityManager.RunningServiceInfo();
+ new ActivityManager.RunningServiceInfo();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents method",
method = "describeContents",
args = {}
@@ -71,7 +70,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel method",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -96,7 +95,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test readFromParcel method",
method = "readFromParcel",
args = {android.os.Parcel.class}
diff --git a/tests/tests/app/src/android/app/cts/DatePickerDialogTest.java b/tests/tests/app/src/android/app/cts/DatePickerDialogTest.java
index 9af419e..11c1ada 100644
--- a/tests/tests/app/src/android/app/cts/DatePickerDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DatePickerDialogTest.java
@@ -80,19 +80,23 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: DatePickerDialog and onSaveInstanceState",
method = "DatePickerDialog",
- args = {android.content.Context.class, android.app.DatePickerDialog.OnDateSetListener.class, int.class, int.class, int.class}
+ args = {android.content.Context.class,
+ android.app.DatePickerDialog.OnDateSetListener.class, int.class, int.class,
+ int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: DatePickerDialog and onSaveInstanceState",
method = "DatePickerDialog",
- args = {android.content.Context.class, int.class, android.app.DatePickerDialog.OnDateSetListener.class, int.class, int.class, int.class}
+ args = {android.content.Context.class, int.class,
+ android.app.DatePickerDialog.OnDateSetListener.class, int.class, int.class,
+ int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: DatePickerDialog and onSaveInstanceState",
method = "onSaveInstanceState",
args = {}
@@ -127,7 +131,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: show",
method = "show",
args = {}
@@ -143,7 +147,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: onClick",
method = "onClick",
args = {android.content.DialogInterface.class, int.class}
@@ -157,7 +161,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: onDateChanged",
method = "onDateChanged",
args = {android.widget.DatePicker.class, int.class, int.class, int.class}
@@ -191,13 +195,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: updateDate ",
method = "updateDate",
args = {int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: updateDate ",
method = "onSaveInstanceState",
args = {}
@@ -219,13 +223,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: onRestoreInstanceState and onSaveInstanceState",
method = "onRestoreInstanceState",
args = {android.os.Bundle.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: onRestoreInstanceState and onSaveInstanceState",
method = "onSaveInstanceState",
args = {}
diff --git a/tests/tests/app/src/android/app/cts/ProgressDialogTest.java b/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
index 5b4d5fc..bb9fa71 100644
--- a/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
@@ -29,9 +29,10 @@
import android.view.Window;
import android.widget.ProgressBar;
import android.widget.TextView;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import com.android.internal.R;
@@ -72,50 +73,48 @@
mActivity = getActivity();
mContext = mActivity;
mProgressDialog = new ProgressDialog(mContext);
- mDrawable = getActivity().getResources().getDrawable(com.android.cts.stub.R.drawable.yellow);
+ mDrawable = getActivity().getResources()
+ .getDrawable(com.android.cts.stub.R.drawable.yellow);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: ProgressDialog",
- targets = {
- @TestTarget(
- methodName = "ProgressDialog",
- methodArgs = {Context.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: ProgressDialog",
+ method = "ProgressDialog",
+ args = {android.content.Context.class}
+ )
public void testProgressDialog1(){
new ProgressDialog(mContext);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: ProgressDialog",
- targets = {
- @TestTarget(
- methodName = "ProgressDialog",
- methodArgs = {Context.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: ProgressDialog",
+ method = "ProgressDialog",
+ args = {android.content.Context.class, int.class}
+ )
public void testProgressDialog2(){
new ProgressDialog(mContext, com.android.internal.R.style.Theme_Translucent);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: ",
- targets = {
- @TestTarget(
- methodName = "onCreate",
- methodArgs = {Bundle.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: ",
+ method = "onCreate",
+ args = {android.os.Bundle.class}
),
- @TestTarget(
- methodName = "onStart",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: ",
+ method = "onStart",
+ args = {}
),
- @TestTarget(
- methodName = "onStop",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: ",
+ method = "onStop",
+ args = {}
)
})
public void testOnStartCreateStop() {
@@ -132,15 +131,13 @@
assertTrue(pd.mIsOnStopCalled);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: show",
- targets = {
- @TestTarget(
- methodName = "show",
- methodArgs = {Context.class, CharSequence.class, CharSequence.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: show",
+ method = "show",
+ args = {android.content.Context.class, java.lang.CharSequence.class,
+ java.lang.CharSequence.class}
+ )
@UiThreadTest
public void testShow1() {
mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE);
@@ -152,15 +149,13 @@
assertEquals(TITLE, mTitleView.getText());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: show",
- targets = {
- @TestTarget(
- methodName = "show",
- methodArgs = {Context.class, CharSequence.class, CharSequence.class, boolean.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: show",
+ method = "show",
+ args = {android.content.Context.class, java.lang.CharSequence.class,
+ java.lang.CharSequence.class, boolean.class}
+ )
@UiThreadTest
public void testShow2() {
mProgressDialog = ProgressDialog.show(mContext, TITLE, MESSAGE, false);
@@ -174,19 +169,13 @@
assertTrue(mProgressDialog.isIndeterminate());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: show",
- targets = {
- @TestTarget(
- methodName = "show",
- methodArgs = { Context.class,
- CharSequence.class,
- CharSequence.class,
- boolean.class,
- boolean.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: show",
+ method = "show",
+ args = {android.content.Context.class, java.lang.CharSequence.class,
+ java.lang.CharSequence.class, boolean.class, boolean.class}
+ )
public void testShow3() {
final OnCancelListener cL = new OnCancelListener(){
public void onCancel(DialogInterface dialog) {
@@ -224,20 +213,14 @@
assertTrue(mCanceled);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: show",
- targets = {
- @TestTarget(
- methodName = "show",
- methodArgs = { Context.class,
- CharSequence.class,
- CharSequence.class,
- boolean.class,
- boolean.class,
- OnCancelListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: show",
+ method = "show",
+ args = {android.content.Context.class, java.lang.CharSequence.class,
+ java.lang.CharSequence.class, boolean.class, boolean.class,
+ android.content.DialogInterface.OnCancelListener.class}
+ )
public void testShow4() {
final OnCancelListener cL = new OnCancelListener(){
public void onCancel(DialogInterface dialog) {
@@ -273,17 +256,18 @@
assertTrue(mCanceled);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test methods: setMax and getMax",
- targets = {
- @TestTarget(
- methodName = "setMax",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setMax and getMax",
+ method = "setMax",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getMax",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setMax and getMax",
+ method = "getMax",
+ args = {}
)
})
@UiThreadTest
@@ -298,17 +282,18 @@
assertEquals(2009, mProgressDialog.getMax());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test methods: setProgress and getProgress",
- targets = {
- @TestTarget(
- methodName = "setProgress",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setProgress and getProgress",
+ method = "setProgress",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getProgress",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setProgress and getProgress",
+ method = "getProgress",
+ args = {}
)
})
@UiThreadTest
@@ -326,17 +311,18 @@
assertEquals(0, mProgressDialog.getProgress());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test methods: setSecondaryProgress and getSecondaryProgress",
- targets = {
- @TestTarget(
- methodName = "setSecondaryProgress",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setSecondaryProgress and getSecondaryProgress",
+ method = "setSecondaryProgress",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getSecondaryProgress",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setSecondaryProgress and getSecondaryProgress",
+ method = "getSecondaryProgress",
+ args = {}
)
})
@UiThreadTest
@@ -354,18 +340,19 @@
assertEquals(0, mProgressDialog.getSecondaryProgress());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test methods: setIndeterminate and isIndeterminate",
- targets = {
- @TestTarget(
- methodName = "setIndeterminate",
- methodArgs = {boolean.class}
- ),
- @TestTarget(
- methodName = "isIndeterminate",
- methodArgs = {}
- )
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setIndeterminate and isIndeterminate",
+ method = "setIndeterminate",
+ args = {boolean.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: setIndeterminate and isIndeterminate",
+ method = "isIndeterminate",
+ args = {}
+ )
})
@UiThreadTest
public void testSetIndeterminate() {
@@ -386,15 +373,12 @@
assertTrue(mProgressDialog.isIndeterminate());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: incrementProgressBy",
- targets = {
- @TestTarget(
- methodName = "incrementProgressBy",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: incrementProgressBy",
+ method = "incrementProgressBy",
+ args = {int.class}
+ )
public void testIncrementProgressBy() {
mActivity.runOnUiThread(new Runnable() {
public void run() {
@@ -405,6 +389,7 @@
mProgress1 = mProgressDialog.getProgress();
mProgressDialog.incrementProgressBy(60);
mProgress2 = mProgressDialog.getProgress();
+ mProgressDialog.cancel();
}
});
mInstrumentation.waitForIdleSync();
@@ -413,15 +398,12 @@
assertEquals(70, mProgress2);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: incrementSecondaryProgressBy",
- targets = {
- @TestTarget(
- methodName = "incrementSecondaryProgressBy",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: incrementSecondaryProgressBy",
+ method = "incrementSecondaryProgressBy",
+ args = {int.class}
+ )
public void testIncrementSecondaryProgressBy() {
mActivity.runOnUiThread(new Runnable() {
public void run() {
@@ -440,15 +422,12 @@
assertEquals(70, mProgress2);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: setProgressDrawable",
- targets = {
- @TestTarget(
- methodName = "setProgressDrawable",
- methodArgs = {Drawable.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: setProgressDrawable",
+ method = "setProgressDrawable",
+ args = {android.graphics.drawable.Drawable.class}
+ )
public void testSetProgressDrawable() {
mActivity.runOnUiThread(new Runnable() {
public void run() {
@@ -469,15 +448,12 @@
assertEquals(null, mActureDrawableNull);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: setIndeterminateDrawable",
- targets = {
- @TestTarget(
- methodName = "setIndeterminateDrawable",
- methodArgs = {Drawable.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: setIndeterminateDrawable",
+ method = "setIndeterminateDrawable",
+ args = {android.graphics.drawable.Drawable.class}
+ )
public void testSetIndeterminateDrawable() {
mActivity.runOnUiThread(new Runnable() {
public void run() {
@@ -497,15 +473,12 @@
mInstrumentation.waitForIdleSync();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: setMessage",
- targets = {
- @TestTarget(
- methodName = "setMessage",
- methodArgs = {CharSequence.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: setMessage",
+ method = "setMessage",
+ args = {java.lang.CharSequence.class}
+ )
public void testSetMessage() {
mActivity.runOnUiThread(new Runnable() {
public void run() {
@@ -531,15 +504,12 @@
mInstrumentation.waitForIdleSync();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: setProgressStyle",
- targets = {
- @TestTarget(
- methodName = "setProgressStyle",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: setProgressStyle",
+ method = "setProgressStyle",
+ args = {int.class}
+ )
public void testSetProgressStyle() {
setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
assertEquals("10/100", mProgressNumber.getText());
diff --git a/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java b/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
index 774e9fc..2176ae8 100644
--- a/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
@@ -78,19 +78,23 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: TimePickerDialog and onSaveInstanceState",
method = "TimePickerDialog",
- args = {android.content.Context.class, android.app.TimePickerDialog.OnTimeSetListener.class, int.class, int.class, boolean.class}
+ args = {android.content.Context.class,
+ android.app.TimePickerDialog.OnTimeSetListener.class, int.class, int.class,
+ boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: TimePickerDialog and onSaveInstanceState",
method = "TimePickerDialog",
- args = {android.content.Context.class, int.class, android.app.TimePickerDialog.OnTimeSetListener.class, int.class, int.class, boolean.class}
+ args = {android.content.Context.class, int.class,
+ android.app.TimePickerDialog.OnTimeSetListener.class, int.class, int.class,
+ boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: TimePickerDialog and onSaveInstanceState",
method = "onSaveInstanceState",
args = {}
@@ -126,7 +130,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: onClick",
method = "onClick",
args = {android.content.DialogInterface.class, int.class}
@@ -139,7 +143,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: onTimeChanged",
method = "onTimeChanged",
args = {android.widget.TimePicker.class, int.class, int.class}
@@ -167,7 +171,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: updateTime",
method = "updateTime",
args = {int.class, int.class}
@@ -184,7 +188,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods onRestoreInstanceState",
method = "onRestoreInstanceState",
args = {android.os.Bundle.class}
diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk
index 31419e0..494ee77 100644
--- a/tests/tests/content/Android.mk
+++ b/tests/tests/content/Android.mk
@@ -28,4 +28,3 @@
include $(BUILD_PACKAGE)
-
diff --git a/tests/tests/content/src/android/content/cts/ActivityNotFoundExceptionTest.java b/tests/tests/content/src/android/content/cts/ActivityNotFoundExceptionTest.java
index b13f6ac..e4c61a6 100644
--- a/tests/tests/content/src/android/content/cts/ActivityNotFoundExceptionTest.java
+++ b/tests/tests/content/src/android/content/cts/ActivityNotFoundExceptionTest.java
@@ -18,24 +18,26 @@
import android.content.ActivityNotFoundException;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(android.content.ActivityNotFoundException.class)
public class ActivityNotFoundExceptionTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructors of ActivityNotFoundException.",
- targets = {
- @TestTarget(
- methodName = "ActivityNotFoundException",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructors of ActivityNotFoundException.",
+ method = "ActivityNotFoundException",
+ args = {}
),
- @TestTarget(
- methodName = "ActivityNotFoundException",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructors of ActivityNotFoundException.",
+ method = "ActivityNotFoundException",
+ args = {java.lang.String.class}
)
})
public void testConstructors() {
diff --git a/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java b/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
index f530e03..99680d7 100644
--- a/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
+++ b/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
@@ -30,10 +30,12 @@
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.ToBeFixed;
@TestTargetClass(Intent.class)
public class AvailableIntentsTest
@@ -139,24 +141,28 @@
fail("has not started target activity: " + targetActivity + " yet");
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test ACTION_VIEW when url is http://web_address," +
- " it will open a browser window to the URL specified",
- targets = {
- @TestTarget(
- methodName = "Intent",
- methodArgs = {String.class, Uri.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "Intent",
+ args = {java.lang.String.class, android.net.Uri.class}
),
- @TestTarget(
- methodName = "getAction",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getAction",
+ args = {}
),
- @TestTarget(
- methodName = "getData",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getData",
+ args = {}
)
})
+ // test ACTION_VIEW when url is http://web_address,
+ // it will open a browser window to the URL specified
public void testViewNormalUrl() {
Uri uri = Uri.parse(NORMAL_URL);
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
@@ -164,28 +170,32 @@
assertFalse(isRunningTargetActivity(targetActivity));
mActivity.startActivity(intent);
- // check whether start target activty.
+ // check whether start target activity.
assertStartedTargetActivity(5000, targetActivity);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test ACTION_VIEW when url is https://web_address," +
- " it will open a browser window to the URL specified",
- targets = {
- @TestTarget(
- methodName = "Intent",
- methodArgs = {String.class, Uri.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "Intent",
+ args = {java.lang.String.class, android.net.Uri.class}
),
- @TestTarget(
- methodName = "getAction",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getAction",
+ args = {}
),
- @TestTarget(
- methodName = "getData",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getData",
+ args = {}
)
})
+ // test ACTION_VIEW when url is https://web_address,
+ // it will open a browser window to the URL specified
public void testViewSecureUrl() {
Uri uri = Uri.parse(SECURE_URL);
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
@@ -193,28 +203,32 @@
assertFalse(isRunningTargetActivity(targetActivity));
mActivity.startActivity(intent);
- // check whether start target activty.
+ // check whether start target activity.
assertStartedTargetActivity(5000, targetActivity);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test ACTION_WEB_SEARCH when url is http://web_address," +
- " it will open a browser window to the URL specified",
- targets = {
- @TestTarget(
- methodName = "Intent",
- methodArgs = {String.class, Uri.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "Intent",
+ args = {java.lang.String.class, android.net.Uri.class}
),
- @TestTarget(
- methodName = "getAction",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getAction",
+ args = {}
),
- @TestTarget(
- methodName = "getData",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getData",
+ args = {}
)
})
+ // test ACTION_WEB_SEARCH when url is http://web_address,
+ // it will open a browser window to the URL specified
public void testWebSearchNormalUrl() {
Uri uri = Uri.parse(NORMAL_URL);
Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
@@ -223,28 +237,32 @@
assertFalse(isRunningTargetActivity(targetActivity));
mActivity.startActivity(intent);
- // check whether start target activty.
+ // check whether start target activity.
assertStartedTargetActivity(5000, targetActivity);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test ACTION_WEB_SEARCH when url is https://web_address" +
- " it will open a browser window to the URL specified",
- targets = {
- @TestTarget(
- methodName = "Intent",
- methodArgs = {String.class, Uri.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "Intent",
+ args = {java.lang.String.class, android.net.Uri.class}
),
- @TestTarget(
- methodName = "getAction",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getAction",
+ args = {}
),
- @TestTarget(
- methodName = "getData",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getData",
+ args = {}
)
})
+ // test ACTION_WEB_SEARCH when url is https://web_address it will open a browser window to the
+ // URL specified
public void testWebSearchSecureUrl() {
Uri uri = Uri.parse(SECURE_URL);
Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
@@ -253,26 +271,28 @@
assertFalse(isRunningTargetActivity(targetActivity));
mActivity.startActivity(intent);
- // check whether start target activty.
+ // check whether start target activity.
assertStartedTargetActivity(5000, targetActivity);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test ACTION_WEB_SEARCH when url is empty string," +
- " google search will be applied for the plain text",
- targets = {
- @TestTarget(
- methodName = "Intent",
- methodArgs = {String.class, Uri.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test ACTION_WEB_SEARCH when url is invalid, it should be taken as plain text",
+ method = "Intent",
+ args = {java.lang.String.class, android.net.Uri.class}
),
- @TestTarget(
- methodName = "getAction",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test ACTION_WEB_SEARCH when url is invalid, it should be taken as plain text",
+ method = "getAction",
+ args = {}
),
- @TestTarget(
- methodName = "getData",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test ACTION_WEB_SEARCH when url is invalid, it should be taken as plain text",
+ method = "getData",
+ args = {}
)
})
public void testWebSearchPlainText() {
@@ -283,10 +303,10 @@
assertFalse(isRunningTargetActivity(targetActivity));
mActivity.startActivity(intent);
- // check whether start target activty.
+ // check whether start target activity.
assertStartedTargetActivity(5000, targetActivity);
- // FIXME: we can not check what is searched by Google search, because we can not get
+ // FIXME: we can not check what is searched by Google search, because we can not get 308
// target activity in our test codes. issue 1552866.
}
}
diff --git a/tests/tests/content/src/android/content/cts/ComponentNameTest.java b/tests/tests/content/src/android/content/cts/ComponentNameTest.java
index 220d941..b181a19 100644
--- a/tests/tests/content/src/android/content/cts/ComponentNameTest.java
+++ b/tests/tests/content/src/android/content/cts/ComponentNameTest.java
@@ -33,25 +33,25 @@
public class ComponentNameTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of ComponentName.",
method = "ComponentName",
args = {android.content.Context.class, java.lang.Class.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of ComponentName.",
method = "ComponentName",
args = {java.lang.String.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of ComponentName.",
method = "ComponentName",
args = {android.content.Context.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of ComponentName.",
method = "ComponentName",
args = {android.os.Parcel.class}
@@ -113,7 +113,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test ComponentName#flattenToString()",
method = "flattenToString",
args = {}
@@ -124,7 +124,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test ComponentName#getShortClassName().",
method = "getShortClassName",
args = {}
@@ -147,13 +147,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "TestreadFromParcel(Parcel) and writeToParcel(Parcel, int).",
method = "readFromParcel",
args = {android.os.Parcel.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "TestreadFromParcel(Parcel) and writeToParcel(Parcel, int).",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -174,7 +174,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test ComponentName#getPackageName()",
method = "getPackageName",
args = {}
@@ -185,7 +185,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test unflattenFromString(String).",
method = "unflattenFromString",
args = {java.lang.String.class}
@@ -201,7 +201,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "TestflattenToShortString().",
method = "flattenToShortString",
args = {}
@@ -223,7 +223,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals(Object).",
method = "equals",
args = {java.lang.Object.class}
@@ -242,18 +242,18 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString().",
method = "toString",
args = {}
)
public void testToString() {
String str = getComponentName().toString();
- assertEquals("ComponentInfo{com.android.cts.stub/android.content.cts.ComponentNameTest}", str);
+ assertNotNull(str);
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toShortString().",
method = "toShortString",
args = {}
@@ -265,7 +265,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getClassName().",
method = "getClassName",
args = {}
@@ -277,7 +277,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hashCode().",
method = "hashCode",
args = {}
@@ -296,7 +296,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel(ComponentName, Parcel).",
method = "writeToParcel",
args = {android.content.ComponentName.class, android.os.Parcel.class}
@@ -318,7 +318,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents(), this function always returns 0.",
method = "describeContents",
args = {}
diff --git a/tests/tests/content/src/android/content/cts/ContentProviderTest.java b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
index afa3020..ed20588 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
@@ -22,14 +22,15 @@
import android.content.IContentProvider;
import android.content.ISyncAdapter;
import android.content.pm.ProviderInfo;
-import android.content.res.AssetFileDescriptor;
import android.content.res.Configuration;
+import android.content.res.AssetFileDescriptor;
import android.database.Cursor;
import android.database.CursorWindow;
import android.database.IBulkCursor;
import android.database.IContentObserver;
import android.net.Uri;
import android.os.IBinder;
+import android.os.RemoteException;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
@@ -37,9 +38,10 @@
import com.android.internal.database.ArrayListCursor;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -53,15 +55,12 @@
*/
@TestTargetClass(ContentProvider.class)
public class ContentProviderTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test attachInfo(Context, android.content.pm.ProviderInfo)",
- targets = {
- @TestTarget(
- methodName = "attachInfo",
- methodArgs = {Context.class, ProviderInfo.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test attachInfo(Context, android.content.pm.ProviderInfo)",
+ method = "attachInfo",
+ args = {android.content.Context.class, android.content.pm.ProviderInfo.class}
+ )
public void testAttachInfo() {
MockContentProvider mockContentProvider = new MockContentProvider();
@@ -98,15 +97,12 @@
assertEquals(info1.writePermission, mockContentProvider.getWritePermission());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test bulkInsert(Uri, ContentValues[])",
- targets = {
- @TestTarget(
- methodName = "bulkInsert",
- methodArgs = {Uri.class, ContentValues[].class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test bulkInsert(Uri, ContentValues[])",
+ method = "bulkInsert",
+ args = {android.net.Uri.class, android.content.ContentValues[].class}
+ )
public void testBulkInsert() {
MockContentProvider mockContentProvider = new MockContentProvider();
@@ -127,15 +123,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getContext()",
- targets = {
- @TestTarget(
- methodName = "getContext",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getContext()",
+ method = "getContext",
+ args = {}
+ )
public void testGetContext() {
MockContentProvider mockContentProvider = new MockContentProvider();
assertNull(mockContentProvider.getContext());
@@ -146,17 +139,18 @@
assertSame(getContext(), mockContentProvider.getContext());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getReadPermission() and setReadPermission(String)",
- targets = {
- @TestTarget(
- methodName = "getReadPermission",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getReadPermission() and setReadPermission(String)",
+ method = "getReadPermission",
+ args = {}
),
- @TestTarget(
- methodName = "setReadPermission",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getReadPermission() and setReadPermission(String)",
+ method = "setReadPermission",
+ args = {java.lang.String.class}
)
})
public void testAccessReadPermission() {
@@ -175,17 +169,18 @@
assertNull(mockContentProvider.getReadPermission());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getWritePermission() and setWritePermission(String)",
- targets = {
- @TestTarget(
- methodName = "getWritePermission",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getWritePermission() and setWritePermission(String)",
+ method = "getWritePermission",
+ args = {}
),
- @TestTarget(
- methodName = "setWritePermission",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getWritePermission() and setWritePermission(String)",
+ method = "setWritePermission",
+ args = {java.lang.String.class}
)
})
public void testAccessWritePermission() {
@@ -204,43 +199,34 @@
assertNull(mockContentProvider.getWritePermission());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getSyncAdapter()",
- targets = {
- @TestTarget(
- methodName = "getSyncAdapter",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getSyncAdapter()",
+ method = "getSyncAdapter",
+ args = {}
+ )
public void testGetSyncAdapter() {
MockContentProvider mockContentProvider = new MockContentProvider();
assertNull(mockContentProvider.getSyncAdapter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test isTemporary()",
- targets = {
- @TestTarget(
- methodName = "isTemporary",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isTemporary()",
+ method = "isTemporary",
+ args = {}
+ )
public void testIsTemporary() {
MockContentProvider mockContentProvider = new MockContentProvider();
assertFalse(mockContentProvider.isTemporary());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test openFile(Uri, String)",
- targets = {
- @TestTarget(
- methodName = "openFile",
- methodArgs = {Uri.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test openFile(Uri, String)",
+ method = "openFile",
+ args = {android.net.Uri.class, java.lang.String.class}
+ )
public void testOpenFile() {
MockContentProvider mockContentProvider = new MockContentProvider();
@@ -258,15 +244,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test openFileHelper(Uri, String)",
- targets = {
- @TestTarget(
- methodName = "openFileHelper",
- methodArgs = {Uri.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test openFileHelper(Uri, String)",
+ method = "openFileHelper",
+ args = {android.net.Uri.class, java.lang.String.class}
+ )
public void testOpenFileHelper() {
MockContentProvider mockContentProvider = new MockContentProvider();
@@ -311,15 +294,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onConfigurationChanged(android.content.res.Configuration)",
- targets = {
- @TestTarget(
- methodName = "onConfigurationChanged",
- methodArgs = {Configuration.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onConfigurationChanged(android.content.res.Configuration)",
+ method = "onConfigurationChanged",
+ args = {android.content.res.Configuration.class}
+ )
@ToBeFixed( bug = "1400249", explanation = "hard to test call back in unit test," +
" will be tested by functional test.")
public void testOnConfigurationChanged() {
@@ -328,15 +308,12 @@
mockContentProvider.onConfigurationChanged(null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onLowMemory()",
- targets = {
- @TestTarget(
- methodName = "onLowMemory",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onLowMemory()",
+ method = "onLowMemory",
+ args = {}
+ )
@ToBeFixed( bug = "1400249", explanation = "hard to test call back in unit test," +
" will be tested by functional test.")
public void testOnLowMemory() {
@@ -345,15 +322,12 @@
mockContentProvider.onLowMemory();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test coerceToLocalContentProvider(IContentProvider abstractInterface)",
- targets = {
- @TestTarget(
- methodName = "coerceToLocalContentProvider",
- methodArgs = {IContentProvider.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test coerceToLocalContentProvider(IContentProvider abstractInterface)",
+ method = "coerceToLocalContentProvider",
+ args = {android.content.IContentProvider.class}
+ )
public void testCoerceToLocalContentProvider() {
MockContentProvider mockContentProvider = new MockContentProvider();
@@ -391,10 +365,10 @@
return null;
}
- public AssetFileDescriptor openAssetFile(Uri uri, String mode) {
+ public AssetFileDescriptor openAssetFile(Uri url, String mode) {
return null;
}
-
+
public Cursor query(Uri url, String[] projection, String selection,
String[] selectionArgs, String sortOrder) {
return null;
@@ -412,15 +386,12 @@
assertNull(ContentProvider.coerceToLocalContentProvider(iContentProvider));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getIContentProvider()",
- targets = {
- @TestTarget(
- methodName = "getIContentProvider",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getIContentProvider()",
+ method = "getIContentProvider",
+ args = {}
+ )
public void testGetIContentProvider() {
MockContentProvider mockContentProvider = new MockContentProvider();
diff --git a/tests/tests/content/src/android/content/cts/ContentUrisTest.java b/tests/tests/content/src/android/content/cts/ContentUrisTest.java
index ad8408c..369e7fe 100644
--- a/tests/tests/content/src/android/content/cts/ContentUrisTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentUrisTest.java
@@ -39,7 +39,7 @@
private Uri uri2 = Uri.parse("content://" + AUTHORITY + "/" + PATH2);
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of ContentUris.",
method = "ContentUris",
args = {}
@@ -49,7 +49,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parseId(Uri contentUri).",
method = "parseId",
args = {android.net.Uri.class}
@@ -66,7 +66,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parseId(Uri contentUri).",
method = "parseId",
args = {android.net.Uri.class}
@@ -94,7 +94,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test withAppendedId(Uri contentUri, long id).",
method = "withAppendedId",
args = {android.net.Uri.class, long.class}
@@ -112,7 +112,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test withAppendedId(Uri contentUri, long id).",
method = "withAppendedId",
args = {android.net.Uri.class, long.class}
@@ -128,7 +128,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test appendId(Builder builder, long id).",
method = "appendId",
args = {android.net.Uri.Builder.class, long.class}
@@ -149,7 +149,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test appendId(Builder builder, long id).",
method = "appendId",
args = {android.net.Uri.Builder.class, long.class}
diff --git a/tests/tests/content/src/android/content/cts/ContentValuesTest.java b/tests/tests/content/src/android/content/cts/ContentValuesTest.java
index cb31d46..d228823 100644
--- a/tests/tests/content/src/android/content/cts/ContentValuesTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentValuesTest.java
@@ -42,19 +42,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of ContentValues.",
method = "ContentValues",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of ContentValues.",
method = "ContentValues",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of ContentValues.",
method = "ContentValues",
args = {android.content.ContentValues.class}
@@ -83,7 +83,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueSet().",
method = "valueSet",
args = {}
@@ -102,7 +102,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test putNull(String key).",
method = "putNull",
args = {java.lang.String.class}
@@ -122,7 +122,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsLong(String key).",
method = "getAsLong",
args = {java.lang.String.class}
@@ -141,7 +141,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsByte(String key).",
method = "getAsByte",
args = {java.lang.String.class}
@@ -160,7 +160,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsInteger(String key).",
method = "getAsInteger",
args = {java.lang.String.class}
@@ -179,7 +179,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test size().",
method = "size",
args = {}
@@ -200,7 +200,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsShort(String key).",
method = "getAsShort",
args = {java.lang.String.class}
@@ -219,7 +219,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hashCode().",
method = "hashCode",
args = {}
@@ -243,7 +243,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsFloat(String key).",
method = "getAsFloat",
args = {java.lang.String.class}
@@ -262,7 +262,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsBoolean(String key).",
method = "getAsBoolean",
args = {java.lang.String.class}
@@ -279,7 +279,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString().",
method = "toString",
args = {}
@@ -296,7 +296,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test get(String key).",
method = "get",
args = {java.lang.String.class}
@@ -315,7 +315,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals(Object object).",
method = "equals",
args = {java.lang.Object.class}
@@ -332,7 +332,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals(Object object).",
method = "equals",
args = {java.lang.Object.class}
@@ -353,7 +353,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsDouble(String key).",
method = "getAsDouble",
args = {java.lang.String.class}
@@ -372,7 +372,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, String value).",
method = "put",
args = {java.lang.String.class, java.lang.String.class}
@@ -391,7 +391,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, Byte value).",
method = "put",
args = {java.lang.String.class, java.lang.Byte.class}
@@ -410,7 +410,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, Short value).",
method = "put",
args = {java.lang.String.class, java.lang.Short.class}
@@ -429,7 +429,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, Integer value).",
method = "put",
args = {java.lang.String.class, java.lang.Integer.class}
@@ -448,7 +448,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, Long value).",
method = "put",
args = {java.lang.String.class, java.lang.Long.class}
@@ -467,7 +467,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, Float value).",
method = "put",
args = {java.lang.String.class, java.lang.Float.class}
@@ -486,7 +486,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, Double value).",
method = "put",
args = {java.lang.String.class, java.lang.Double.class}
@@ -505,7 +505,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, Boolean value).",
method = "put",
args = {java.lang.String.class, java.lang.Boolean.class}
@@ -523,7 +523,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test put(String key, byte[] value).",
method = "put",
args = {java.lang.String.class, byte[].class}
@@ -538,7 +538,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test containsKey(String key).",
method = "containsKey",
args = {java.lang.String.class}
@@ -558,7 +558,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clear().",
method = "clear",
args = {}
@@ -576,14 +576,16 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test putStringArrayList(String key, ArrayList<String> value) and getStringArrayList(String key).",
+ level = TestLevel.COMPLETE,
+ notes = "Test putStringArrayList(String key, ArrayList<String> value) and "
+ + "getStringArrayList(String key).",
method = "putStringArrayList",
args = {java.lang.String.class, java.util.ArrayList.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test putStringArrayList(String key, ArrayList<String> value) and getStringArrayList(String key).",
+ level = TestLevel.COMPLETE,
+ notes = "Test putStringArrayList(String key, ArrayList<String> value) and "
+ + "getStringArrayList(String key).",
method = "getStringArrayList",
args = {java.lang.String.class}
)
@@ -604,7 +606,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test remove(String key).",
method = "remove",
args = {java.lang.String.class}
@@ -635,7 +637,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsString(String key).",
method = "getAsString",
args = {java.lang.String.class}
@@ -654,7 +656,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAsByteArray(String key).",
method = "getAsByteArray",
args = {java.lang.String.class}
@@ -669,7 +671,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel(Parcel parcel, int flags).",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -695,7 +697,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel(Parcel parcel, int flags).",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -711,7 +713,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents(). This method does nothing, and always return 0",
method = "describeContents",
args = {}
@@ -721,7 +723,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test putAll(ContentValues other).",
method = "putAll",
args = {android.content.ContentValues.class}
@@ -742,7 +744,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test putAll(ContentValues other).",
method = "putAll",
args = {android.content.ContentValues.class}
diff --git a/tests/tests/content/src/android/content/cts/ContextTest.java b/tests/tests/content/src/android/content/cts/ContextTest.java
index 982851f..3eac36a 100644
--- a/tests/tests/content/src/android/content/cts/ContextTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextTest.java
@@ -49,13 +49,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getString(int, Object...) and getString(int).",
method = "getString",
args = {int.class, java.lang.Object[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getString(int, Object...) and getString(int).",
method = "getString",
args = {int.class}
@@ -88,7 +88,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getText(int).",
method = "getText",
args = {int.class}
@@ -108,25 +108,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "obtainStyledAttributes",
args = {int[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "obtainStyledAttributes",
args = {int.class, int[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "obtainStyledAttributes",
args = {android.util.AttributeSet.class, int[].class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "obtainStyledAttributes",
args = {android.util.AttributeSet.class, int[].class}
diff --git a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
index 75b12b5..ea621c8 100644
--- a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
@@ -53,9 +53,10 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -98,15 +99,12 @@
mContext = getContext();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test the constructor ContextWrapper(Context)",
- targets = {
- @TestTarget(
- methodName = "ContextWrapper",
- methodArgs = {Context.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test the constructor ContextWrapper(Context)",
+ method = "ContextWrapper",
+ args = {android.content.Context.class}
+ )
public void testConstructor() {
// new the ContextWrapper instance
new ContextWrapper(mContext);
@@ -115,15 +113,12 @@
new ContextWrapper(null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#enforceCallingPermission(String, String)}",
- targets = {
- @TestTarget(
- methodName = "enforceCallingPermission",
- methodArgs = {String.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#enforceCallingPermission(String, String)}",
+ method = "enforceCallingPermission",
+ args = {java.lang.String.class, java.lang.String.class}
+ )
public void testEnforceCallingPermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
try {
@@ -137,15 +132,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#sendOrderedBroadcast(Intent, String)}",
- targets = {
- @TestTarget(
- methodName = "sendOrderedBroadcast",
- methodArgs = {Intent.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#sendOrderedBroadcast(Intent, String)}",
+ method = "sendOrderedBroadcast",
+ args = {android.content.Intent.class, java.lang.String.class}
+ )
@ToBeFixed(bug = "", explanation = "ResultReceiver.hadReceivedBroadCast() should be true")
public void testSendOrderedBroadcast1() throws InterruptedException {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -158,18 +150,15 @@
assertTrue("Receiver did not respond.", ResultReceiver.hadReceivedBroadCast());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "{@link ContextWrapper#sendOrderedBroadcast(Intent, String, BroadcastReceiver, "
- + "Handler, int, String, Bundle)}.",
- targets = {
- @TestTarget(
- methodName = "sendOrderedBroadcast",
- methodArgs = {
- Intent.class, String.class, BroadcastReceiver.class, Handler.class, int.class,
- String.class, Bundle.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "{@link ContextWrapper#sendOrderedBroadcast(Intent, String, BroadcastReceiver, "
+ + "Handler, int, String, Bundle)}.",
+ method = "sendOrderedBroadcast",
+ args = {android.content.Intent.class, java.lang.String.class,
+ android.content.BroadcastReceiver.class, android.os.Handler.class, int.class,
+ java.lang.String.class, android.os.Bundle.class}
+ )
public void testSendOrderedBroadcast2() throws InterruptedException {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
final TestBroadcastReceiver broadcastReceiver = new TestBroadcastReceiver();
@@ -198,17 +187,20 @@
assertNull(resultExtras.getString(KEY_REMOVED));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#setTheme(int)} and {@link ContextWrapper#getTheme()}",
- targets = {
- @TestTarget(
- methodName = "getTheme",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#setTheme(int)} and "
+ + "{@link ContextWrapper#getTheme()}",
+ method = "getTheme",
+ args = {}
),
- @TestTarget(
- methodName = "setTheme",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#setTheme(int)} and "
+ + "{@link ContextWrapper#getTheme()}",
+ method = "setTheme",
+ args = {int.class}
)
})
public void testAccessTheme() {
@@ -226,18 +218,20 @@
assertEquals(hashCode, contextWrapper.getTheme().hashCode());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#registerReceiver(BroadcastReceiver, IntentFilter)}"
- + " and {@link ContextWrapper#unregisterReceiver(BroadcastReceiver)}.",
- targets = {
- @TestTarget(
- methodName = "registerReceiver",
- methodArgs = {BroadcastReceiver.class, IntentFilter.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#registerReceiver(BroadcastReceiver, IntentFilter)} "
+ + "and {@link ContextWrapper#unregisterReceiver(BroadcastReceiver)}.",
+ method = "registerReceiver",
+ args = {android.content.BroadcastReceiver.class, android.content.IntentFilter.class}
),
- @TestTarget(
- methodName = "unregisterReceiver",
- methodArgs = {BroadcastReceiver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#registerReceiver(BroadcastReceiver, IntentFilter)} "
+ + "and {@link ContextWrapper#unregisterReceiver(BroadcastReceiver)}.",
+ method = "unregisterReceiver",
+ args = {android.content.BroadcastReceiver.class}
)
})
public void testRegisterReceiver1() throws InterruptedException {
@@ -281,16 +275,14 @@
assertFalse(broadcastReceiver2.hadReceivedBroadCast2());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#registerReceiver(BroadcastReceiver, IntentFilter,"
- + "String, Handler)}",
- targets = {
- @TestTarget(
- methodName = "registerReceiver",
- methodArgs = {BroadcastReceiver.class, IntentFilter.class, String.class, Handler.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#registerReceiver(BroadcastReceiver, "
+ + "IntentFilter,String, Handler)}",
+ method = "registerReceiver",
+ args = {android.content.BroadcastReceiver.class, android.content.IntentFilter.class,
+ java.lang.String.class, android.os.Handler.class}
+ )
public void testRegisterReceiver2() throws InterruptedException {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
FilteredReceiver broadcastReceiver = new FilteredReceiver();
@@ -315,32 +307,36 @@
contextWrapper.unregisterReceiver(broadcastReceiver);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#fileList()} and {@link ContextWrapper#getFilesDir()} and"
- + " {@link ContextWrapper#openFileOutput(String, int)} and"
- + " {@link ContextWrapper#deleteFile(String)} and "
- + " {@link ContextWrapper#openFileInput(String)}.",
- targets = {
- @TestTarget(
- methodName = "fileList",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#fileList()}",
+ method = "fileList",
+ args = {}
),
- @TestTarget(
- methodName = "getFilesDir",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getFilesDir()}",
+ method = "getFilesDir",
+ args = {}
),
- @TestTarget(
- methodName = "openFileOutput",
- methodArgs = {String.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#openFileOutput(String, int)}",
+ method = "openFileOutput",
+ args = {java.lang.String.class, int.class}
),
- @TestTarget(
- methodName = "deleteFile",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#deleteFile(String)}",
+ method = "deleteFile",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "openFileInput",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#openFileInput(String)}.",
+ method = "openFileInput",
+ args = {java.lang.String.class}
)
})
public void testAccessOfFiles() throws IOException {
@@ -426,15 +422,12 @@
clearFilesPath(contextWrapper, filePath);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#enforceCallingOrSelfPermission(String, String)}.",
- targets = {
- @TestTarget(
- methodName = "enforceCallingOrSelfPermission",
- methodArgs = {String.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#enforceCallingOrSelfPermission(String, String)}.",
+ method = "enforceCallingOrSelfPermission",
+ args = {java.lang.String.class, java.lang.String.class}
+ )
public void testEnforceCallingOrSelfPermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
try {
@@ -447,33 +440,36 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = " Test {@link contextWrapper#setWallpaper(InputStream)} and"
- + " {@link contextWrapper#setWallpaper(Bitmap)} and"
- + " {@link contextWrapper#clearWallpaper()} and"
- + " {@link contextWrapper#getWallpaper()} and"
- + " {@link contextWrapper#peekWallpaper()} ",
- targets = {
- @TestTarget(
- methodName = "setWallpaper",
- methodArgs = {Bitmap.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link contextWrapper#setWallpaper(Bitmap)}",
+ method = "setWallpaper",
+ args = {android.graphics.Bitmap.class}
),
- @TestTarget(
- methodName = "setWallpaper",
- methodArgs = {InputStream.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test and {@link contextWrapper#setWallpaper(InputStream)}",
+ method = "setWallpaper",
+ args = {java.io.InputStream.class}
),
- @TestTarget(
- methodName = "clearWallpaper",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link contextWrapper#clearWallpaper()}",
+ method = "clearWallpaper",
+ args = {}
),
- @TestTarget(
- methodName = "getWallpaper",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link contextWrapper#getWallpaper()}",
+ method = "getWallpaper",
+ args = {}
),
- @TestTarget(
- methodName = "peekWallpaper",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link contextWrapper#peekWallpaper()} ",
+ method = "peekWallpaper",
+ args = {}
)
})
public void testAccessWallpaper() throws IOException, InterruptedException {
@@ -510,32 +506,31 @@
assertNotSame(testDrawable, contextWrapper.peekWallpaper());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#openOrCreateDatabase(String, int, CursorFactory)} and"
- + " {@link ContextWrapper#getDatabasePath(String)} and"
- + " {@link ContextWrapper#databaseList()} and"
- + " {@link ContextWrapper#deleteDatabase(String)}.",
- targets = {
- @TestTarget(
- methodName = "openOrCreateDatabase",
- methodArgs = {String.class, int.class, CursorFactory.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#openOrCreateDatabase(String, int, CursorFactory)}",
+ method = "openOrCreateDatabase",
+ args = {java.lang.String.class, int.class,
+ android.database.sqlite.SQLiteDatabase.CursorFactory.class}
),
- @TestTarget(
- methodName = "getDatabasePath",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getDatabasePath(String)}",
+ method = "getDatabasePath",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "openOrCreateDatabase",
- methodArgs = {String.class, int.class, CursorFactory.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#databaseList()}",
+ method = "databaseList",
+ args = {}
),
- @TestTarget(
- methodName = "databaseList",
- methodArgs = {}
- ),
- @TestTarget(
- methodName = "deleteDatabase",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#deleteDatabase(String)}.",
+ method = "deleteDatabase",
+ args = {java.lang.String.class}
)
})
public void testAccessDatabase() {
@@ -616,15 +611,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#enforceUriPermission(Uri, int, int, int, String)}.",
- targets = {
- @TestTarget(
- methodName = "enforceUriPermission",
- methodArgs = {Uri.class, int.class, int.class, int.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#enforceUriPermission(Uri, int, int, int, String)}.",
+ method = "enforceUriPermission",
+ args = {android.net.Uri.class, int.class, int.class, int.class, java.lang.String.class}
+ )
public void testEnforceUriPermission1() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -640,17 +632,14 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#enforceUriPermission(Uri, String, String, int, int, int,"
- + "String)}",
- targets = {
- @TestTarget(
- methodName = "enforceUriPermission",
- methodArgs = {Uri.class, String.class, String.class, int.class, int.class,
- int.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#enforceUriPermission(Uri, String, String, int, int,"
+ + " int,String)}",
+ method = "enforceUriPermission",
+ args = {android.net.Uri.class, java.lang.String.class, java.lang.String.class, int.class,
+ int.class, int.class, java.lang.String.class}
+ )
public void testEnforceUriPermission2() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -667,30 +656,24 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getPackageResourcePath()}.",
- targets = {
- @TestTarget(
- methodName = "getPackageResourcePath",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getPackageResourcePath()}.",
+ method = "getPackageResourcePath",
+ args = {}
+ )
public void testGetPackageResourcePath() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertNotNull(contextWrapper.getPackageResourcePath());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#startActivity(Intent)}.",
- targets = {
- @TestTarget(
- methodName = "startActivity",
- methodArgs = {Intent.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#startActivity(Intent)}.",
+ method = "startActivity",
+ args = {android.content.Intent.class}
+ )
public void testStartActivity() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -706,15 +689,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#createPackageContext(String, int)}.",
- targets = {
- @TestTarget(
- methodName = "createPackageContext",
- methodArgs = {String.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#createPackageContext(String, int)}.",
+ method = "createPackageContext",
+ args = {java.lang.String.class, int.class}
+ )
public void testCreatePackageContext() throws PackageManager.NameNotFoundException {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -724,45 +704,36 @@
assertNotNull(actualContext);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getMainLooper()}.",
- targets = {
- @TestTarget(
- methodName = "getMainLooper",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getMainLooper()}.",
+ method = "getMainLooper",
+ args = {}
+ )
public void testGetMainLooper() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertNotNull(contextWrapper.getMainLooper());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getApplicationContext()}.",
- targets = {
- @TestTarget(
- methodName = "getApplicationContext",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getApplicationContext()}.",
+ method = "getApplicationContext",
+ args = {}
+ )
public void testGetApplicationContext() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertSame(mContext.getApplicationContext(), contextWrapper.getApplicationContext());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getSharedPreferences(String, int)}.",
- targets = {
- @TestTarget(
- methodName = "getSharedPreferences",
- methodArgs = {String.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getSharedPreferences(String, int)}.",
+ method = "getSharedPreferences",
+ args = {java.lang.String.class, int.class}
+ )
public void testGetSharedPreferences() {
SharedPreferences sp;
SharedPreferences localSP;
@@ -775,15 +746,12 @@
assertSame(sp, localSP);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#revokeUriPermission(Uri, int)}.",
- targets = {
- @TestTarget(
- methodName = "revokeUriPermission",
- methodArgs = {Uri.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#revokeUriPermission(Uri, int)}.",
+ method = "revokeUriPermission",
+ args = {android.net.Uri.class, int.class}
+ )
@ToBeFixed(bug = "1400249", explanation = "Can't test the effect of this function, should be"
+ "tested by functional test.")
public void testRevokeUriPermission() {
@@ -792,28 +760,31 @@
contextWrapper.revokeUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#startService(Intent)} and"
- + " {@link ContextWrapper#bindService(Intent, ServiceConnection, int)} and"
- + " {@link ContextWrapper#stopService(Intent)} and"
- + " {@link ContextWrapper#unbindService(ServiceConnection)}.",
- targets = {
- @TestTarget(
- methodName = "startService",
- methodArgs = {Intent.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#startService(Intent)}.",
+ method = "startService",
+ args = {android.content.Intent.class}
),
- @TestTarget(
- methodName = "bindService",
- methodArgs = {Intent.class, ServiceConnection.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#bindService(Intent, ServiceConnection, int)}.",
+ method = "bindService",
+ args = {android.content.Intent.class, android.content.ServiceConnection.class,
+ int.class}
),
- @TestTarget(
- methodName = "stopService",
- methodArgs = {Intent.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#stopService(Intent)}.",
+ method = "stopService",
+ args = {android.content.Intent.class}
),
- @TestTarget(
- methodName = "unbindService",
- methodArgs = {ServiceConnection.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#unbindService(ServiceConnection)}.",
+ method = "unbindService",
+ args = {android.content.ServiceConnection.class}
)
})
public void testAccessService() throws InterruptedException {
@@ -832,78 +803,66 @@
assertTrue(MockContextWrapperService.hadCalledOnUnbind());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getPackageCodePath()}.",
- targets = {
- @TestTarget(
- methodName = "getPackageCodePath",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getPackageCodePath()}.",
+ method = "getPackageCodePath",
+ args = {}
+ )
public void testGetPackageCodePath() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertNotNull(contextWrapper.getPackageCodePath());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getPackageName()}.",
- targets = {
- @TestTarget(
- methodName = "getPackageName",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getPackageName()}.",
+ method = "getPackageName",
+ args = {}
+ )
public void testGetPackageName() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertEquals("com.android.cts.stub", contextWrapper.getPackageName());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getCacheDir()}.",
- targets = {
- @TestTarget(
- methodName = "getCacheDir",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getCacheDir()}.",
+ method = "getCacheDir",
+ args = {}
+ )
public void testGetCacheDir() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
- assertNotNull( contextWrapper.getCacheDir());
+ assertNotNull(contextWrapper.getCacheDir());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getContentResolver()}.",
- targets = {
- @TestTarget(
- methodName = "getContentResolver",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getContentResolver()}.",
+ method = "getContentResolver",
+ args = {}
+ )
public void testGetContentResolver() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertSame(mContext.getContentResolver(), contextWrapper.getContentResolver());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#attachBaseContext(Context)} and"
- + " {@link ContextWrapper#getBaseContext(Context)}.",
- targets = {
- @TestTarget(
- methodName = "attachBaseContext",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#attachBaseContext(Context)}",
+ method = "attachBaseContext",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "getBaseContext",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getBaseContext(Context)}.",
+ method = "getBaseContext",
+ args = {}
)
})
public void testAccessBaseContext() throws PackageManager.NameNotFoundException {
@@ -924,15 +883,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getFileStreamPath(String)}.",
- targets = {
- @TestTarget(
- methodName = "getFileStreamPath",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getFileStreamPath(String)}.",
+ method = "getFileStreamPath",
+ args = {java.lang.String.class}
+ )
public void testGetFileStreamPath() {
String TEST_FILENAME = "TestGetFileStreamPath";
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -942,33 +898,30 @@
assertTrue(fileStreamPath.indexOf(TEST_FILENAME) >= 0);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getClassLoader()}.",
- targets = {
- @TestTarget(
- methodName = "getClassLoader",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getClassLoader()}.",
+ method = "getClassLoader",
+ args = {}
+ )
public void testGetClassLoader() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertSame(mContext.getClassLoader(), contextWrapper.getClassLoader());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getWallpaperDesiredMinimumHeight()} and"
- + " {@link ContextWrapper#getWallpaperDesiredMinimumWidth()}.",
- targets = {
- @TestTarget(
- methodName = "getWallpaperDesiredMinimumHeight",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getWallpaperDesiredMinimumHeight()}.",
+ method = "getWallpaperDesiredMinimumHeight",
+ args = {}
),
- @TestTarget(
- methodName = "getWallpaperDesiredMinimumWidth",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getWallpaperDesiredMinimumWidth()}.",
+ method = "getWallpaperDesiredMinimumWidth",
+ args = {}
)
})
public void testGetWallpaperDesiredMinimumHeightAndWidth() {
@@ -984,18 +937,18 @@
assertTrue((height > 0 && width > 0) || (height <= 0 && width <= 0));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#sendStickyBroadcast(Intent)} and"
- + " {@link ContextWrapper#removeStickyBroadcast(Intent)}.",
- targets = {
- @TestTarget(
- methodName = "sendStickyBroadcast",
- methodArgs = {Intent.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#sendStickyBroadcast(Intent)}",
+ method = "sendStickyBroadcast",
+ args = {android.content.Intent.class}
),
- @TestTarget(
- methodName = "removeStickyBroadcast",
- methodArgs = {Intent.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#removeStickyBroadcast(Intent)}.",
+ method = "removeStickyBroadcast",
+ args = {android.content.Intent.class}
)
})
public void testAccessStickyBroadcast() throws InterruptedException {
@@ -1020,15 +973,12 @@
contextWrapper.unregisterReceiver(stickyReceiver);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = " Test {@link ContextWrapper#checkCallingOrSelfUriPermission(Uri, int)}.",
- targets = {
- @TestTarget(
- methodName = "checkCallingOrSelfUriPermission",
- methodArgs = {Uri.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = " Test {@link ContextWrapper#checkCallingOrSelfUriPermission(Uri, int)}.",
+ method = "checkCallingOrSelfUriPermission",
+ args = {android.net.Uri.class, int.class}
+ )
public void testCheckCallingOrSelfUriPermission() {
Uri uri = Uri.parse("content://ctstest");
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1038,15 +988,12 @@
assertEquals(PackageManager.PERMISSION_DENIED, retValue);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#grantUriPermission(String, Uri, int)}.",
- targets = {
- @TestTarget(
- methodName = "grantUriPermission",
- methodArgs = {String.class, Uri.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#grantUriPermission(String, Uri, int)}.",
+ method = "grantUriPermission",
+ args = {java.lang.String.class, android.net.Uri.class, int.class}
+ )
@ToBeFixed(bug = "1400249", explanation = "Can't test the effect of this function,"
+ " should be tested by functional test.")
public void testGrantUriPermission() {
@@ -1056,15 +1003,12 @@
Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#enforcePermission(String, int, int, String)}.",
- targets = {
- @TestTarget(
- methodName = "enforcePermission",
- methodArgs = {String.class, int.class, int.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#enforcePermission(String, int, int, String)}.",
+ method = "enforcePermission",
+ args = {java.lang.String.class, int.class, int.class, java.lang.String.class}
+ )
public void testEnforcePermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1080,15 +1024,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#checkUriPermission(Uri, int, int, int)}.",
- targets = {
- @TestTarget(
- methodName = "checkUriPermission",
- methodArgs = {Uri.class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#checkUriPermission(Uri, int, int, int)}.",
+ method = "checkUriPermission",
+ args = {android.net.Uri.class, int.class, int.class, int.class}
+ )
public void testCheckUriPermission1() {
Uri uri = Uri.parse("content://ctstest");
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1102,16 +1043,14 @@
assertEquals(PackageManager.PERMISSION_DENIED, retValue);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#checkUriPermission(Uri, String, String, int, int,"
- + " int)}.",
- targets = {
- @TestTarget(
- methodName = "checkUriPermission",
- methodArgs = {Uri.class, String.class, String.class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#checkUriPermission(Uri, String, String, int, int, "
+ + "int)}.",
+ method = "checkUriPermission",
+ args = {android.net.Uri.class, java.lang.String.class, java.lang.String.class, int.class,
+ int.class, int.class}
+ )
public void testCheckUriPermission2() {
Uri uri = Uri.parse("content://ctstest");
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1127,15 +1066,12 @@
assertEquals(PackageManager.PERMISSION_DENIED, retValue);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#checkCallingPermission(String)}.",
- targets = {
- @TestTarget(
- methodName = "checkCallingPermission",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#checkCallingPermission(String)}.",
+ method = "checkCallingPermission",
+ args = {java.lang.String.class}
+ )
public void testCheckCallingPermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1143,15 +1079,12 @@
assertEquals(PackageManager.PERMISSION_DENIED, retValue);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#checkCallingUriPermission(Uri, int)}.",
- targets = {
- @TestTarget(
- methodName = "checkCallingUriPermission",
- methodArgs = {Uri.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#checkCallingUriPermission(Uri, int)}.",
+ method = "checkCallingUriPermission",
+ args = {android.net.Uri.class, int.class}
+ )
public void testCheckCallingUriPermission() {
Uri uri = Uri.parse("content://ctstest");
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1161,15 +1094,12 @@
assertEquals(PackageManager.PERMISSION_DENIED, retValue);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#enforceCallingUriPermission(Uri, int, String)}.",
- targets = {
- @TestTarget(
- methodName = "enforceCallingUriPermission",
- methodArgs = {Uri.class, int.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#enforceCallingUriPermission(Uri, int, String)}.",
+ method = "enforceCallingUriPermission",
+ args = {android.net.Uri.class, int.class, java.lang.String.class}
+ )
public void testEnforceCallingUriPermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1184,15 +1114,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getDir(String, int)}.",
- targets = {
- @TestTarget(
- methodName = "getDir",
- methodArgs = {String.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getDir(String, int)}.",
+ method = "getDir",
+ args = {java.lang.String.class, int.class}
+ )
public void testGetDir() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1202,30 +1129,24 @@
clearFilesPath(contextWrapper, dirString);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getPackageManager()}.",
- targets = {
- @TestTarget(
- methodName = "getPackageManager",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getPackageManager()}.",
+ method = "getPackageManager",
+ args = {}
+ )
public void testGetPackageManager() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertSame(mContext.getPackageManager(), contextWrapper.getPackageManager());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#checkCallingOrSelfPermission(String)}.",
- targets = {
- @TestTarget(
- methodName = "checkCallingOrSelfPermission",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#checkCallingOrSelfPermission(String)}.",
+ method = "checkCallingOrSelfPermission",
+ args = {java.lang.String.class}
+ )
public void testCheckCallingOrSelfPermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1233,15 +1154,12 @@
assertEquals(PackageManager.PERMISSION_GRANTED, retValue);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#sendBroadcast(Intent)}.",
- targets = {
- @TestTarget(
- methodName = "sendBroadcast",
- methodArgs = {Intent.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#sendBroadcast(Intent)}.",
+ method = "sendBroadcast",
+ args = {android.content.Intent.class}
+ )
@ToBeFixed(bug = "", explanation = "ResultReceiver.hadReceivedBroadCast() should be true")
public void testSendBroadcast1() throws InterruptedException {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1254,15 +1172,12 @@
assertTrue("Receiver did not respond.", ResultReceiver.hadReceivedBroadCast());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#sendBroadcast(Intent, String)}.",
- targets = {
- @TestTarget(
- methodName = "sendBroadcast",
- methodArgs = {Intent.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#sendBroadcast(Intent, String)}.",
+ method = "sendBroadcast",
+ args = {android.content.Intent.class, java.lang.String.class}
+ )
@ToBeFixed(bug = "", explanation = "ResultReceiver.hadReceivedBroadCast() should be true")
public void testSendBroadcast2() throws InterruptedException {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1275,15 +1190,12 @@
assertTrue("Receiver did not respond.", ResultReceiver.hadReceivedBroadCast());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#enforceCallingOrSelfUriPermission(Uri, int, String)}",
- targets = {
- @TestTarget(
- methodName = "enforceCallingOrSelfUriPermission",
- methodArgs = {Uri.class, int.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#enforceCallingOrSelfUriPermission(Uri, int, String)}",
+ method = "enforceCallingOrSelfUriPermission",
+ args = {android.net.Uri.class, int.class, java.lang.String.class}
+ )
public void testEnforceCallingOrSelfUriPermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1299,15 +1211,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#checkPermission(String, int, int)}.",
- targets = {
- @TestTarget(
- methodName = "checkPermission",
- methodArgs = {String.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#checkPermission(String, int, int)}.",
+ method = "checkPermission",
+ args = {java.lang.String.class, int.class, int.class}
+ )
public void testCheckPermission() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1332,15 +1241,12 @@
assertEquals(PackageManager.PERMISSION_DENIED, returnValue);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getSystemService(String)}.",
- targets = {
- @TestTarget(
- methodName = "getSystemService",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getSystemService(String)}.",
+ method = "getSystemService",
+ args = {java.lang.String.class}
+ )
public void testGetSystemService() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
@@ -1351,45 +1257,37 @@
assertNotNull(contextWrapper.getSystemService("window"));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getAssets()}.",
- targets = {
- @TestTarget(
- methodName = "getAssets",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getAssets()}.",
+ method = "getAssets",
+ args = {}
+ )
public void testGetAssets() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertSame(mContext.getAssets(), contextWrapper.getAssets());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ContextWrapper#getResources()}.",
- targets = {
- @TestTarget(
- methodName = "getResources",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ContextWrapper#getResources()}.",
+ method = "getResources",
+ args = {}
+ )
public void testGetResources() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
assertSame(mContext.getResources(), contextWrapper.getResources());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "{@link ContextWrapper#startInstrumentation(ComponentName, String, Bundle)}.",
- targets = {
- @TestTarget(
- methodName = "startInstrumentation",
- methodArgs = {ComponentName.class, String.class, Bundle.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "{@link ContextWrapper#startInstrumentation(ComponentName, String, Bundle)}.",
+ method = "startInstrumentation",
+ args = {android.content.ComponentName.class, java.lang.String.class,
+ android.os.Bundle.class}
+ )
public void testStartInstrumentation() {
ContextWrapper contextWrapper = new ContextWrapper(mContext);
diff --git a/tests/tests/content/src/android/content/cts/ReceiverCallNotAllowedExceptionTest.java b/tests/tests/content/src/android/content/cts/ReceiverCallNotAllowedExceptionTest.java
index cc27810..62bda0b 100644
--- a/tests/tests/content/src/android/content/cts/ReceiverCallNotAllowedExceptionTest.java
+++ b/tests/tests/content/src/android/content/cts/ReceiverCallNotAllowedExceptionTest.java
@@ -18,22 +18,20 @@
import android.content.ReceiverCallNotAllowedException;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(android.content.ReceiverCallNotAllowedException.class)
public class ReceiverCallNotAllowedExceptionTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor of ReceiverCallNotAllowedException.",
- targets = {
- @TestTarget(
- methodName = "ReceiverCallNotAllowedException",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor of ReceiverCallNotAllowedException.",
+ method = "ReceiverCallNotAllowedException",
+ args = {java.lang.String.class}
+ )
public void testConstructor() {
new ReceiverCallNotAllowedException("TEST_STRING");
}
diff --git a/tests/tests/content/src/android/content/cts/SyncContextTest.java b/tests/tests/content/src/android/content/cts/SyncContextTest.java
index 3b41ff2..02d8725 100644
--- a/tests/tests/content/src/android/content/cts/SyncContextTest.java
+++ b/tests/tests/content/src/android/content/cts/SyncContextTest.java
@@ -42,7 +42,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of SyncContext",
method = "SyncContext",
args = {ISyncContext.class}
@@ -53,7 +53,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getISyncContext function",
method = "getISyncContext",
args = {}
@@ -65,7 +65,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateHeartbeat",
method = "updateHeartbeat",
args = {}
@@ -79,7 +79,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setStatusText function. The param is never read.",
method = "setStatusText",
args = {java.lang.String.class}
@@ -93,7 +93,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onFinished function",
method = "onFinished",
args = {android.content.SyncResult.class}
diff --git a/tests/tests/content/src/android/content/cts/SyncResultTest.java b/tests/tests/content/src/android/content/cts/SyncResultTest.java
index 7032a61..6148334 100644
--- a/tests/tests/content/src/android/content/cts/SyncResultTest.java
+++ b/tests/tests/content/src/android/content/cts/SyncResultTest.java
@@ -36,7 +36,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of SyncResult.",
method = "SyncResult",
args = {}
@@ -46,7 +46,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hasError().",
method = "hasError",
args = {}
@@ -57,7 +57,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clear().",
method = "clear",
args = {}
@@ -81,7 +81,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test madeSomeProgress().",
method = "madeSomeProgress",
args = {}
@@ -94,7 +94,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toDebugString().",
method = "toDebugString",
args = {}
@@ -115,7 +115,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString().",
method = "toString",
args = {}
@@ -146,7 +146,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hasHardError().",
method = "hasHardError",
args = {}
@@ -160,7 +160,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel(Parcel parcel, int flags).",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -188,7 +188,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel(Parcel parcel, int flags).",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -204,7 +204,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents(). This method does nothing, and always return 0.",
method = "describeContents",
args = {}
@@ -214,7 +214,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hasSoftError().",
method = "hasSoftError",
args = {}
diff --git a/tests/tests/content/src/android/content/cts/SyncStatsTest.java b/tests/tests/content/src/android/content/cts/SyncStatsTest.java
index 486c657..9a2130a 100644
--- a/tests/tests/content/src/android/content/cts/SyncStatsTest.java
+++ b/tests/tests/content/src/android/content/cts/SyncStatsTest.java
@@ -19,9 +19,10 @@
import android.content.SyncStats;
import android.os.Parcel;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -30,17 +31,18 @@
*/
@TestTargetClass(SyncStats.class)
public class SyncStatsTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link SyncStats}.",
- targets = {
- @TestTarget(
- methodName = "SyncStats",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link SyncStats}.",
+ method = "SyncStats",
+ args = {}
),
- @TestTarget(
- methodName = "SyncStats",
- methodArgs = {Parcel.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link SyncStats}.",
+ method = "SyncStats",
+ args = {android.os.Parcel.class}
)
})
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
@@ -90,15 +92,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test writeToParcel(Parcel, int)",
- targets = {
- @TestTarget(
- methodName = "writeToParcel",
- methodArgs = {Parcel.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test writeToParcel(Parcel, int)",
+ method = "writeToParcel",
+ args = {android.os.Parcel.class, int.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
public void testWriteToParcel() {
SyncStats syncStats = new SyncStats();
@@ -136,15 +135,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test clear()",
- targets = {
- @TestTarget(
- methodName = "clear",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test clear()",
+ method = "clear",
+ args = {}
+ )
public void testClear() {
SyncStats syncStats = new SyncStats();
@@ -170,30 +166,24 @@
assertEquals(0, syncStats.numSkippedEntries);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test toString()",
- targets = {
- @TestTarget(
- methodName = "toString",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test toString()",
+ method = "toString",
+ args = {}
+ )
public void testToString() {
SyncStats syncStats = new SyncStats();
assertNotNull(syncStats.toString());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test describeContents(), it always return 0",
- targets = {
- @TestTarget(
- methodName = "describeContents",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test describeContents(), it always return 0",
+ method = "describeContents",
+ args = {}
+ )
public void testDescribeContents() {
SyncStats syncStats = new SyncStats();
assertEquals(0, syncStats.describeContents());
diff --git a/tests/tests/content/src/android/content/cts/UriMatcherTest.java b/tests/tests/content/src/android/content/cts/UriMatcherTest.java
index d31e818..e7a3543 100644
--- a/tests/tests/content/src/android/content/cts/UriMatcherTest.java
+++ b/tests/tests/content/src/android/content/cts/UriMatcherTest.java
@@ -52,7 +52,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of UriMatcher.",
method = "UriMatcher",
args = {int.class}
@@ -62,7 +62,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test match(Uri uri).",
method = "match",
args = {android.net.Uri.class}
@@ -84,7 +84,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test match(Uri uri).",
method = "match",
args = {android.net.Uri.class}
@@ -100,7 +100,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addURI(String authority, String path, int code).",
method = "addURI",
args = {java.lang.String.class, java.lang.String.class, int.class}
@@ -123,7 +123,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addURI(String authority, String path, int code).",
method = "addURI",
args = {java.lang.String.class, java.lang.String.class, int.class}
diff --git a/tests/tests/content/src/android/content/pm/cts/ActivityInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ActivityInfoTest.java
index 1fc5661..6af2f75 100644
--- a/tests/tests/content/src/android/content/pm/cts/ActivityInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ActivityInfoTest.java
@@ -46,13 +46,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ActivityInfo}",
method = "ActivityInfo",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ActivityInfo}",
method = "ActivityInfo",
args = {android.content.pm.ActivityInfo.class}
@@ -74,7 +74,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ActivityInfo#writeToParcel(Parcel, int)}",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -108,7 +108,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ActivityInfo#getThemeResource()}",
method = "getThemeResource",
args = {}
@@ -125,7 +125,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ActivityInfo#toString()}",
method = "toString",
args = {}
@@ -151,7 +151,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ActivityInfo#describeContents()}",
method = "describeContents",
args = {}
@@ -169,7 +169,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ActivityInfo#dump(Printer, String)}",
method = "dump",
args = {android.util.Printer.class, java.lang.String.class}
diff --git a/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
index ad00be7..422c4e3 100644
--- a/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
@@ -47,13 +47,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ApplicationInfo}",
method = "ApplicationInfo",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ApplicationInfo}",
method = "ApplicationInfo",
args = {android.content.pm.ApplicationInfo.class}
@@ -74,7 +74,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ApplicationInfo#writeToParcel(Parcel, int)}",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -110,7 +110,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ApplicationInfo#toString()}",
method = "toString",
args = {}
@@ -126,7 +126,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ApplicationInfo#describeContents()}",
method = "describeContents",
args = {}
@@ -143,7 +143,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ApplicationInfo#dump(Printer, String)}",
method = "dump",
args = {android.util.Printer.class, java.lang.String.class}
@@ -184,7 +184,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ApplicationInfo#loadDescription(PackageManager)}",
method = "loadDescription",
args = {android.content.pm.PackageManager.class}
diff --git a/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java b/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java
index 496b946..2f4d1b4 100644
--- a/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java
@@ -41,7 +41,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ApplicationInfo.DisplayNameComparator}",
method = "ApplicationInfo.DisplayNameComparator",
args = {android.content.pm.PackageManager.class}
@@ -54,7 +54,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test compare(ApplicationInfo, ApplicationInfo)",
method = "compare",
args = {android.content.pm.ApplicationInfo.class, android.content.pm.ApplicationInfo.class}
diff --git a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
index c02d8b8..ee5f3bb 100644
--- a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
@@ -51,19 +51,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ComponentInfo}",
method = "ComponentInfo",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ComponentInfo}",
method = "ComponentInfo",
args = {android.content.pm.ComponentInfo.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ComponentInfo}",
method = "ComponentInfo",
args = {android.os.Parcel.class}
@@ -98,7 +98,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ComponentInfo#loadIcon(PackageManager)}",
method = "loadIcon",
args = {android.content.pm.PackageManager.class}
@@ -134,7 +134,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ComponentInfo#dumpBack(Printer, String)}",
method = "dumpBack",
args = {android.util.Printer.class, java.lang.String.class}
@@ -185,7 +185,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ComponentInfo#getIconResource()}",
method = "getIconResource",
args = {}
@@ -203,7 +203,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ComponentInfo#dumpFront(Printer, String)}",
method = "dumpFront",
args = {android.util.Printer.class, java.lang.String.class}
@@ -243,7 +243,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ComponentInfo#loadLabel(PackageManager)}",
method = "loadLabel",
args = {android.content.pm.PackageManager.class}
@@ -284,7 +284,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ComponentInfo#writeToParcel(Parcel, int)}",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
index bac97f3..783ec32 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
@@ -54,13 +54,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors.",
method = "Configuration",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors.",
method = "Configuration",
args = {android.content.res.Configuration.class}
@@ -79,7 +79,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test compareTo.",
method = "compareTo",
args = {android.content.res.Configuration.class}
@@ -168,7 +168,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents.",
method = "describeContents",
args = {}
@@ -178,7 +178,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test diff",
method = "diff",
args = {android.content.res.Configuration.class}
@@ -196,13 +196,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "equals",
args = {android.content.res.Configuration.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "equals",
args = {java.lang.Object.class}
@@ -214,7 +214,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hashCode.",
method = "hashCode",
args = {}
@@ -225,13 +225,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateFrom and needNewResources.",
method = "needNewResources",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateFrom and needNewResources.",
method = "updateFrom",
args = {android.content.res.Configuration.class}
@@ -253,7 +253,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setToDefaults.",
method = "setToDefaults",
args = {}
@@ -266,7 +266,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString",
method = "toString",
args = {}
@@ -276,7 +276,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel.",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
diff --git a/tests/tests/database/src/android/database/cts/AbstractCursor_SelfContentObserverTest.java b/tests/tests/database/src/android/database/cts/AbstractCursor_SelfContentObserverTest.java
index f3b829e..2975e3d 100644
--- a/tests/tests/database/src/android/database/cts/AbstractCursor_SelfContentObserverTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractCursor_SelfContentObserverTest.java
@@ -27,7 +27,7 @@
public class AbstractCursor_SelfContentObserverTest extends AndroidTestCase{
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of SelfContentObserver",
method = "SelfContentObserver",
args = {}
@@ -38,7 +38,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test deliverSelfNotifications of SelfContentObserver",
method = "deliverSelfNotifications",
args = {}
@@ -50,7 +50,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onChange of SelfContentObserver",
method = "onChange",
args = {boolean.class}
diff --git a/tests/tests/database/src/android/database/cts/CursorIndexOutOfBoundsExceptionTest.java b/tests/tests/database/src/android/database/cts/CursorIndexOutOfBoundsExceptionTest.java
index f62606a..d4ee6a1 100644
--- a/tests/tests/database/src/android/database/cts/CursorIndexOutOfBoundsExceptionTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorIndexOutOfBoundsExceptionTest.java
@@ -28,13 +28,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of CursorIndexOutOfBoundsException.",
method = "CursorIndexOutOfBoundsException",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of CursorIndexOutOfBoundsException.",
method = "CursorIndexOutOfBoundsException",
args = {int.class, int.class}
diff --git a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
index c0fecfa..ee460dc 100644
--- a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
@@ -33,9 +33,10 @@
import android.os.Bundle;
import android.os.Handler;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(android.database.CursorWrapper.class)
@@ -71,25 +72,30 @@
super.tearDown();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test close() and isClosed() and the constructor method.",
- targets = {
- @TestTarget(
- methodName = "close",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test close() and isClosed() and the constructor method.",
+ method = "close",
+ args = {}
),
- @TestTarget(
- methodName = "isClosed",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test close() and isClosed() and the constructor method.",
+ method = "isClosed",
+ args = {}
),
- @TestTarget(
- methodName = "requery",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test close() and isClosed() and the constructor method.",
+ method = "requery",
+ args = {}
),
- @TestTarget(
- methodName = "CursorWrapper",
- methodArgs = {Cursor.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test close() and isClosed() and the constructor method.",
+ method = "CursorWrapper",
+ args = {android.database.Cursor.class}
)
})
public void testConstrucotorAndClose() {
@@ -112,17 +118,18 @@
return cursor;
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "getCount",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getCount",
+ args = {}
),
- @TestTarget(
- methodName = "requery",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "requery",
+ args = {}
)
})
public void testGetCount() {
@@ -159,21 +166,24 @@
rebuildDatabase();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test deactivate(), registerDataSetObserver and unregisterDataSetObserver methods.",
- targets = {
- @TestTarget(
- methodName = "deactivate",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "deactivate",
+ args = {}
),
- @TestTarget(
- methodName = "registerDataSetObserver",
- methodArgs = {DataSetObserver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "registerDataSetObserver",
+ args = {android.database.DataSetObserver.class}
),
- @TestTarget(
- methodName = "unregisterDataSetObserver",
- methodArgs = {DataSetObserver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "unregisterDataSetObserver",
+ args = {android.database.DataSetObserver.class}
)
})
public void testDeactivate() throws IllegalStateException {
@@ -232,30 +242,36 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getColumnCount(), getColumnIndex(String), getColumnIndexOrThrow()String and "
- + "getColumnName(int), getColumnNames().",
- targets = {
- @TestTarget(
- methodName = "getColumnCount",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getColumnCount()",
+ method = "getColumnCount",
+ args = {}
),
- @TestTarget(
- methodName = "getColumnIndex",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getColumnIndex(String)",
+ method = "getColumnIndex",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "getColumnIndexOrThrow",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getColumnIndexOrThrow(String)",
+ method = "getColumnIndexOrThrow",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "getColumnName",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getColumnName(int).",
+ method = "getColumnName",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getColumnNames",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getColumnNames().",
+ method = "getColumnNames",
+ args = {}
)
})
public void testGettingColumnInfos() {
@@ -287,53 +303,72 @@
assertEquals("number", columnNames[1]);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test cursor positioning related fuctions.",
- targets = {
- @TestTarget(
- methodName = "moveToFirst",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "moveToFirst",
+ args = {}
),
- @TestTarget(
- methodName = "isAfterLast",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "isAfterLast",
+ args = {}
),
- @TestTarget(
- methodName = "isBeforeFirst",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "isBeforeFirst",
+ args = {}
),
- @TestTarget(
- methodName = "isFirst",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "isFirst",
+ args = {}
),
- @TestTarget(
- methodName = "isLast",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "isLast",
+ args = {}
),
- @TestTarget(
- methodName = "moveToLast",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "moveToLast",
+ args = {}
),
- @TestTarget(
- methodName = "move",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "move",
+ args = {int.class}
),
- @TestTarget(
- methodName = "moveToPosition",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "moveToPosition",
+ args = {int.class}
),
- @TestTarget(
- methodName = "moveToNext",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "moveToNext",
+ args = {}
),
- @TestTarget(
- methodName = "getPosition",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "getPosition",
+ args = {}
),
- @TestTarget(
- methodName = "moveToPrevious",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test cursor positioning related fuctions.",
+ method = "moveToPrevious",
+ args = {}
)
})
public void testPositioning() {
@@ -412,45 +447,60 @@
assertTrue(cursorWrapper.isFirst());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test value getting methods.",
- targets = {
- @TestTarget(
- methodName = "getDouble",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getDouble",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getFloat",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getFloat",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getInt",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getInt",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getLong",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getLong",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getShort",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getShort",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getString",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getString",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getBlob",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getBlob",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getColumnCount",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "getColumnCount",
+ args = {}
),
- @TestTarget(
- methodName = "isNull",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test value getting methods.",
+ method = "isNull",
+ args = {int.class}
)
})
public void testGettingValues() {
@@ -529,30 +579,24 @@
mDatabase.execSQL("DROP TABLE test2");
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Tets getExtras().",
- targets = {
- @TestTarget(
- methodName = "getExtras",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Tets getExtras().",
+ method = "getExtras",
+ args = {}
+ )
public void testGetExtras() {
CursorWrapper cursor = new CursorWrapper(getCursor());
Bundle bundle = cursor.getExtras();
assertSame(Bundle.EMPTY, bundle);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test copyStringToBuffer(int, CharArrayBuffer).",
- targets = {
- @TestTarget(
- methodName = "copyStringToBuffer",
- methodArgs = {int.class, CharArrayBuffer.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test copyStringToBuffer(int, CharArrayBuffer).",
+ method = "copyStringToBuffer",
+ args = {int.class, android.database.CharArrayBuffer.class}
+ )
public void testCopyStringToBuffer() {
CharArrayBuffer charArrayBuffer = new CharArrayBuffer(1000);
Cursor cursor = getCursor();
@@ -578,15 +622,12 @@
assertEquals(SECOND_NUMBER, string.substring(0, charArrayBuffer.sizeCopied));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test respond(Bundle).",
- targets = {
- @TestTarget(
- methodName = "respond",
- methodArgs = {Bundle.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test respond(Bundle).",
+ method = "respond",
+ args = {android.os.Bundle.class}
+ )
public void testRespond() {
Bundle b = new Bundle();
CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
@@ -594,31 +635,29 @@
assertSame(Bundle.EMPTY, bundle);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getWantsAllOnMoveCalls()",
- targets = {
- @TestTarget(
- methodName = "getWantsAllOnMoveCalls",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getWantsAllOnMoveCalls()",
+ method = "getWantsAllOnMoveCalls",
+ args = {}
+ )
public void testGetWantsAllOnMoveCalls() {
CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
assertFalse(cursorWrapper.getWantsAllOnMoveCalls());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test registerContentObserver and unregisterContentObserver.",
- targets = {
- @TestTarget(
- methodName = "registerContentObserver",
- methodArgs = {ContentObserver.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test registerContentObserver and unregisterContentObserver.",
+ method = "registerContentObserver",
+ args = {android.database.ContentObserver.class}
),
- @TestTarget(
- methodName = "unregisterContentObserver",
- methodArgs = {ContentObserver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test registerContentObserver and unregisterContentObserver.",
+ method = "unregisterContentObserver",
+ args = {android.database.ContentObserver.class}
)
})
public void testContentObsererOperations() throws IllegalStateException {
@@ -655,15 +694,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setNotificationUri().",
- targets = {
- @TestTarget(
- methodName = "setNotificationUri",
- methodArgs = {ContentResolver.class, Uri.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setNotificationUri().",
+ method = "setNotificationUri",
+ args = {android.content.ContentResolver.class, android.net.Uri.class}
+ )
public void testSetNotificationUri() {
String MOCK_URI = "content://cursorwrappertest/testtable";
CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
diff --git a/tests/tests/database/src/android/database/cts/DataSetObservableTest.java b/tests/tests/database/src/android/database/cts/DataSetObservableTest.java
index 42c440f..8347bcb 100644
--- a/tests/tests/database/src/android/database/cts/DataSetObservableTest.java
+++ b/tests/tests/database/src/android/database/cts/DataSetObservableTest.java
@@ -29,13 +29,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test notifyChanged and notifyInvalidated.",
method = "notifyChanged",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test notifyChanged and notifyInvalidated.",
method = "notifyInvalidated",
args = {}
diff --git a/tests/tests/database/src/android/database/cts/DataSetObserverTest.java b/tests/tests/database/src/android/database/cts/DataSetObserverTest.java
index 5a04a09..edc6a0d 100644
--- a/tests/tests/database/src/android/database/cts/DataSetObserverTest.java
+++ b/tests/tests/database/src/android/database/cts/DataSetObserverTest.java
@@ -26,7 +26,7 @@
@TestTargetClass(android.database.DataSetObserver.class)
public class DataSetObserverTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onChanged, and this is an empty method.",
method = "onChanged",
args = {}
@@ -37,7 +37,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test OnInvalidated, and this is an empty method.",
method = "onInvalidated",
args = {}
diff --git a/tests/tests/database/src/android/database/cts/ObservableTest.java b/tests/tests/database/src/android/database/cts/ObservableTest.java
index 649dc8b..fd3dcaf 100644
--- a/tests/tests/database/src/android/database/cts/ObservableTest.java
+++ b/tests/tests/database/src/android/database/cts/ObservableTest.java
@@ -27,13 +27,13 @@
public class ObservableTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test registerObserver(Object.class) and unregisterObserver(Object.class).",
method = "registerObserver",
args = {java.lang.Object.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test registerObserver(Object.class) and unregisterObserver(Object.class).",
method = "unregisterObserver",
args = {java.lang.Object.class}
@@ -87,7 +87,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test unregisterAll method.",
method = "unregisterAll",
args = {}
diff --git a/tests/tests/database/src/android/database/cts/SQLExceptionTest.java b/tests/tests/database/src/android/database/cts/SQLExceptionTest.java
index d740536..d65b636 100644
--- a/tests/tests/database/src/android/database/cts/SQLExceptionTest.java
+++ b/tests/tests/database/src/android/database/cts/SQLExceptionTest.java
@@ -28,13 +28,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of SQLException.",
method = "SQLException",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of SQLException.",
method = "SQLException",
args = {java.lang.String.class}
diff --git a/tests/tests/database/src/android/database/cts/StaleDataExceptionTest.java b/tests/tests/database/src/android/database/cts/StaleDataExceptionTest.java
index 006987e..9c27617 100644
--- a/tests/tests/database/src/android/database/cts/StaleDataExceptionTest.java
+++ b/tests/tests/database/src/android/database/cts/StaleDataExceptionTest.java
@@ -27,13 +27,13 @@
public class StaleDataExceptionTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of StaleDataException.",
method = "StaleDataException",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of StaleDataException.",
method = "StaleDataException",
args = {java.lang.String.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/AvoidXfermode_ModeTest.java b/tests/tests/graphics/src/android/graphics/cts/AvoidXfermode_ModeTest.java
index 499eb35..a2061bb 100644
--- a/tests/tests/graphics/src/android/graphics/cts/AvoidXfermode_ModeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/AvoidXfermode_ModeTest.java
@@ -27,7 +27,7 @@
public class AvoidXfermode_ModeTest extends AndroidTestCase{
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: valueOf",
method = "valueOf",
args = {java.lang.String.class}
@@ -39,14 +39,16 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this "
+ + "enumeration is used as an argument",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this "
+ + "enumeration is used as an argument",
method = "AvoidXfermode",
args = {int.class, int.class, android.graphics.AvoidXfermode.Mode.class}
)
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
index 901bd29..09f0432 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
@@ -38,9 +38,7 @@
@TestTargetClass(BitmapFactory.class)
public class BitmapFactoryTest extends AndroidTestCase {
-
private Resources mRes;
- private String mPath;
// opt for non-null
private BitmapFactory.Options mOpt1;
// opt for null
@@ -59,21 +57,22 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of BitmapFactory.",
method = "BitmapFactory",
args = {}
)
public void testConstructor() {
// new the BitmapFactory instance
- BitmapFactory bitmapFactory = new BitmapFactory();
+ new BitmapFactory();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeResource(Resources res, int id,BitmapFactory.Options opts).",
method = "decodeResource",
- args = {android.content.res.Resources.class, int.class, android.graphics.BitmapFactory.Options.class}
+ args = {android.content.res.Resources.class, int.class,
+ android.graphics.BitmapFactory.Options.class}
)
public void testDecodeResource1() {
Bitmap b = BitmapFactory.decodeResource(mRes, R.drawable.start,
@@ -87,7 +86,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeResource(Resources res, int id).",
method = "decodeResource",
args = {android.content.res.Resources.class, int.class}
@@ -101,8 +100,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test decodeByteArray(byte[] data, int offset, int length,BitmapFactory.Options opts).",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "decodeByteArray",
args = {byte[].class, int.class, int.class, android.graphics.BitmapFactory.Options.class}
)
@@ -118,7 +117,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeByteArray(byte[] data, int offset, int length).",
method = "decodeByteArray",
args = {byte[].class, int.class, int.class}
@@ -133,10 +132,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeStream(InputStream is, Rect outPadding,BitmapFactory.Options opts).",
method = "decodeStream",
- args = {java.io.InputStream.class, android.graphics.Rect.class, android.graphics.BitmapFactory.Options.class}
+ args = {java.io.InputStream.class, android.graphics.Rect.class,
+ android.graphics.BitmapFactory.Options.class}
)
public void testDecodeStream1() {
InputStream is = obtainInputStream();
@@ -151,7 +151,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeStream(InputStream is).",
method = "decodeStream",
args = {java.io.InputStream.class}
@@ -166,10 +166,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test decodeFileDescriptor(FileDescriptor fd, Rect outPadding,BitmapFactory.Options opts).",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "decodeFileDescriptor",
- args = {java.io.FileDescriptor.class, android.graphics.Rect.class, android.graphics.BitmapFactory.Options.class}
+ args = {java.io.FileDescriptor.class, android.graphics.Rect.class,
+ android.graphics.BitmapFactory.Options.class}
)
public void testDecodeFileDescriptor1() {
try {
@@ -188,7 +189,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeFileDescriptor(FileDescriptor fd).",
method = "decodeFileDescriptor",
args = {java.io.FileDescriptor.class}
@@ -207,7 +208,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeFile(String pathName, BitmapFactory.Options opts).",
method = "decodeFile",
args = {java.lang.String.class, android.graphics.BitmapFactory.Options.class}
@@ -227,7 +228,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test decodeFile(String pathName).",
method = "decodeFile",
args = {java.lang.String.class}
@@ -276,6 +277,4 @@
} while (read != -1);
return(file.getPath());
}
-
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java
index b539366..5e1889f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java
@@ -25,7 +25,7 @@
@TestTargetClass(BitmapFactory.Options.class)
public class BitmapFactory_OptionsTest extends AndroidTestCase{
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: BitmapFactory.Options",
method = "BitmapFactory.Options",
args = {}
@@ -35,7 +35,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: requestCancelDecode",
method = "requestCancelDecode",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
index 0594614..7be55ec 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
@@ -55,7 +55,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: compress",
method = "compress",
args = {android.graphics.Bitmap.CompressFormat.class, int.class, java.io.OutputStream.class}
@@ -98,7 +98,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: copy",
method = "copy",
args = {android.graphics.Bitmap.Config.class, boolean.class}
@@ -120,7 +120,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: copyPixelsToBuffer",
method = "copyPixelsToBuffer",
args = {java.nio.Buffer.class}
@@ -176,13 +176,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: createBitmap",
method = "createBitmap",
args = {android.graphics.Bitmap.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: createBitmap",
method = "createBitmap",
args = {int[].class, int.class, int.class, android.graphics.Bitmap.Config.class}
@@ -199,7 +199,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: createBitmap",
method = "createBitmap",
args = {android.graphics.Bitmap.class, int.class, int.class, int.class, int.class}
@@ -226,10 +226,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: createBitmap",
method = "createBitmap",
- args = {android.graphics.Bitmap.class, int.class, int.class, int.class, int.class, android.graphics.Matrix.class, boolean.class}
+ args = {android.graphics.Bitmap.class, int.class, int.class, int.class, int.class,
+ android.graphics.Matrix.class, boolean.class}
)
public void testCreateBitmap3(){
mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
@@ -276,7 +277,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: createBitmap",
method = "createBitmap",
args = {int.class, int.class, android.graphics.Bitmap.Config.class}
@@ -290,10 +291,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: createBitmap",
method = "createBitmap",
- args = {int[].class, int.class, int.class, int.class, int.class, android.graphics.Bitmap.Config.class}
+ args = {int[].class, int.class, int.class, int.class, int.class,
+ android.graphics.Bitmap.Config.class}
)
public void testCreateBitmap6(){
int[] colors = createColors(100);
@@ -342,7 +344,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: createScaledBitmap",
method = "createScaledBitmap",
args = {android.graphics.Bitmap.class, int.class, int.class, boolean.class}
@@ -356,7 +358,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: describeContents",
method = "describeContents",
args = {}
@@ -366,7 +368,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: eraseColor",
method = "eraseColor",
args = {int.class}
@@ -398,7 +400,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: extractAlpha",
method = "extractAlpha",
args = {}
@@ -422,7 +424,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: extractAlpha",
method = "extractAlpha",
args = {android.graphics.Paint.class, int[].class}
@@ -446,7 +448,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: finalize",
method = "finalize",
args = {}
@@ -457,7 +459,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getConfig",
method = "getConfig",
args = {}
@@ -475,7 +477,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getHeight",
method = "getHeight",
args = {}
@@ -487,7 +489,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getNinePatchChunk",
method = "getNinePatchChunk",
args = {}
@@ -497,7 +499,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getPixel",
method = "getPixel",
args = {int.class, int.class}
@@ -534,7 +536,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getRowBytes",
method = "getRowBytes",
args = {}
@@ -552,7 +554,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getWidth",
method = "getWidth",
args = {}
@@ -564,7 +566,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: hasAlpha",
method = "hasAlpha",
args = {}
@@ -576,7 +578,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: isMutable",
method = "isMutable",
args = {}
@@ -589,13 +591,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: isRecycled and recycle",
method = "isRecycled",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: isRecycled and recycle",
method = "recycle",
args = {}
@@ -608,7 +610,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: setPixel",
method = "setPixel",
args = {int.class, int.class, int.class}
@@ -657,13 +659,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: setPixels",
method = "setPixels",
args = {int[].class, int.class, int.class, int.class, int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: setPixels",
method = "getPixels",
args = {int[].class, int.class, int.class, int.class, int.class, int.class, int.class}
@@ -767,7 +769,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: writeToParcel",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java b/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
index 3054fe8..06b1996 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
@@ -31,7 +31,7 @@
public class Bitmap_CompressFormatTest extends AndroidTestCase{
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: valueOf",
method = "valueOf",
args = {java.lang.String.class}
@@ -43,16 +43,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this "
+ + "enumeration is used as an argument",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this "
+ + "enumeration is used as an argument",
method = "compress",
- args = {android.graphics.Bitmap.CompressFormat.class, int.class, java.io.OutputStream.class}
+ args = {android.graphics.Bitmap.CompressFormat.class, int.class,
+ java.io.OutputStream.class}
)
})
public void testValues(){
diff --git a/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java b/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
index bd98ef0..c9a7027 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
@@ -27,7 +27,7 @@
public class Bitmap_ConfigTest extends AndroidTestCase{
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: valueOf",
method = "valueOf",
args = {java.lang.String.class}
@@ -41,18 +41,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "createBitmap",
args = {int.class, int.class, android.graphics.Bitmap.Config.class}
)
})
+ // test method: values and tests for the behavior of the methods where this enumeration
+ // is used as an argument
public void testValues(){
Config[] config = Config.values();
diff --git a/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java b/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java
index c92626d..eb1d9f4 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java
@@ -27,7 +27,7 @@
public class BlurMaskFilter_BlurTest extends AndroidTestCase{
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: valueOf",
method = "valueOf",
args = {java.lang.String.class}
@@ -41,18 +41,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "BlurMaskFilter",
args = {float.class, android.graphics.BlurMaskFilter.Blur.class}
)
})
+ // test method: values and tests for the behavior of the methods where this enumeration is
+ // used as an argument
public void testValues(){
Blur[] bulr = Blur.values();
diff --git a/tests/tests/graphics/src/android/graphics/cts/CameraTest.java b/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
index d2e6f38..4eae3fb 100755
--- a/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
@@ -36,7 +36,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: Camera",
method = "Camera",
args = {}
@@ -47,13 +47,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: save and restore, save must be called before restore",
method = "save",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: save and restore, save must be called before restore",
method = "restore",
args = {}
@@ -67,13 +67,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: translate and getMatrix",
method = "translate",
args = {float.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: translate and getMatrix",
method = "getMatrix",
args = {android.graphics.Matrix.class}
@@ -103,13 +103,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: rotateX and getMatrix",
method = "rotateX",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: rotateX and getMatrix",
method = "getMatrix",
args = {android.graphics.Matrix.class}
@@ -139,13 +139,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: rotateY and getMatrix",
method = "rotateY",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: rotateY and getMatrix",
method = "getMatrix",
args = {android.graphics.Matrix.class}
@@ -175,13 +175,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: rotateZ and getMatrix",
method = "rotateZ",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: rotateZ and getMatrix",
method = "getMatrix",
args = {android.graphics.Matrix.class}
@@ -210,7 +210,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: applyToCanvas",
method = "applyToCanvas",
args = {android.graphics.Canvas.class}
@@ -228,7 +228,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: dotWithNormal",
method = "dotWithNormal",
args = {float.class, float.class, float.class}
@@ -238,7 +238,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: finalize",
method = "finalize",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
index 545c856..be57570 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
@@ -90,7 +90,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: Canvas",
method = "Canvas",
args = {}
@@ -101,7 +101,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: Canvas",
method = "Canvas",
args = {android.graphics.Bitmap.class}
@@ -130,13 +130,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: Canvas and getGL",
method = "Canvas",
args = {javax.microedition.khronos.opengles.GL.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: Canvas and getGL",
method = "getGL",
args = {}
@@ -151,7 +151,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: freeGlCaches",
method = "freeGlCaches",
args = {}
@@ -162,7 +162,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: setBitmap",
method = "setBitmap",
args = {android.graphics.Bitmap.class}
@@ -202,19 +202,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setViewport, getWidth and getHeight",
method = "setViewport",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setViewport, getWidth and getHeight",
method = "getWidth",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setViewport, getWidth and getHeight",
method = "getHeight",
args = {}
@@ -237,7 +237,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: isOpaque",
method = "isOpaque",
args = {}
@@ -247,7 +247,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: restore",
method = "restore",
args = {}
@@ -267,13 +267,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: save and restore",
method = "save",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: save and restore",
method = "restore",
args = {}
@@ -309,13 +309,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: save and restore",
method = "save",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: save and restore",
method = "restore",
args = {}
@@ -407,13 +407,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayer and restore",
method = "saveLayer",
args = {android.graphics.RectF.class, android.graphics.Paint.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayer and restore",
method = "restore",
args = {}
@@ -508,14 +508,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayer and restore",
method = "saveLayer",
args = {float.class, float.class, float.class, float.class,
android.graphics.Paint.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayer and restore",
method = "restore",
args = {}
@@ -609,13 +609,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayerAlpha and restore",
method = "saveLayerAlpha",
args = {android.graphics.RectF.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayerAlpha and restore",
method = "restore",
args = {}
@@ -709,13 +709,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayerAlpha and restore",
method = "saveLayerAlpha",
args = {float.class, float.class, float.class, float.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: saveLayerAlpha and restore",
method = "restore",
args = {}
@@ -806,7 +806,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getSaveCount",
method = "getSaveCount",
args = {}
@@ -825,7 +825,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: restoreToCount",
method = "restoreToCount",
args = {int.class}
@@ -869,13 +869,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: getMatrix abd setMatrix",
method = "getMatrix",
args = {android.graphics.Matrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: getMatrix abd setMatrix",
method = "setMatrix",
args = {android.graphics.Matrix.class}
@@ -904,13 +904,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: getMatrix abd setMatrix",
method = "getMatrix",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: getMatrix abd setMatrix",
method = "setMatrix",
args = {android.graphics.Matrix.class}
@@ -937,7 +937,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: translate",
method = "translate",
args = {float.class, float.class}
@@ -961,7 +961,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: scale",
method = "scale",
args = {float.class, float.class}
@@ -985,7 +985,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: scale",
method = "scale",
args = {float.class, float.class, float.class, float.class}
@@ -1009,7 +1009,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: rotate",
method = "rotate",
args = {float.class}
@@ -1033,7 +1033,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: rotate",
method = "rotate",
args = {float.class, float.class, float.class}
@@ -1057,7 +1057,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: skew",
method = "skew",
args = {float.class, float.class}
@@ -1081,7 +1081,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: concat",
method = "concat",
args = {android.graphics.Matrix.class}
@@ -1108,7 +1108,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRect",
method = "clipRect",
args = {android.graphics.RectF.class, android.graphics.Region.Op.class}
@@ -1123,7 +1123,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRect",
method = "clipRect",
args = {android.graphics.Rect.class, android.graphics.Region.Op.class}
@@ -1138,7 +1138,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRect",
method = "clipRect",
args = {android.graphics.RectF.class}
@@ -1148,7 +1148,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRect",
method = "clipRect",
args = {android.graphics.Rect.class}
@@ -1158,10 +1158,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRect",
method = "clipRect",
- args = {float.class, float.class, float.class, float.class, android.graphics.Region.Op.class}
+ args = {float.class, float.class, float.class, float.class,
+ android.graphics.Region.Op.class}
)
public void testClipRect5() {
assertFalse(mCanvas.clipRect(0, 0, 10, 31, Op.DIFFERENCE));
@@ -1173,7 +1174,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRect",
method = "clipRect",
args = {float.class, float.class, float.class, float.class}
@@ -1183,7 +1184,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRect",
method = "clipRect",
args = {int.class, int.class, int.class, int.class}
@@ -1193,7 +1194,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipPath",
method = "clipPath",
args = {android.graphics.Path.class}
@@ -1205,7 +1206,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipPath",
method = "clipPath",
args = {android.graphics.Path.class, android.graphics.Region.Op.class}
@@ -1223,7 +1224,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRegion",
method = "clipRegion",
args = {android.graphics.Region.class}
@@ -1233,7 +1234,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: clipRegion",
method = "clipRegion",
args = {android.graphics.Region.class, android.graphics.Region.Op.class}
@@ -1251,13 +1252,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: getDrawFilter and setDrawFilter",
method = "getDrawFilter",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: getDrawFilter and setDrawFilter",
method = "setDrawFilter",
args = {android.graphics.DrawFilter.class}
@@ -1272,7 +1273,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: quickReject",
method = "quickReject",
args = {android.graphics.RectF.class, android.graphics.Canvas.EdgeType.class}
@@ -1283,7 +1284,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: quickReject",
method = "quickReject",
args = {android.graphics.Path.class, android.graphics.Canvas.EdgeType.class}
@@ -1297,7 +1298,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: quickReject",
method = "quickReject",
args = {float.class, float.class, float.class, float.class,
@@ -1309,7 +1310,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getClipBounds",
method = "getClipBounds",
args = {android.graphics.Rect.class}
@@ -1324,7 +1325,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: getClipBounds",
method = "getClipBounds",
args = {}
@@ -1344,7 +1345,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawRGB",
method = "drawRGB",
args = {int.class, int.class, int.class}
@@ -1362,7 +1363,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawARGB",
method = "drawARGB",
args = {int.class, int.class, int.class, int.class}
@@ -1379,7 +1380,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawColor",
method = "drawColor",
args = {int.class}
@@ -1392,7 +1393,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawColor",
method = "drawColor",
args = {int.class, android.graphics.PorterDuff.Mode.class}
@@ -1417,7 +1418,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPaint",
method = "drawPaint",
args = {android.graphics.Paint.class}
@@ -1429,7 +1430,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPoints",
method = "drawPoints",
args = {float[].class, int.class, int.class, android.graphics.Paint.class}
@@ -1464,7 +1465,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPoints",
method = "drawPoints",
args = {float[].class, android.graphics.Paint.class}
@@ -1476,7 +1477,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPoint",
method = "drawPoint",
args = {float.class, float.class, android.graphics.Paint.class}
@@ -1488,7 +1489,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawLine",
method = "drawLine",
args = {float.class, float.class, float.class, float.class, android.graphics.Paint.class}
@@ -1500,7 +1501,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawLines",
method = "drawLines",
args = {float[].class, int.class, int.class, android.graphics.Paint.class}
@@ -1535,7 +1536,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawLines",
method = "drawLines",
args = {float[].class, android.graphics.Paint.class}
@@ -1555,7 +1556,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawRect",
method = "drawRect",
args = {android.graphics.RectF.class, android.graphics.Paint.class}
@@ -1567,7 +1568,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawRect",
method = "drawRect",
args = {android.graphics.Rect.class, android.graphics.Paint.class}
@@ -1579,7 +1580,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawRect",
method = "drawRect",
args = {float.class, float.class, float.class, float.class, android.graphics.Paint.class}
@@ -1591,7 +1592,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawOval",
method = "drawOval",
args = {android.graphics.RectF.class, android.graphics.Paint.class}
@@ -1610,7 +1611,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawCircle",
method = "drawCircle",
args = {float.class, float.class, float.class, android.graphics.Paint.class}
@@ -1626,7 +1627,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawArc",
method = "drawArc",
args = {android.graphics.RectF.class, float.class, float.class, boolean.class,
@@ -1647,10 +1648,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawRoundRect",
method = "drawRoundRect",
- args = {android.graphics.RectF.class, float.class, float.class, android.graphics.Paint.class}
+ args = {android.graphics.RectF.class, float.class, float.class,
+ android.graphics.Paint.class}
)
public void testDrawRoundRect() {
// abnormal case: RoundRect is null
@@ -1665,7 +1667,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPath",
method = "drawPath",
args = {android.graphics.Path.class, android.graphics.Paint.class}
@@ -1675,7 +1677,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawBitmap",
method = "drawBitmap",
args = {android.graphics.Bitmap.class, float.class, float.class,
@@ -1699,7 +1701,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawBitmap",
method = "drawBitmap",
args = {android.graphics.Bitmap.class, android.graphics.Rect.class,
@@ -1723,7 +1725,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawBitmap",
method = "drawBitmap",
args = {android.graphics.Bitmap.class, android.graphics.Rect.class,
@@ -1747,7 +1749,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawBitmap",
method = "drawBitmap",
args = {int[].class, int.class, int.class, int.class, int.class, int.class,
@@ -1808,7 +1810,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawBitmap",
method = "drawBitmap",
args = {android.graphics.Bitmap.class, android.graphics.Matrix.class,
@@ -1821,7 +1823,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawBitmapMesh",
method = "drawBitmapMesh",
args = {android.graphics.Bitmap.class, int.class, int.class, float[].class,
@@ -1896,7 +1898,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawVertices",
method = "drawVertices",
args = {android.graphics.Canvas.VertexMode.class, int.class, float[].class,
@@ -1970,7 +1972,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawText",
method = "drawText",
args = {char[].class, int.class, int.class, float.class, float.class,
@@ -2010,7 +2012,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawText",
method = "drawText",
args = {java.lang.String.class, float.class, float.class, android.graphics.Paint.class}
@@ -2020,7 +2022,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawText",
method = "drawText",
args = {java.lang.String.class, int.class, int.class, float.class, float.class,
@@ -2066,7 +2068,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawText",
method = "drawText",
args = {java.lang.CharSequence.class, int.class, int.class, float.class, float.class,
@@ -2090,7 +2092,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPosText",
method = "drawPosText",
args = {char[].class, int.class, int.class, float[].class, android.graphics.Paint.class}
@@ -2135,7 +2137,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPosText",
method = "drawPosText",
args = {java.lang.String.class, float[].class, android.graphics.Paint.class}
@@ -2162,7 +2164,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawTextOnPath",
method = "drawTextOnPath",
args = {char[].class, int.class, int.class, android.graphics.Path.class,
@@ -2195,7 +2197,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawTextOnPath",
method = "drawTextOnPath",
args = {java.lang.String.class, android.graphics.Path.class, float.class,
@@ -2214,7 +2216,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPicture",
method = "drawPicture",
args = {android.graphics.Picture.class}
@@ -2224,7 +2226,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPicture",
method = "drawPicture",
args = {android.graphics.Picture.class, android.graphics.RectF.class}
@@ -2241,7 +2243,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: drawPicture",
method = "drawPicture",
args = {android.graphics.Picture.class, android.graphics.Rect.class}
@@ -2258,7 +2260,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: finalize",
method = "finalize",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java b/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java
index 5ec4bd4..4bf8fc3 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java
@@ -29,7 +29,7 @@
public class Canvas_EdgeTypeTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: valueOf",
method = "valueOf",
args = {java.lang.String.class}
@@ -41,28 +41,33 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this"
+ + "enumeration is used as an argument",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this"
+ + "enumeration is used as an argument",
method = "quickReject",
args = {android.graphics.Path.class, android.graphics.Canvas.EdgeType.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this"
+ + "enumeration is used as an argument",
method = "quickReject",
args = {android.graphics.RectF.class, android.graphics.Canvas.EdgeType.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this"
+ + "enumeration is used as an argument",
method = "quickReject",
- args = {int.class, int.class, int.class, int.class, android.graphics.Canvas.EdgeType.class}
+ args = {int.class, int.class, int.class, int.class,
+ android.graphics.Canvas.EdgeType.class}
)
})
public void testValues(){
diff --git a/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java b/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java
index ffe62f2..ebc4562 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java
@@ -30,7 +30,7 @@
public class Canvas_VertexModeTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: valueOf",
method = "valueOf",
args = {java.lang.String.class}
@@ -43,16 +43,21 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this"
+ + "enumeration is used as an argument",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "test method: values and tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "test method: values and tests for the behavior of the methods where this"
+ + "enumeration is used as an argument",
method = "drawVertices",
- args = {android.graphics.Canvas.VertexMode.class, int.class, java.lang.Float[].class, int.class, java.lang.Float[].class, int.class, java.lang.Integer[].class, int.class, java.lang.Short[].class, int.class, int.class, android.graphics.Paint.class}
+ args = {android.graphics.Canvas.VertexMode.class, int.class, java.lang.Float[].class,
+ int.class, java.lang.Float[].class, int.class, java.lang.Integer[].class,
+ int.class, java.lang.Short[].class, int.class, int.class,
+ android.graphics.Paint.class}
)
})
public void testValues(){
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
index 9da066e..72cd249 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
@@ -42,19 +42,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: ColorMatrix",
method = "ColorMatrix",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: ColorMatrix",
method = "ColorMatrix",
args = {float[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: ColorMatrix",
method = "ColorMatrix",
args = {android.graphics.ColorMatrix.class}
@@ -85,13 +85,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: reset and getArray",
method = "reset",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: reset and getArray",
method = "getArray",
args = {}
@@ -117,13 +117,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: set and getArray",
method = "set",
args = {float[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: set and getArray",
method = "getArray",
args = {}
@@ -152,13 +152,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: set and getArray",
method = "set",
args = {android.graphics.ColorMatrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: set and getArray",
method = "getArray",
args = {}
@@ -187,13 +187,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setRotate and getArray",
method = "setRotate",
args = {int.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setRotate and getArray",
method = "getArray",
args = {}
@@ -230,13 +230,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setSaturation and getArray",
method = "setSaturation",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setSaturation and getArray",
method = "getArray",
args = {}
@@ -270,13 +270,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setScale and getArray",
method = "setScale",
args = {float.class, float.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setScale and getArray",
method = "getArray",
args = {}
@@ -306,13 +306,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setRGB2YUV and getArray",
method = "setRGB2YUV",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setRGB2YUV and getArray",
method = "getArray",
args = {}
@@ -346,13 +346,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setYUV2RGB and getArray",
method = "setYUV2RGB",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setYUV2RGB and getArray",
method = "getArray",
args = {}
@@ -386,13 +386,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: postConcat and getArray",
method = "postConcat",
args = {android.graphics.ColorMatrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: postConcat and getArray",
method = "getArray",
args = {}
@@ -410,13 +410,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: preConcat and getArray",
method = "preConcat",
args = {android.graphics.ColorMatrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: preConcat and getArray",
method = "getArray",
args = {}
@@ -434,13 +434,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setConcat and getArray",
method = "setConcat",
args = {android.graphics.ColorMatrix.class, android.graphics.ColorMatrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test methods: setConcat and getArray",
method = "getArray",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorTest.java
index 71c4da1..e561338 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorTest.java
@@ -27,13 +27,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: alpha and default constructor",
method = "alpha",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: alpha and default constructor",
method = "Color",
args = {}
@@ -42,11 +42,11 @@
public void testAlpha(){
assertEquals(0xff, Color.alpha(Color.RED));
assertEquals(0xff, Color.alpha(Color.YELLOW));
- Color c = new Color();
+ new Color();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: argb",
method = "argb",
args = {int.class, int.class, int.class, int.class}
@@ -57,7 +57,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: blue",
method = "blue",
args = {int.class}
@@ -68,7 +68,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: green",
method = "green",
args = {int.class}
@@ -80,13 +80,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: HSVToColor and colorToHSV",
method = "HSVToColor",
args = {float[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: HSVToColor and colorToHSV",
method = "colorToHSV",
args = {int.class, float[].class}
@@ -109,13 +109,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: HSVToColor and colorToHSV",
method = "HSVToColor",
args = {int.class, float[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: HSVToColor and colorToHSV",
method = "colorToHSV",
args = {int.class, float[].class}
@@ -137,7 +137,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: parseColor",
method = "parseColor",
args = {java.lang.String.class}
@@ -176,7 +176,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: red",
method = "red",
args = {int.class}
@@ -187,7 +187,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: rgb",
method = "rgb",
args = {int.class, int.class, int.class}
@@ -198,7 +198,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test method: RGBToHSV",
method = "RGBToHSV",
args = {int.class, int.class, int.class, float[].class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java
index 6170796..a27a1c8 100644
--- a/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java
@@ -32,7 +32,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of DrawFilter.",
method = "DrawFilter",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java b/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
index db9af40..471cf6e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
@@ -31,13 +31,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Interpolator.",
method = "Interpolator",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Interpolator.",
method = "Interpolator",
args = {int.class, int.class}
@@ -53,13 +53,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset(int valueCount).",
method = "reset",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset(int valueCount).",
method = "getValueCount",
args = {}
@@ -75,19 +75,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset(int valueCount, int frameCount).",
method = "reset",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset(int valueCount, int frameCount).",
method = "getKeyFrameCount",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset(int valueCount, int frameCount).",
method = "getValueCount",
args = {}
@@ -105,13 +105,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test timeToValues(float[] values).",
method = "timeToValues",
args = {float[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test timeToValues(float[] values).",
method = "reset",
args = {int.class}
@@ -149,20 +149,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test timeToValues(int msec, float[] values).",
method = "timeToValues",
args = {int.class, float[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test timeToValues(int msec, float[] values).",
method = "reset",
args = {int.class}
)
})
@ToBeFixed( bug = "", explanation = "This test is broken and needs to be updated.")
- public void TestTimeToValues2() {
+ public void _testTimeToValues2() {
// new the Interpolator instance
Interpolator interpolator = new Interpolator(1);
@@ -209,7 +209,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize().",
method = "finalize",
args = {}
@@ -237,7 +237,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setKeyFrame(int index, int msec, float[] values).",
method = "setKeyFrame",
args = {int.class, int.class, float[].class}
@@ -252,7 +252,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setKeyFrame(int index, int msec, float[] values, float[] blend).",
method = "setKeyFrame",
args = {int.class, int.class, float[].class, float[].class}
@@ -269,7 +269,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setRepeatMirror(float repeatCount, boolean mirror).",
method = "setRepeatMirror",
args = {float.class, boolean.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java b/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
index 0ed9ca6..384a928 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
@@ -32,7 +32,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -43,7 +43,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test values().",
method = "values",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/LayerRasterizerTest.java b/tests/tests/graphics/src/android/graphics/cts/LayerRasterizerTest.java
index eed4d16..da2fa8d 100644
--- a/tests/tests/graphics/src/android/graphics/cts/LayerRasterizerTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/LayerRasterizerTest.java
@@ -33,7 +33,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of LayerRasterizer.",
method = "LayerRasterizer",
args = {}
@@ -45,7 +45,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addLayer(Paint paint, float dx, float dy).",
method = "addLayer",
args = {android.graphics.Paint.class, float.class, float.class}
@@ -60,7 +60,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addLayer(Paint paint).",
method = "addLayer",
args = {android.graphics.Paint.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java
index 7407c41..0686556 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java
@@ -32,7 +32,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of MaskFilter.",
method = "MaskFilter",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
index 9c18438..d8a2d78 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
@@ -38,36 +38,31 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "Matrix",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "Matrix",
args = {android.graphics.Matrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "finalize",
args = {}
)
})
public void testConstractor() {
- Matrix matrix=null;
- try {
- mMatrix = new Matrix();
- matrix = new Matrix(mMatrix);
- } catch (Exception e) {
- fail("shouldn't throw exception");
- }
+ new Matrix();
+ new Matrix(mMatrix);
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "isIdentity",
args = {}
@@ -79,7 +74,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "rectStaysRect",
args = {}
@@ -91,7 +86,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "set",
args = {android.graphics.Matrix.class}
@@ -108,7 +103,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "equals",
args = {java.lang.Object.class}
@@ -123,7 +118,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "reset",
args = {}
@@ -138,7 +133,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setScale",
args = {float.class, float.class}
@@ -152,7 +147,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setScale",
args = {float.class, float.class, float.class, float.class}
@@ -167,7 +162,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setRotate",
args = {float.class}
@@ -180,7 +175,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setRotate",
args = {float.class, float.class, float.class}
@@ -193,7 +188,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setSinCos",
args = {float.class, float.class}
@@ -205,7 +200,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setSinCos",
args = {float.class, float.class, float.class, float.class}
@@ -217,7 +212,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setSkew",
args = {float.class, float.class}
@@ -229,7 +224,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setSkew",
args = {float.class, float.class, float.class, float.class}
@@ -241,7 +236,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setConcat",
args = {android.graphics.Matrix.class, android.graphics.Matrix.class}
@@ -266,7 +261,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preTranslate",
args = {float.class, float.class}
@@ -278,7 +273,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preScale",
args = {float.class, float.class}
@@ -290,7 +285,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preScale",
args = {float.class, float.class, float.class, float.class}
@@ -302,19 +297,20 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preRotate",
args = {float.class}
)
public void testPreRotate() {
assertTrue(mMatrix.preRotate(1f));
- String expect = "[0.9998477, -0.017452406, 0.0][0.017452406, 0.9998477, 0.0][0.0, 0.0, 1.0]";
+ String expect = "[0.9998477, -0.017452406, 0.0][0.017452406, 0.9998477, "
+ + "0.0][0.0, 0.0, 1.0]";
assertEquals(expect, mMatrix.toShortString());
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preRotate",
args = {float.class, float.class, float.class}
@@ -323,12 +319,13 @@
assertTrue(mMatrix.preRotate(1f, 2f, 3f));
float[] values = new float[9];
mMatrix.getValues(values);
- String expect = "[0.9998477, -0.017452406, 0.0526618][0.017452406, 0.9998477, -0.034447942][0.0, 0.0, 1.0]";
+ String expect = "[0.9998477, -0.017452406, 0.0526618][0.017452406, 0.9998477,"
+ + " -0.034447942][0.0, 0.0, 1.0]";
assertEquals(expect, mMatrix.toShortString());
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preSkew",
args = {float.class, float.class}
@@ -340,7 +337,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preSkew",
args = {float.class, float.class, float.class, float.class}
@@ -352,7 +349,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "preConcat",
args = {android.graphics.Matrix.class}
@@ -368,7 +365,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postTranslate",
args = {float.class, float.class}
@@ -380,7 +377,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postScale",
args = {float.class, float.class}
@@ -392,7 +389,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postScale",
args = {float.class, float.class, float.class, float.class}
@@ -404,7 +401,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postRotate",
args = {float.class}
@@ -417,7 +414,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postRotate",
args = {float.class, float.class, float.class}
@@ -430,7 +427,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postSkew",
args = {float.class, float.class}
@@ -442,7 +439,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postSkew",
args = {float.class, float.class, float.class, float.class}
@@ -454,7 +451,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "postConcat",
args = {android.graphics.Matrix.class}
@@ -471,10 +468,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setRectToRect",
- args = {android.graphics.RectF.class, android.graphics.RectF.class, android.graphics.Matrix.ScaleToFit.class}
+ args = {android.graphics.RectF.class, android.graphics.RectF.class,
+ android.graphics.Matrix.ScaleToFit.class}
)
public void testSetRectToRect() {
RectF r1 = new RectF();
@@ -511,7 +509,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "invert",
args = {android.graphics.Matrix.class}
@@ -536,7 +534,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setPolyToPoly",
args = {float[].class, int.class, float[].class, int.class, int.class}
@@ -558,7 +556,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapPoints",
args = {float[].class}
@@ -576,7 +574,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapPoints",
args = {float[].class, float[].class}
@@ -596,7 +594,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapPoints",
args = {float[].class, int.class, float[].class, int.class, int.class}
@@ -616,7 +614,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapVectors",
args = {float[].class}
@@ -635,7 +633,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapVectors",
args = {float[].class, float[].class}
@@ -656,7 +654,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapVectors",
args = {float[].class, int.class, float[].class, int.class, int.class}
@@ -676,7 +674,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapRadius",
args = {float.class}
@@ -689,7 +687,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapRect",
args = {android.graphics.RectF.class}
@@ -711,7 +709,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "mapRect",
args = {android.graphics.RectF.class, android.graphics.RectF.class}
@@ -741,13 +739,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setValues",
args = {float[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "getValues",
args = {float[].class}
@@ -773,7 +771,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "toString",
args = {}
@@ -784,7 +782,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "toShortString",
args = {}
@@ -795,7 +793,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setTranslate",
args = {float.class, float.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java b/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java
index bbafe35..0726875 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java
@@ -32,7 +32,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "values",
args = {}
@@ -46,7 +46,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "valueOf",
args = {java.lang.String.class}
@@ -59,7 +59,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "valueOf",
args = {android.graphics.Matrix.ScaleToFit.class, java.lang.String.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
index 2a5c03e..550446f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
@@ -50,10 +50,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test draw method",
method = "draw",
- args = {android.graphics.Canvas.class, float.class, float.class, android.graphics.Paint.class}
+ args = {android.graphics.Canvas.class, float.class, float.class,
+ android.graphics.Paint.class}
)
@ToBeFixed(bug = "", explanation = "mMovie shouldn't be null")
public void testDraw1() {
@@ -63,7 +64,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test draw method",
method = "draw",
args = {android.graphics.Canvas.class, float.class, float.class}
@@ -75,7 +76,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test decodeFile method",
method = "decodeFile",
args = {java.lang.String.class}
@@ -139,7 +140,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test decodeByteArray",
method = "decodeByteArray",
args = {byte[].class, int.class, int.class}
@@ -160,7 +161,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test decodeStream method",
method = "decodeStream",
args = {java.io.InputStream.class}
@@ -181,7 +182,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test setTime method",
method = "setTime",
args = {int.class}
@@ -196,25 +197,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test get movie properties",
method = "duration",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test get movie properties",
method = "isOpaque",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test get movie properties",
method = "height",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test get movie properties",
method = "width",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index 10d41f2..87ae61e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -52,48 +52,36 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Paint.",
method = "Paint",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Paint.",
method = "Paint",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Paint.",
method = "Paint",
args = {android.graphics.Paint.class}
)
})
public void testConstructor() {
- try {
- new Paint();
- } catch (RuntimeException e) {
- fail("Should not throw a RuntimeException");
- }
+ new Paint();
- try {
- new Paint(1);
- } catch (RuntimeException e) {
- fail("Should not throw a RuntimeException");
- }
+ new Paint(1);
- try {
- Paint p = new Paint();
- Paint p2 = new Paint(p);
- } catch (RuntimeException e) {
- fail("Should not throw a RuntimeException");
- }
+ Paint p = new Paint();
+ new Paint(p);
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test breakText(char[] text, int index, int count, float maxWidth, float[] measuredWidth).",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "breakText",
args = {char[].class, int.class, int.class, float.class, float[].class}
)
@@ -157,10 +145,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test breakText(CharSequence text, int start, int end, boolean measureForwards, float maxWidth, float[] measuredWidth).",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "breakText",
- args = {java.lang.CharSequence.class, int.class, int.class, boolean.class, float.class, float[].class}
+ args = {java.lang.CharSequence.class, int.class, int.class, boolean.class, float.class,
+ float[].class}
)
public void testBreakText2() {
Paint p = new Paint();
@@ -237,8 +226,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test breakText(String text, boolean measureForwards, float maxWidth, float[] measuredWidth).",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "breakText",
args = {java.lang.String.class, boolean.class, float.class, float[].class}
)
@@ -305,7 +294,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Paint src).",
method = "set",
args = {android.graphics.Paint.class}
@@ -374,13 +363,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeCap.",
method = "setStrokeCap",
args = {android.graphics.Paint.Cap.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeCap.",
method = "getStrokeCap",
args = {}
@@ -407,13 +396,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Xfermode.",
method = "setXfermode",
args = {android.graphics.Xfermode.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Xfermode.",
method = "getXfermode",
args = {}
@@ -432,13 +421,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Shader.",
method = "setShader",
args = {android.graphics.Shader.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Shader.",
method = "getShader",
args = {}
@@ -457,13 +446,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAntiAlias(boolean aa) & isAntiAlias().",
method = "setAntiAlias",
args = {boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAntiAlias(boolean aa) & isAntiAlias().",
method = "isAntiAlias",
args = {}
@@ -482,13 +471,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Typeface.",
method = "setTypeface",
args = {android.graphics.Typeface.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Typeface.",
method = "getTypeface",
args = {}
@@ -513,13 +502,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get PathEffect.",
method = "setPathEffect",
args = {android.graphics.PathEffect.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get PathEffect.",
method = "getPathEffect",
args = {}
@@ -538,13 +527,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setFakeBoldText(boolean fakeBoldText) & isFakeBoldText().",
method = "setFakeBoldText",
args = {boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setFakeBoldText(boolean fakeBoldText) & isFakeBoldText().",
method = "isFakeBoldText",
args = {}
@@ -562,13 +551,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeJoin.",
method = "setStrokeJoin",
args = {android.graphics.Paint.Join.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeJoin.",
method = "getStrokeJoin",
args = {}
@@ -595,13 +584,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Style.",
method = "setStyle",
args = {android.graphics.Paint.Style.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Style.",
method = "getStyle",
args = {}
@@ -627,14 +616,13 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFontSpacing().",
method = "getFontSpacing",
args = {}
)
public void testGetFontSpacing() {
Paint p = new Paint();
- Paint.FontMetrics fm = new Paint.FontMetrics();
assertEquals(13.96875f, p.getFontSpacing());
@@ -647,13 +635,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setSubpixelText() and isSubpixelText().",
method = "isSubpixelText",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setSubpixelText() and isSubpixelText().",
method = "setSubpixelText",
args = {boolean.class}
@@ -671,13 +659,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get TextScaleX.",
method = "setTextScaleX",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get TextScaleX.",
method = "getTextScaleX",
args = {}
@@ -699,13 +687,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get MaskFilter.",
method = "setMaskFilter",
args = {android.graphics.MaskFilter.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get MaskFilter.",
method = "getMaskFilter",
args = {}
@@ -724,13 +712,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get ColorFilter.",
method = "setColorFilter",
args = {android.graphics.ColorFilter.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get ColorFilter.",
method = "getColorFilter",
args = {}
@@ -749,13 +737,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Rasterizer.",
method = "setRasterizer",
args = {android.graphics.Rasterizer.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Rasterizer.",
method = "getRasterizer",
args = {}
@@ -773,7 +761,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setARGB(int a, int r, int g, int b).",
method = "setARGB",
args = {int.class, int.class, int.class, int.class}
@@ -790,7 +778,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test ascent().",
method = "ascent",
args = {}
@@ -821,13 +809,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get TextSkewX.",
method = "setTextSkewX",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get TextSkewX.",
method = "getTextSkewX",
args = {}
@@ -848,13 +836,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get TextSize.",
method = "setTextSize",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get TextSize.",
method = "getTextSize",
args = {}
@@ -880,7 +868,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextWidths(char[] text, int index, int count, float[] widths).",
method = "getTextWidths",
args = {char[].class, int.class, int.class, float[].class}
@@ -940,7 +928,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextWidths(CharSequence text, int start, int end, float[] widths).",
method = "getTextWidths",
args = {java.lang.CharSequence.class, int.class, int.class, float[].class}
@@ -1239,7 +1227,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextWidths(String text, int start, int end, float[] widths).",
method = "getTextWidths",
args = {java.lang.String.class, int.class, int.class, float[].class}
@@ -1307,7 +1295,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextWidths(String text, float[] widths).",
method = "getTextWidths",
args = {java.lang.String.class, float[].class}
@@ -1343,13 +1331,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setStrikeThruText & isStrikeThruText().",
method = "isStrikeThruText",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setStrikeThruText & isStrikeThruText().",
method = "setStrikeThruText",
args = {boolean.class}
@@ -1367,13 +1355,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setTextAlign",
args = {android.graphics.Paint.Align.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "getTextAlign",
args = {}
@@ -1393,7 +1381,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFillPath(Path src, Path dst).",
method = "getFillPath",
args = {android.graphics.Path.class, android.graphics.Path.class}
@@ -1415,13 +1403,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Alpha.",
method = "setAlpha",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Alpha.",
method = "getAlpha",
args = {}
@@ -1447,13 +1435,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setFilterBitmap(boolean) & isFilterBitmap().",
method = "isFilterBitmap",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setFilterBitmap(boolean) & isFilterBitmap().",
method = "setFilterBitmap",
args = {boolean.class}
@@ -1471,13 +1459,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Color.",
method = "setColor",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Color.",
method = "getColor",
args = {}
@@ -1503,7 +1491,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextBounds(String text, int start, int end, Rect bounds).",
method = "getTextBounds",
args = {java.lang.String.class, int.class, int.class, android.graphics.Rect.class}
@@ -1574,7 +1562,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextBounds(char[] text, int index, int count, Rect bounds).",
method = "getTextBounds",
args = {char[].class, int.class, int.class, android.graphics.Rect.class}
@@ -1645,7 +1633,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setShadowLayer(float radius, float dx, float dy, int color).",
method = "setShadowLayer",
args = {float.class, float.class, float.class, int.class}
@@ -1656,7 +1644,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFontMetrics(FontMetrics metrics).",
method = "getFontMetrics",
args = {android.graphics.Paint.FontMetrics.class}
@@ -1698,7 +1686,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFontMetrics().",
method = "getFontMetrics",
args = {}
@@ -1735,13 +1723,13 @@
}
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeMiter.",
method = "setStrokeMiter",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeMiter.",
method = "getStrokeMiter",
args = {}
@@ -1762,7 +1750,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clearShadowLayer().",
method = "clearShadowLayer",
args = {}
@@ -1774,13 +1762,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setUnderlineText(boolean underlineText) & isUnderlineText().",
method = "setUnderlineText",
args = {boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setUnderlineText(boolean underlineText) & isUnderlineText().",
method = "isUnderlineText",
args = {}
@@ -1798,13 +1786,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDither(boolean dither) & isDither.",
method = "setDither",
args = {boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDither(boolean dither) & isDither.",
method = "isDither",
args = {}
@@ -1821,7 +1809,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test descent().",
method = "descent",
args = {}
@@ -1852,13 +1840,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Flags.",
method = "setFlags",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Flags.",
method = "getFlags",
args = {}
@@ -1876,13 +1864,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeWidth.",
method = "setStrokeWidth",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get StrokeWidth.",
method = "getStrokeWidth",
args = {}
@@ -1903,7 +1891,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset().",
method = "reset",
args = {}
@@ -1950,13 +1938,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLinearText(boolean) & isLinearText().",
method = "isLinearText",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLinearText(boolean) & isLinearText().",
method = "setLinearText",
args = {boolean.class}
@@ -1973,7 +1961,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize().",
method = "finalize",
args = {}
@@ -1991,7 +1979,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFontMetricsInt(FontMetricsInt fmi).",
method = "getFontMetricsInt",
args = {android.graphics.Paint.FontMetricsInt.class}
@@ -2033,7 +2021,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFontMetricsInt().",
method = "getFontMetricsInt",
args = {}
@@ -2068,7 +2056,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test measureText(char[] text, int index, int count).",
method = "measureText",
args = {char[].class, int.class, int.class}
@@ -2124,7 +2112,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test measureText(String text, int start, int end).",
method = "measureText",
args = {java.lang.String.class, int.class, int.class}
@@ -2184,7 +2172,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test measureText(String text).",
method = "measureText",
args = {java.lang.String.class}
@@ -2237,7 +2225,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test measureText(CharSequence text, int start, int end).",
method = "measureText",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -2499,10 +2487,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextPath(char[] text, int index, int count, float x, float y, Path path).",
method = "getTextPath",
- args = {char[].class, int.class, int.class, float.class, float.class, android.graphics.Path.class}
+ args = {char[].class, int.class, int.class, float.class, float.class,
+ android.graphics.Path.class}
)
public void testGetTextPath1() {
Paint p = new Paint();
@@ -2534,10 +2523,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextPath(String text, int start, int end, float x, float y, Path path).",
method = "getTextPath",
- args = {java.lang.String.class, int.class, int.class, float.class, float.class, android.graphics.Path.class}
+ args = {java.lang.String.class, int.class, int.class, float.class, float.class,
+ android.graphics.Path.class}
)
public void testGetTextPath2() {
Paint p = new Paint();
@@ -2587,4 +2577,3 @@
}
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java
index 514d58e..32651a5 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java
@@ -28,7 +28,7 @@
public class Paint_AlignTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -41,20 +41,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setTextAlign",
args = {android.graphics.Paint.Align.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "getTextAlign",
args = {}
)
@@ -79,4 +79,3 @@
assertEquals(Align.RIGHT, p.getTextAlign());
}
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java
index a717e18..92a3c5f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java
@@ -28,7 +28,7 @@
public class Paint_CapTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -42,20 +42,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setStrokeCap",
args = {android.graphics.Paint.Cap.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "getStrokeCap",
args = {}
)
@@ -80,4 +80,3 @@
assertEquals(Cap.SQUARE, p.getStrokeCap());
}
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java
index 7974552..82ea6cd 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java
@@ -28,18 +28,18 @@
public class Paint_FontMetricsIntTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of FontMetricsInt.",
method = "Paint.FontMetricsInt",
args = {}
)
public void testConstructor() {
// new the FontMetricsInt instance
- Paint.FontMetricsInt fontMetricsInt = new Paint.FontMetricsInt();
+ new Paint.FontMetricsInt();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString().",
method = "toString",
args = {}
@@ -65,4 +65,3 @@
assertEquals(expected, fontMetricsInt.toString());
}
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java
index bb93cf2..365cf7a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java
@@ -28,7 +28,7 @@
public class Paint_JoinTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -41,20 +41,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setStrokeJoin",
args = {android.graphics.Paint.Join.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "getStrokeJoin",
args = {}
)
@@ -79,4 +79,3 @@
assertEquals(Join.BEVEL, p.getStrokeJoin());
}
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java
index b104a6b..9968869 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java
@@ -28,7 +28,7 @@
public class Paint_StyleTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -41,20 +41,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "values",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setStyle",
args = {android.graphics.Paint.Style.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test values().tests for the behavior of the methods where this enumeration is used as an argument",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "getStyle",
args = {}
)
@@ -79,5 +79,3 @@
assertEquals(Style.FILL_AND_STROKE, p.getStyle());
}
}
-
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java b/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java
index d260340..8e12868 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java
@@ -33,7 +33,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -46,7 +46,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test values().",
method = "values",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java
index 4792999..ccb9c10 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java
@@ -27,18 +27,17 @@
public class PathEffectTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PathEffect.",
method = "PathEffect",
args = {}
)
public void testConstructor() {
-
- PathEffect pathEffect = new PathEffect();
+ new PathEffect();
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize().",
method = "finalize",
args = {}
@@ -57,5 +56,4 @@
super.finalize();
}
}
-
}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java b/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
index c488daf..3eea1b4 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
@@ -40,13 +40,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PathMeasure.",
method = "PathMeasure",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PathMeasure.",
method = "PathMeasure",
args = {android.graphics.Path.class, boolean.class}
@@ -67,7 +67,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getPosTan(float distance, float[] pos, float[] tan).",
method = "getPosTan",
args = {float.class, float[].class, float[].class}
@@ -95,7 +95,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test nextContour().",
method = "nextContour",
args = {}
@@ -108,7 +108,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize().",
method = "finalize",
args = {}
@@ -123,7 +123,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLength().",
method = "getLength",
args = {}
@@ -136,7 +136,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isClosed().",
method = "isClosed",
args = {}
@@ -150,7 +150,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPath(Path path, boolean forceClosed).",
method = "setPath",
args = {android.graphics.Path.class, boolean.class}
@@ -161,7 +161,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getSegment(float startD, float stopD, Path dst,boolean startWithMoveTo).",
method = "getSegment",
args = {float.class, float.class, android.graphics.Path.class, boolean.class}
@@ -174,7 +174,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getMatrix(float distance, Matrix matrix, int flags).",
method = "getMatrix",
args = {float.class, android.graphics.Matrix.class, int.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathTest.java b/tests/tests/graphics/src/android/graphics/cts/PathTest.java
index d2d3e36..fd5dd88 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathTest.java
@@ -39,38 +39,35 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Path.",
method = "Path",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Path.",
method = "Path",
args = {android.graphics.Path.class}
)
})
public void testConstructor() {
-
- Path path = null;
// new the Path instance
- path = new Path();
+ new Path();
- path = null;
// another the Path instance with different params
- path = new Path(new Path());
+ new Path(new Path());
}
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRect(RectF rect, Direction dir).",
method = "addRect",
args = {android.graphics.RectF.class, android.graphics.Path.Direction.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRect(RectF rect, Direction dir).",
method = "isEmpty",
args = {}
@@ -88,13 +85,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRect(float left, float top, float right, float bottom,Direction dir).",
method = "addRect",
- args = {float.class, float.class, float.class, float.class, android.graphics.Path.Direction.class}
+ args = {float.class, float.class, float.class, float.class,
+ android.graphics.Path.Direction.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRect(float left, float top, float right, float bottom,Direction dir).",
method = "isEmpty",
args = {}
@@ -110,8 +108,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test moveTo(float x, float y). When this method called, thecurrent point will move to the appointed coordinate, but thereis no more way to get known about whether current point is justin that coordinate correctly",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "moveTo",
args = {float.class, float.class}
)
@@ -128,13 +126,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Path src).",
method = "set",
args = {android.graphics.Path.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Path src).",
method = "isEmpty",
args = {}
@@ -152,13 +150,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get FillType.",
method = "setFillType",
args = {android.graphics.Path.FillType.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get FillType.",
method = "getFillType",
args = {}
@@ -186,13 +184,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rQuadTo(float dx1, float dy1, float dx2, float dy2).",
method = "rQuadTo",
args = {float.class, float.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rQuadTo(float dx1, float dy1, float dx2, float dy2).",
method = "isEmpty",
args = {}
@@ -208,13 +206,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test transform(Matrix matrix, Path dst).",
method = "transform",
args = {android.graphics.Matrix.class, android.graphics.Path.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test transform(Matrix matrix, Path dst).",
method = "isEmpty",
args = {}
@@ -231,8 +229,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test transform(Matrix matrix). The function of this method isalmost the same as transform(Matrix matrix, Path dst) but no dstto show if it works when called, and we can't get any informationin this method when called",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "transform",
args = {android.graphics.Matrix.class}
)
@@ -247,13 +245,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test lineTo(float x, float y).",
method = "lineTo",
args = {float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test lineTo(float x, float y).",
method = "isEmpty",
args = {}
@@ -268,8 +266,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test close(). What does 'close' mean, clear the contour orothers? If clear, why the path is not empty when there is justone path.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "close",
args = {}
)
@@ -287,13 +285,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test quadTo(float x1, float y1, float x2, float y2).",
method = "quadTo",
args = {float.class, float.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test quadTo(float x1, float y1, float x2, float y2).",
method = "isEmpty",
args = {}
@@ -309,13 +307,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addCircle(float x, float y, float radius, Direction dir).",
method = "addCircle",
args = {float.class, float.class, float.class, android.graphics.Path.Direction.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addCircle(float x, float y, float radius, Direction dir).",
method = "isEmpty",
args = {}
@@ -331,14 +329,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test arcTo(RectF oval, float startAngle, float sweepAngle,boolean forceMoveTo).",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "arcTo",
args = {android.graphics.RectF.class, float.class, float.class, boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test arcTo(RectF oval, float startAngle, float sweepAngle,boolean forceMoveTo).",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "isEmpty",
args = {}
)
@@ -354,13 +352,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test arcTo(RectF oval, float startAngle, float sweepAngle).",
method = "arcTo",
args = {android.graphics.RectF.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test arcTo(RectF oval, float startAngle, float sweepAngle).",
method = "isEmpty",
args = {}
@@ -376,7 +374,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test computeBounds(RectF bounds, boolean exact).",
method = "computeBounds",
args = {android.graphics.RectF.class, boolean.class}
@@ -398,13 +396,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test computeBounds(RectF bounds, boolean exact).",
method = "computeBounds",
args = {android.graphics.RectF.class, boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test computeBounds(RectF bounds, boolean exact).",
method = "addRect",
args = {android.graphics.RectF.class, android.graphics.Path.Direction.class}
@@ -427,8 +425,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test rMoveTo(float dx, float dy). When called, the current pointwill move to the appointed coordinate, but there is no more wayto get known about whether current point is just in thatcoordinate correctly",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "rMoveTo",
args = {float.class, float.class}
)
@@ -442,8 +440,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setLastPoint(float dx, float dy). When called, we can'tget any useful information to make sure the point has beencorrectly set",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setLastPoint",
args = {float.class, float.class}
)
@@ -458,13 +456,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rLineTo(float dx, float dy).",
method = "rLineTo",
args = {float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rLineTo(float dx, float dy).",
method = "isEmpty",
args = {}
@@ -479,7 +477,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isEmpty().",
method = "isEmpty",
args = {}
@@ -495,13 +493,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rewind().",
method = "rewind",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rewind().",
method = "isEmpty",
args = {}
@@ -523,7 +521,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addOval(RectF oval, Direction dir).",
method = "addOval",
args = {android.graphics.RectF.class, android.graphics.Path.Direction.class}
@@ -538,8 +536,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test isRect(RectF rect). But what does 'specify' in the note of this method mean? The return always is false?",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "isRect",
args = {android.graphics.RectF.class}
)
@@ -556,8 +554,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test incReserve(int extraPtCount). Maybe this method has littleobvious behavior to test",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "incReserve",
args = {int.class}
)
@@ -570,13 +568,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addPath(Path src, float dx, float dy).",
method = "addPath",
args = {android.graphics.Path.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addPath(Path src, float dx, float dy).",
method = "isEmpty",
args = {}
@@ -594,13 +592,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addPath(Path src).",
method = "addPath",
args = {android.graphics.Path.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addPath(Path src).",
method = "isEmpty",
args = {}
@@ -618,13 +616,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addPath(Path src, Matrix matrix).",
method = "addPath",
args = {android.graphics.Path.class, android.graphics.Matrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addPath(Path src, Matrix matrix).",
method = "isEmpty",
args = {}
@@ -643,13 +641,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRoundRect(RectF rect, float rx, float ry, Direction dir).",
method = "addRoundRect",
- args = {android.graphics.RectF.class, float.class, float.class, android.graphics.Path.Direction.class}
+ args = {android.graphics.RectF.class, float.class, float.class,
+ android.graphics.Path.Direction.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRoundRect(RectF rect, float rx, float ry, Direction dir).",
method = "isEmpty",
args = {}
@@ -666,13 +665,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRoundRect(RectF rect, float[] radii, Direction dir).",
method = "addRoundRect",
- args = {android.graphics.RectF.class, float[].class, android.graphics.Path.Direction.class}
+ args = {android.graphics.RectF.class, float[].class,
+ android.graphics.Path.Direction.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addRoundRect(RectF rect, float[] radii, Direction dir).",
method = "isEmpty",
args = {}
@@ -693,13 +693,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isInverseFillType().",
method = "isInverseFillType",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isInverseFillType().",
method = "setFillType",
args = {android.graphics.Path.FillType.class}
@@ -715,7 +715,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offset(float dx, float dy, Path dst).",
method = "offset",
args = {float.class, float.class, android.graphics.Path.class}
@@ -731,8 +731,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test offset(float dx, float dy). The function of this method isalmost the same as offset(float dx, float dy, Path dst) but no dstto show if it works when called, and we can't get any informationin this method when called",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "offset",
args = {float.class, float.class}
)
@@ -747,13 +747,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test cubicTo(float x1, float y1, float x2, float y2,float x3, float y3).",
method = "cubicTo",
args = {float.class, float.class, float.class, float.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test cubicTo(float x1, float y1, float x2, float y2,float x3, float y3).",
method = "isEmpty",
args = {}
@@ -769,25 +769,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset().",
method = "reset",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset().",
method = "addRect",
args = {android.graphics.RectF.class, android.graphics.Path.Direction.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset().",
method = "set",
args = {android.graphics.Path.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test reset().",
method = "isEmpty",
args = {}
@@ -807,13 +807,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toggleInverseFillType().",
method = "toggleInverseFillType",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toggleInverseFillType().",
method = "isInverseFillType",
args = {}
@@ -828,7 +828,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize().",
method = "finalize",
args = {}
@@ -847,13 +847,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addArc(RectF oval, float startAngle, float sweepAngle).",
method = "addArc",
args = {android.graphics.RectF.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addArc(RectF oval, float startAngle, float sweepAngle).",
method = "isEmpty",
args = {}
@@ -870,13 +870,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rCubicTo(float x1, float y1, float x2, float y2, float x3,float y3).",
method = "rCubicTo",
args = {float.class, float.class, float.class, float.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test rCubicTo(float x1, float y1, float x2, float y2, float x3,float y3).",
method = "isEmpty",
args = {}
@@ -904,4 +904,3 @@
}
}
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java b/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java
index 44159c7..1e180b7 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java
@@ -33,7 +33,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -45,7 +45,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test values().",
method = "values",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java b/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java
index f2b8d46..9b23aec 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java
@@ -33,7 +33,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -47,7 +47,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test values().",
method = "values",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java b/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java
index 2d10d3c..873e016 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java
@@ -35,7 +35,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PixelFormat.",
method = "PixelFormat",
args = {}
@@ -47,8 +47,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test getPixelFormatInfo(int format, PixelFormat info).There are 13 kinds of valid format in PixelFormat.",
+ level = TestLevel.COMPLETE,
+ notes = "There are 13 kinds of valid format in PixelFormat.",
method = "getPixelFormatInfo",
args = {int.class, android.graphics.PixelFormat.class}
)
@@ -137,7 +137,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test formatHasAlpha(int format).",
method = "formatHasAlpha",
args = {int.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PointFTest.java b/tests/tests/graphics/src/android/graphics/cts/PointFTest.java
index 3fa5376..6aa7568 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PointFTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PointFTest.java
@@ -37,19 +37,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PointF.",
method = "PointF",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PointF.",
method = "PointF",
args = {float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PointF.",
method = "PointF",
args = {android.graphics.Point.class}
@@ -73,7 +73,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test negate().",
method = "negate",
args = {}
@@ -86,7 +86,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test length().",
method = "length",
args = {}
@@ -97,7 +97,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test length(float x, float y).",
method = "length",
args = {float.class, float.class}
@@ -107,7 +107,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(float x, float y).",
method = "set",
args = {float.class, float.class}
@@ -120,7 +120,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(PointF p).",
method = "set",
args = {android.graphics.PointF.class}
@@ -134,7 +134,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals(float x, float y).",
method = "equals",
args = {float.class, float.class}
@@ -146,7 +146,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offset(float dx, float dy).",
method = "offset",
args = {float.class, float.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PointTest.java b/tests/tests/graphics/src/android/graphics/cts/PointTest.java
index e7ef809..4af5ca7 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PointTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PointTest.java
@@ -36,19 +36,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Point.",
method = "Point",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Point.",
method = "Point",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Point.",
method = "Point",
args = {android.graphics.Point.class}
@@ -69,7 +69,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(int x, int y).",
method = "set",
args = {int.class, int.class}
@@ -82,7 +82,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals(int x, int y).",
method = "equals",
args = {int.class, int.class}
@@ -94,7 +94,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals(Object o).",
method = "equals",
args = {java.lang.Object.class}
@@ -108,7 +108,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hashCode().",
method = "hashCode",
args = {}
@@ -120,7 +120,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString().",
method = "toString",
args = {}
@@ -133,7 +133,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offset(int dx, int dy).",
method = "offset",
args = {int.class, int.class}
@@ -146,7 +146,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test negate().",
method = "negate",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/PorterDuff_ModeTest.java b/tests/tests/graphics/src/android/graphics/cts/PorterDuff_ModeTest.java
index c3a47af..31d4300 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PorterDuff_ModeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PorterDuff_ModeTest.java
@@ -33,7 +33,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -59,7 +59,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test values().",
method = "values",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/RasterizerTest.java b/tests/tests/graphics/src/android/graphics/cts/RasterizerTest.java
index cfb078e..1e6368a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RasterizerTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RasterizerTest.java
@@ -28,13 +28,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize function",
method = "finalize",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize function",
method = "Rasterizer",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/RectFTest.java b/tests/tests/graphics/src/android/graphics/cts/RectFTest.java
index 0011e2e..18b5b68 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RectFTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RectFTest.java
@@ -18,11 +18,16 @@
import android.graphics.Rect;
import android.graphics.RectF;
+import android.os.Parcel;
import android.test.AndroidTestCase;
import android.util.Log;
import dalvik.annotation.TestTargets;
+import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(RectF.class)
@@ -40,25 +45,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of RectF.",
method = "RectF",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of RectF.",
method = "RectF",
args = {float.class, float.class, float.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of RectF.",
method = "RectF",
args = {android.graphics.RectF.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of RectF.",
method = "RectF",
args = {android.graphics.Rect.class}
@@ -87,7 +92,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test sort().",
method = "sort",
args = {}
@@ -109,7 +114,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(float left, float top, float right, float bottom).",
method = "set",
args = {float.class, float.class, float.class, float.class}
@@ -126,7 +131,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(RectF src).",
method = "set",
args = {android.graphics.RectF.class}
@@ -144,7 +149,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Rect src).",
method = "set",
args = {android.graphics.Rect.class}
@@ -162,7 +167,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersects(float left, float top, float right, float bottom).",
method = "intersects",
args = {float.class, float.class, float.class, float.class}
@@ -186,7 +191,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersects(RectF a, RectF b).",
method = "intersects",
args = {android.graphics.RectF.class, android.graphics.RectF.class}
@@ -207,7 +212,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersect(float left, float top, float right, float bottom).",
method = "intersect",
args = {float.class, float.class, float.class, float.class}
@@ -231,7 +236,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersect(RectF r).",
method = "intersect",
args = {android.graphics.RectF.class}
@@ -259,7 +264,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test union(float left, float top, float right, float bottom).",
method = "union",
args = {float.class, float.class, float.class, float.class}
@@ -315,7 +320,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test union(RectF r).",
method = "union",
args = {android.graphics.RectF.class}
@@ -378,7 +383,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test union(float x, float y).",
method = "union",
args = {float.class, float.class}
@@ -420,8 +425,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test contains(float x, float y).The rect doesn't contain the poit on the right or bottom border.",
+ level = TestLevel.COMPLETE,
+ notes = "The rect doesn't contain the poit on the right or bottom border.",
method = "contains",
args = {float.class, float.class}
)
@@ -436,7 +441,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test contains(float left, float top, float right, float bottom).",
method = "contains",
args = {float.class, float.class, float.class, float.class}
@@ -452,7 +457,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test contains(RectF r).",
method = "contains",
args = {android.graphics.RectF.class}
@@ -473,7 +478,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offset(float dx, float dy).",
method = "offset",
args = {float.class, float.class}
@@ -490,7 +495,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test inset(float dx, float dy).",
method = "inset",
args = {float.class, float.class}
@@ -514,7 +519,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test height().",
method = "height",
args = {}
@@ -525,7 +530,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test width().",
method = "width",
args = {}
@@ -536,7 +541,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offsetTo(float newLeft, float newTop).",
method = "offsetTo",
args = {float.class, float.class}
@@ -553,7 +558,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setEmpty().",
method = "setEmpty",
args = {}
@@ -577,7 +582,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isEmpty().",
method = "isEmpty",
args = {}
@@ -596,7 +601,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test centerX().",
method = "centerX",
args = {}
@@ -613,7 +618,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test centerY().",
method = "centerY",
args = {}
@@ -630,7 +635,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString().",
method = "toString",
args = {}
@@ -652,7 +657,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setIntersect(RectF a, RectF b).",
method = "setIntersect",
args = {android.graphics.RectF.class, android.graphics.RectF.class}
@@ -681,7 +686,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test roundOut(Rect dst).",
method = "roundOut",
args = {android.graphics.Rect.class}
@@ -699,7 +704,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test round(Rect dst).",
method = "round",
args = {android.graphics.Rect.class}
@@ -715,6 +720,4 @@
assertEquals(6, rect.bottom);
}
-
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/RectTest.java b/tests/tests/graphics/src/android/graphics/cts/RectTest.java
index 1346be7..d6f2b76 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RectTest.java
@@ -19,7 +19,6 @@
import android.graphics.Rect;
import android.os.Parcel;
import android.test.AndroidTestCase;
-import android.util.Log;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -27,9 +26,6 @@
@TestTargetClass(Rect.class)
public class RectTest extends AndroidTestCase {
-
- private final static String TAG = "RectTest";
-
private Rect mRect;
@Override
@@ -40,19 +36,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Rect.",
method = "Rect",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Rect.",
method = "Rect",
args = {int.class, int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Rect.",
method = "Rect",
args = {android.graphics.Rect.class}
@@ -76,7 +72,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(int left, int top, int right, int bottom).",
method = "set",
args = {int.class, int.class, int.class, int.class}
@@ -93,7 +89,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Rect src).",
method = "set",
args = {android.graphics.Rect.class}
@@ -111,7 +107,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersects(int left, int top, int right, int bottom).",
method = "intersects",
args = {int.class, int.class, int.class, int.class}
@@ -135,7 +131,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersects(Rect a, Rect b).",
method = "intersects",
args = {android.graphics.Rect.class, android.graphics.Rect.class}
@@ -156,7 +152,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test height().",
method = "height",
args = {}
@@ -167,7 +163,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offsetTo(int newLeft, int newTop).",
method = "offsetTo",
args = {int.class, int.class}
@@ -184,7 +180,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setIntersect(Rect a, Rect b).",
method = "setIntersect",
args = {android.graphics.Rect.class, android.graphics.Rect.class}
@@ -213,7 +209,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test union(int left, int top, int right, int bottom).",
method = "union",
args = {int.class, int.class, int.class, int.class}
@@ -269,7 +265,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test union(Rect r).",
method = "union",
args = {android.graphics.Rect.class}
@@ -332,7 +328,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test union(int x, int y).",
method = "union",
args = {int.class, int.class}
@@ -374,7 +370,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test contains(int x, int y).",
method = "contains",
args = {int.class, int.class}
@@ -390,7 +386,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test contains(int left, int top, int right, int bottom).",
method = "contains",
args = {int.class, int.class, int.class, int.class}
@@ -406,7 +402,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test contains(Rect r).",
method = "contains",
args = {android.graphics.Rect.class}
@@ -427,7 +423,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test width().",
method = "width",
args = {}
@@ -438,7 +434,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isEmpty().",
method = "isEmpty",
args = {}
@@ -457,7 +453,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersect(int left, int top, int right, int bottom).",
method = "intersect",
args = {int.class, int.class, int.class, int.class}
@@ -481,7 +477,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test intersect(Rect r).",
method = "intersect",
args = {android.graphics.Rect.class}
@@ -509,7 +505,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test centerY().",
method = "centerY",
args = {}
@@ -525,30 +521,36 @@
}
- @TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test toString().",
- method = "toString",
- args = {}
- )
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test toString().",
+ method = "toString",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test toString().",
+ method = "toShortString",
+ args = {}
+ )
+ })
public void testToString() {
String expected;
mRect = new Rect();
- Log.d(TAG, "toString() = " + mRect.toString());
expected = "Rect(0, 0 - 0, 0)";
assertEquals(expected, mRect.toString());
mRect = new Rect(1, 2, 3, 4);
- Log.d(TAG, "toString() = " + mRect.toString());
expected = "Rect(1, 2 - 3, 4)";
assertEquals(expected, mRect.toString());
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test sort().",
method = "sort",
args = {}
@@ -570,7 +572,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test centerX().",
method = "centerX",
args = {}
@@ -587,7 +589,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals(Object obj).",
method = "equals",
args = {java.lang.Object.class}
@@ -603,7 +605,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offset(int dx, int dy).",
method = "offset",
args = {int.class, int.class}
@@ -620,7 +622,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test inset(int dx, int dy).",
method = "inset",
args = {int.class, int.class}
@@ -644,7 +646,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setEmpty().",
method = "setEmpty",
args = {}
@@ -668,7 +670,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test exactCenterX().",
method = "exactCenterX",
args = {}
@@ -679,7 +681,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test exactCenterY().",
method = "exactCenterY",
args = {}
@@ -691,13 +693,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test readFromParcel(Parcel in) and writeToParcel(Parcel out, int flags).",
method = "readFromParcel",
args = {android.os.Parcel.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test readFromParcel(Parcel in) and writeToParcel(Parcel out, int flags).",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -721,7 +723,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents().",
method = "describeContents",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java b/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java
index e3b939d..2fb40f6 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java
@@ -20,36 +20,31 @@
import android.graphics.Region;
import android.graphics.RegionIterator;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(RegionIterator.class)
public class RegionIteratorTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of RegionIterator.",
- targets = {
- @TestTarget(
- methodName = "RegionIterator",
- methodArgs = {Region.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of RegionIterator.",
+ method = "RegionIterator",
+ args = {android.graphics.Region.class}
+ )
public void testConstructor() {
new RegionIterator(new Region());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test next(Rect r).",
- targets = {
- @TestTarget(
- methodName = "next",
- methodArgs = {Rect.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test next(Rect r).",
+ method = "next",
+ args = {android.graphics.Rect.class}
+ )
public void testNext() {
Region region = new Region();
region.set(1, 1, 10, 10);
diff --git a/tests/tests/graphics/src/android/graphics/cts/RegionTest.java b/tests/tests/graphics/src/android/graphics/cts/RegionTest.java
index 628eace..e477d25 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RegionTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RegionTest.java
@@ -104,10 +104,10 @@
private Region mRegion;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mRegion = null;
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mRegion = null;
}
private void assertPointsInsideRegion(int[][] area) {
@@ -124,59 +124,55 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Region.",
method = "Region",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Region.",
method = "Region",
args = {android.graphics.Region.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Region.",
method = "Region",
args = {android.graphics.Rect.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Region.",
method = "Region",
args = {int.class, int.class, int.class, int.class}
)
})
public void testConstructor() {
-
// Test Region()
- Region region = new Region();
+ new Region();
// Test Region(Region)
- region = null;
Region oriRegion = new Region();
- region = new Region(oriRegion);
+ new Region(oriRegion);
// Test Region(Rect)
- region = null;
Rect rect = new Rect();
- region = new Region(rect);
+ new Region(rect);
// Test Region(int, int, int, int)
- region = null;
- region = new Region(0, 0, 100, 100);
+ new Region(0, 0, 100, 100);
}
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Region region).",
method = "set",
args = {android.graphics.Region.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Region region).",
method = "getBounds",
args = {}
@@ -196,13 +192,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Rect r).",
method = "set",
args = {android.graphics.Rect.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(Rect r).",
method = "getBounds",
args = {}
@@ -221,13 +217,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(int left, int top, int right, int bottom).",
method = "set",
args = {int.class, int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set(int left, int top, int right, int bottom).",
method = "getBounds",
args = {}
@@ -244,7 +240,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isRect().",
method = "isRect",
args = {}
@@ -259,13 +255,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isComplex().",
method = "isComplex",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isComplex().",
method = "set",
args = {int.class, int.class, int.class, int.class}
@@ -290,7 +286,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test finalize().",
method = "finalize",
args = {}
@@ -315,7 +311,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test quickContains(Rect r).",
method = "quickContains",
args = {android.graphics.Rect.class}
@@ -335,7 +331,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test quickContains(int left, int top, int right, int bottom).",
method = "quickContains",
args = {int.class, int.class, int.class, int.class}
@@ -354,7 +350,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test union(Rect r).",
method = "union",
args = {android.graphics.Rect.class}
@@ -402,7 +398,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test contains(int x, int y).",
method = "contains",
args = {int.class, int.class}
@@ -442,13 +438,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setEmpty() and isEmpty().",
method = "setEmpty",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setEmpty() and isEmpty().",
method = "isEmpty",
args = {}
@@ -466,7 +462,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBounds(Rect r).",
method = "getBounds",
args = {android.graphics.Rect.class}
@@ -493,7 +489,7 @@
////////////////////////////////////////////////////////////////////////////
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test op(Rect r, Op op).",
method = "op",
args = {android.graphics.Rect.class, android.graphics.Region.Op.class}
@@ -726,7 +722,7 @@
////////////////////////////////////////////////////////////////////////////
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test op(int left, int top, int right, int bottom, Op op).",
method = "op",
args = {int.class, int.class, int.class, int.class, android.graphics.Region.Op.class}
@@ -949,7 +945,7 @@
////////////////////////////////////////////////////////////////////////////
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test op(Region region, Op op).",
method = "op",
args = {android.graphics.Region.class, android.graphics.Region.Op.class}
@@ -1182,10 +1178,11 @@
////////////////////////////////////////////////////////////////////////////
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test op(Rect rect, Region region, Op op).",
method = "op",
- args = {android.graphics.Rect.class, android.graphics.Region.class, android.graphics.Region.Op.class}
+ args = {android.graphics.Rect.class, android.graphics.Region.class,
+ android.graphics.Region.Op.class}
)
public void testOp4() {
@@ -1391,10 +1388,11 @@
////////////////////////////////////////////////////////////////////////////
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test op(Region region1, Region region2, Op op).",
method = "op",
- args = {android.graphics.Region.class, android.graphics.Region.class, android.graphics.Region.Op.class}
+ args = {android.graphics.Region.class, android.graphics.Region.class,
+ android.graphics.Region.Op.class}
)
public void testOp5() {
@@ -1596,7 +1594,7 @@
////////////////////////////////////////////////////////////////////////////
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBoundaryPath().",
method = "getBoundaryPath",
args = {}
@@ -1614,7 +1612,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBoundaryPath(Path path).",
method = "getBoundaryPath",
args = {android.graphics.Path.class}
@@ -1644,8 +1642,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setPath(Path path, Region clip).The rect in the region will match the smaller one.",
+ level = TestLevel.COMPLETE,
+ notes = "The rect in the region will match the smaller one.",
method = "setPath",
args = {android.graphics.Path.class, android.graphics.Region.class}
)
@@ -1699,7 +1697,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test translate(int dx, int dy).",
method = "translate",
args = {int.class, int.class}
@@ -1715,7 +1713,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test translate(int dx, int dy, Region dst).",
method = "translate",
args = {int.class, int.class, android.graphics.Region.class}
@@ -1734,7 +1732,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel(Parcel p, int flags).",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -1763,7 +1761,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents().",
method = "describeContents",
args = {}
@@ -1776,7 +1774,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test quickReject(Rect r).",
method = "quickReject",
args = {android.graphics.Rect.class}
@@ -1800,7 +1798,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test quickReject(int left, int top, int right, int bottom).",
method = "quickReject",
args = {int.class, int.class, int.class, int.class}
@@ -1818,7 +1816,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test quickReject(Region rgn).",
method = "quickReject",
args = {android.graphics.Region.class}
diff --git a/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java b/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java
index 7292d52..3f2b95c 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java
@@ -28,7 +28,7 @@
public class Region_OpTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -46,7 +46,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test values().",
method = "values",
args = {}
@@ -71,4 +71,3 @@
}
}
-
diff --git a/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java b/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java
index 459357e..1748994 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java
@@ -29,7 +29,7 @@
@TestTargetClass(android.graphics.Shader.class)
public class ShaderTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Default constructor",
method = "Shader",
args = {}
@@ -40,13 +40,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLocalMatrix(Matrix localM) and getLocalMatrix(Matrix localM).",
method = "setLocalMatrix",
args = {android.graphics.Matrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLocalMatrix(Matrix localM) and getLocalMatrix(Matrix localM).",
method = "getLocalMatrix",
args = {android.graphics.Matrix.class}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
index 1c00906..63495d5 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
@@ -41,23 +41,21 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@TestTargetClass(android.graphics.drawable.ClipDrawable.class)
public class ClipDrawableTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test Constructor",
- targets = {
- @TestTarget(
- methodName = "ClipDrawable",
- methodArgs = {Drawable.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test Constructor",
+ method = "ClipDrawable",
+ args = {android.graphics.drawable.Drawable.class, int.class, int.class}
+ )
public void testClipDrawable() {
new ClipDrawable((Drawable) null, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
@@ -65,15 +63,12 @@
new ClipDrawable(bmpDrawable, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test draw(Canvas)",
- targets = {
- @TestTarget(
- methodName = "draw",
- methodArgs = {Canvas.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test draw(Canvas)",
+ method = "draw",
+ args = {android.graphics.Canvas.class}
+ )
@ToBeFixed(bug = "1400249", explanation = "It will be tested by functional test, " +
"and NPE is not expected.")
public void testDraw() {
@@ -94,15 +89,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getChangingConfigurations()",
- targets = {
- @TestTarget(
- methodName = "getChangingConfigurations",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getChangingConfigurations()",
+ method = "getChangingConfigurations",
+ args = {}
+ )
public void testGetChangingConfigurations() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -119,15 +111,12 @@
assertEquals(3, clipDrawable.getChangingConfigurations());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getConstantState()",
- targets = {
- @TestTarget(
- methodName = "getConstantState",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getConstantState()",
+ method = "getConstantState",
+ args = {}
+ )
public void testGetConstantState() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -141,15 +130,12 @@
assertEquals(1, clipDrawable.getConstantState().getChangingConfigurations());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getIntrinsicHeight()",
- targets = {
- @TestTarget(
- methodName = "getIntrinsicHeight",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getIntrinsicHeight()",
+ method = "getIntrinsicHeight",
+ args = {}
+ )
public void testGetIntrinsicHeight() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -162,15 +148,12 @@
assertEquals(50, clipDrawable.getIntrinsicHeight());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getIntrinsicWidth()",
- targets = {
- @TestTarget(
- methodName = "getIntrinsicWidth",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getIntrinsicWidth()",
+ method = "getIntrinsicWidth",
+ args = {}
+ )
public void testGetIntrinsicWidth() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -183,15 +166,12 @@
assertEquals(100, clipDrawable.getIntrinsicWidth());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getOpacity()",
- targets = {
- @TestTarget(
- methodName = "getOpacity",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getOpacity()",
+ method = "getOpacity",
+ args = {}
+ )
public void testGetOpacity() {
BitmapDrawable bmpDrawable =
new BitmapDrawable(Bitmap.createBitmap(100, 50, Config.RGB_565));
@@ -205,15 +185,12 @@
assertEquals(PixelFormat.TRANSLUCENT, clipDrawable.getOpacity());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getPadding(Rect)",
- targets = {
- @TestTarget(
- methodName = "getPadding",
- methodArgs = {Rect.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getPadding(Rect)",
+ method = "getPadding",
+ args = {android.graphics.Rect.class}
+ )
@ToBeFixed(bug = "1417734", explanation = "NPE is not expected.")
public void testGetPadding() {
MockDrawable mockDrawable = new MockDrawable();
@@ -233,15 +210,13 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test inflate(Resources, XmlPullParser, AttributeSet)",
- targets = {
- @TestTarget(
- methodName = "inflate",
- methodArgs = {Resources.class, XmlPullParser.class, AttributeSet.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test inflate(Resources, XmlPullParser, AttributeSet)",
+ method = "inflate",
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
+ )
public void testInflate() throws XmlPullParserException, IOException {
BitmapDrawable bmpDrawable = new BitmapDrawable();
ClipDrawable clipDrawable = new ClipDrawable(bmpDrawable,
@@ -252,15 +227,12 @@
clipDrawable.inflate(mContext.getResources(), parser, attrs);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test invalidateDrawable(Drawable)",
- targets = {
- @TestTarget(
- methodName = "invalidateDrawable",
- methodArgs = {Drawable.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test invalidateDrawable(Drawable)",
+ method = "invalidateDrawable",
+ args = {android.graphics.drawable.Drawable.class}
+ )
public void testInvalidateDrawable() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -273,15 +245,12 @@
clipDrawable.invalidateDrawable(null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test isStateful()",
- targets = {
- @TestTarget(
- methodName = "isStateful",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isStateful()",
+ method = "isStateful",
+ args = {}
+ )
public void testIsStateful() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -294,15 +263,12 @@
assertFalse(clipDrawable.isStateful());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onBoundsChange(Rect)",
- targets = {
- @TestTarget(
- methodName = "onBoundsChange",
- methodArgs = {Rect.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onBoundsChange(Rect)",
+ method = "onBoundsChange",
+ args = {android.graphics.Rect.class}
+ )
@ToBeFixed(bug = "1417734", explanation = "NPE is not expected.")
public void testOnBoundsChange() {
MockDrawable mockDrawable = new MockDrawable();
@@ -325,15 +291,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onLevelChange(int)",
- targets = {
- @TestTarget(
- methodName = "onLevelChange",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onLevelChange(int)",
+ method = "onLevelChange",
+ args = {int.class}
+ )
public void testOnLevelChange() {
MockDrawable mockDrawable = new MockDrawable();
MockClipDrawable mockClipDrawable = new MockClipDrawable(mockDrawable,
@@ -353,15 +316,12 @@
assertEquals(10000, mockDrawable.getLevel());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onStateChange(int[])",
- targets = {
- @TestTarget(
- methodName = "onStateChange",
- methodArgs = {int[].class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onStateChange(int[])",
+ method = "onStateChange",
+ args = {int[].class}
+ )
public void testOnStateChange() {
MockDrawable mockDrawable = new MockDrawable();
MockClipDrawable mockClipDrawable = new MockClipDrawable(mockDrawable,
@@ -375,15 +335,12 @@
mockClipDrawable.onStateChange(null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test scheduleDrawable(Drawable, Runnable, long)",
- targets = {
- @TestTarget(
- methodName = "scheduleDrawable",
- methodArgs = {Drawable.class, Runnable.class, long.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test scheduleDrawable(Drawable, Runnable, long)",
+ method = "scheduleDrawable",
+ args = {android.graphics.drawable.Drawable.class, java.lang.Runnable.class, long.class}
+ )
public void testScheduleDrawable() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -396,15 +353,12 @@
assertEquals(1000L, callback.getWhen());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setAlpha(int)",
- targets = {
- @TestTarget(
- methodName = "setAlpha",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setAlpha(int)",
+ method = "setAlpha",
+ args = {int.class}
+ )
public void testSetAlpha() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -420,15 +374,12 @@
assertEquals(255, mockDrawable.getAlpha());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setColorFilter(ColorFilter)",
- targets = {
- @TestTarget(
- methodName = "setColorFilter",
- methodArgs = {ColorFilter.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setColorFilter(ColorFilter)",
+ method = "setColorFilter",
+ args = {android.graphics.ColorFilter.class}
+ )
public void testSetColorFilter() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -442,15 +393,12 @@
assertNull(mockDrawable.getColorFilter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setVisible(boolean, boolean)",
- targets = {
- @TestTarget(
- methodName = "setVisible",
- methodArgs = {boolean.class, boolean.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setVisible(boolean, boolean)",
+ method = "setVisible",
+ args = {boolean.class, boolean.class}
+ )
public void testSetVisible() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
@@ -467,15 +415,12 @@
assertTrue(clipDrawable.isVisible());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test unscheduleDrawable(Drawable, Runnable)",
- targets = {
- @TestTarget(
- methodName = "unscheduleDrawable",
- methodArgs = {Drawable.class, Runnable.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test unscheduleDrawable(Drawable, Runnable)",
+ method = "unscheduleDrawable",
+ args = {android.graphics.drawable.Drawable.class, java.lang.Runnable.class}
+ )
public void testUnscheduleDrawable() {
MockDrawable mockDrawable = new MockDrawable();
ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java
index 3dc4eee..af0fbf5 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java
@@ -18,9 +18,9 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
-import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -41,17 +41,18 @@
@TestTargetClass(android.graphics.drawable.ColorDrawable.class)
public class ColorDrawableTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test Constructors",
- targets = {
- @TestTarget(
- methodName = "ColorDrawable",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test Constructors",
+ method = "ColorDrawable",
+ args = {}
),
- @TestTarget(
- methodName = "ColorDrawable",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test Constructors",
+ method = "ColorDrawable",
+ args = {int.class}
)
})
public void testConstructors() {
@@ -60,30 +61,28 @@
new ColorDrawable(1);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test draw(Canvas)",
- targets = {
- @TestTarget(
- methodName = "draw",
- methodArgs = {Canvas.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test draw(Canvas)",
+ method = "draw",
+ args = {android.graphics.Canvas.class}
+ )
@ToBeFixed(bug = "1400249", explanation = "It will be tested by functional test.")
public void testDraw() {
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getAlpha() and setAlpha(int)",
- targets = {
- @TestTarget(
- methodName = "getAlpha",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getAlpha() and setAlpha(int)",
+ method = "getAlpha",
+ args = {}
),
- @TestTarget(
- methodName = "setAlpha",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getAlpha() and setAlpha(int)",
+ method = "setAlpha",
+ args = {int.class}
)
})
public void testAccessAlpha() {
@@ -103,15 +102,12 @@
assertEquals(1, colorDrawable.getAlpha());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getChangingConfigurations()",
- targets = {
- @TestTarget(
- methodName = "getChangingConfigurations",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getChangingConfigurations()",
+ method = "getChangingConfigurations",
+ args = {}
+ )
public void testGetChangingConfigurations() {
final ColorDrawable colorDrawable = new ColorDrawable();
assertEquals(0, colorDrawable.getChangingConfigurations());
@@ -126,15 +122,12 @@
assertEquals(Integer.MAX_VALUE, colorDrawable.getChangingConfigurations());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getConstantState()",
- targets = {
- @TestTarget(
- methodName = "getConstantState",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getConstantState()",
+ method = "getConstantState",
+ args = {}
+ )
public void testGetConstantState() {
final ColorDrawable colorDrawable = new ColorDrawable();
assertNotNull(colorDrawable.getConstantState());
@@ -142,15 +135,12 @@
colorDrawable.getConstantState().getChangingConfigurations());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getOpacity()",
- targets = {
- @TestTarget(
- methodName = "getOpacity",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getOpacity()",
+ method = "getOpacity",
+ args = {}
+ )
public void testGetOpacity() {
ColorDrawable colorDrawable = new ColorDrawable();
assertEquals(PixelFormat.TRANSPARENT, colorDrawable.getOpacity());
@@ -162,15 +152,13 @@
assertEquals(PixelFormat.TRANSLUCENT, colorDrawable.getOpacity());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test inflate(Resources, XmlPullParser, AttributeSet)",
- targets = {
- @TestTarget(
- methodName = "inflate",
- methodArgs = {Resources.class, XmlPullParser.class, AttributeSet.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test inflate(Resources, XmlPullParser, AttributeSet)",
+ method = "inflate",
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
+ )
public void testInflate() throws XmlPullParserException, IOException {
int eventType = -1;
final ColorDrawable colorDrawable = new ColorDrawable();
@@ -197,15 +185,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setColorFilter(ColorFilter)",
- targets = {
- @TestTarget(
- methodName = "setColorFilter",
- methodArgs = {ColorFilter.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setColorFilter(ColorFilter)",
+ method = "setColorFilter",
+ args = {android.graphics.ColorFilter.class}
+ )
public void testSetColorFilter() {
final ColorDrawable colorDrawable = new ColorDrawable();
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
index 8d33f10..bbced5f 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
@@ -53,7 +53,7 @@
@TestTargetClass(Drawable.class)
public class DrawableTest extends AndroidTestCase{
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clearColorFilter()",
method = "clearColorFilter",
args = {}
@@ -73,13 +73,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test copyBounds() and copyBounds(Rect)",
method = "copyBounds",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test copyBounds() and copyBounds(Rect)",
method = "copyBounds",
args = {android.graphics.Rect.class}
@@ -134,7 +134,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test createFromPath(String)",
method = "createFromPath",
args = {java.lang.String.class}
@@ -187,7 +187,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test createFromStream(InputStream, String)",
method = "createFromStream",
args = {java.io.InputStream.class, java.lang.String.class}
@@ -219,7 +219,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test createFromXml(Resources, XmlPullParser)",
method = "createFromXml",
args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class}
@@ -230,10 +230,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test createFromXmlInner(Resources, XmlPullParser, AttributeSet)",
method = "createFromXmlInner",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
public void testCreateFromXmlInner() throws XmlPullParserException, IOException {
XmlPullParser parser = mContext.getResources().getXml(R.drawable.shapedrawable_test);
@@ -255,7 +256,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test draw(Canvas)",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -266,19 +267,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBounds(), setBounds(int, int, int, int) and setBounds(Rect)",
method = "getBounds",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBounds(), setBounds(int, int, int, int) and setBounds(Rect)",
method = "setBounds",
args = {int.class, int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBounds(), setBounds(int, int, int, int) and setBounds(Rect)",
method = "setBounds",
args = {android.graphics.Rect.class}
@@ -310,13 +311,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setChangingConfigurations(int) and getChangingConfigurations()",
method = "getChangingConfigurations",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setChangingConfigurations(int) and getChangingConfigurations()",
method = "setChangingConfigurations",
args = {int.class}
@@ -337,7 +338,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getConstantState(), this function always returns null.",
method = "getConstantState",
args = {}
@@ -348,7 +349,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getCurrent(), this function just returns the object itself.",
method = "getCurrent",
args = {}
@@ -359,7 +360,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIntrinsicHeight(), this function always returns -1.",
method = "getIntrinsicHeight",
args = {}
@@ -370,7 +371,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIntrinsicWidth(), this function always returns -1.",
method = "getIntrinsicWidth",
args = {}
@@ -382,13 +383,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLevel() and setLevel(int)",
method = "getLevel",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLevel() and setLevel(int)",
method = "setLevel",
args = {int.class}
@@ -412,7 +413,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getMinimumHeight()",
method = "getMinimumHeight",
args = {}
@@ -423,7 +424,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getMinimumWidth()",
method = "getMinimumWidth",
args = {}
@@ -434,7 +435,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOpacity()",
method = "getOpacity",
args = {}
@@ -444,7 +445,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getPadding(Rect)",
method = "getPadding",
args = {android.graphics.Rect.class}
@@ -468,13 +469,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getState() and setState(int[])",
method = "getState",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getState() and setState(int[])",
method = "setState",
args = {java.lang.Integer[].class}
@@ -492,7 +493,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTransparentRegion(), this function always returns null.",
method = "getTransparentRegion",
args = {}
@@ -503,10 +504,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test inflate(Resources, XmlPullParser, AttributeSet)",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
@ToBeFixed(bug = "", explanation = "the attribute visible has been set to false " +
"in drawable_test.xml, but isVisible() still returns true")
@@ -521,7 +523,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test invalidateSelf()",
method = "invalidateSelf",
args = {}
@@ -539,7 +541,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isStateful(), this function always returns false.",
method = "isStateful",
args = {}
@@ -551,13 +553,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isVisible()",
method = "isVisible",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isVisible()",
method = "setVisible",
args = {boolean.class, boolean.class}
@@ -578,7 +580,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onBoundsChange(Rect)",
method = "onBoundsChange",
args = {android.graphics.Rect.class}
@@ -591,7 +593,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onLevelChange(int), this function always returns false.",
method = "onLevelChange",
args = {int.class}
@@ -602,7 +604,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onStateChange(int[]), this function always returns false.",
method = "onStateChange",
args = {java.lang.Integer[].class}
@@ -613,7 +615,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test resolveOpacity(int, int)",
method = "resolveOpacity",
args = {int.class, int.class}
@@ -632,7 +634,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test scheduleSelf(Runnable, long)",
method = "scheduleSelf",
args = {java.lang.Runnable.class, long.class}
@@ -648,7 +650,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAlpha(int)",
method = "setAlpha",
args = {int.class}
@@ -658,7 +660,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setCallback(Callback)",
method = "setCallback",
args = {android.graphics.drawable.Drawable.Callback.class}
@@ -675,7 +677,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setColorFilter(int, PorterDuff.Mode)",
method = "setColorFilter",
args = {int.class, android.graphics.PorterDuff.Mode.class}
@@ -688,7 +690,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDither(boolean)",
method = "setDither",
args = {boolean.class}
@@ -701,7 +703,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setFilterBitmap(boolean)",
method = "setFilterBitmap",
args = {boolean.class}
@@ -714,7 +716,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test unscheduleSelf(Runnable)",
method = "unscheduleSelf",
args = {java.lang.Runnable.class}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java
index aeef47b..d5a62af 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java
@@ -26,7 +26,7 @@
@TestTargetClass(Drawable.ConstantState.class)
public class Drawable_ConstantStateTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChangingConfigurations()",
method = "getChangingConfigurations",
args = {}
@@ -36,7 +36,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test newDrawable()",
method = "newDrawable",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
index 21af098..914201d 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
@@ -45,13 +45,13 @@
public class GradientDrawableTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of GradientDrawable.",
method = "GradientDrawable",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of GradientDrawable.",
method = "GradientDrawable",
args = {android.graphics.drawable.GradientDrawable.Orientation.class, int[].class}
@@ -66,7 +66,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getPadding(Rect padding).",
method = "getPadding",
args = {android.graphics.Rect.class}
@@ -97,8 +97,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setCornerRadii(float[] radii). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setCornerRadii",
args = {float[].class}
)
@@ -119,8 +119,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setCornerRadius(float radius). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setCornerRadius",
args = {float.class}
)
@@ -135,8 +135,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setStroke(int width, int color). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setStroke",
args = {int.class, int.class}
)
@@ -151,8 +151,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setStroke(int width, int color, float dashWidth, float dashGap). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setStroke",
args = {int.class, int.class, float.class, float.class}
)
@@ -176,7 +176,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setSize(int width, int height).",
method = "setSize",
args = {int.class, int.class}
@@ -201,8 +201,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setShape(int shape). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setShape",
args = {int.class}
)
@@ -220,8 +220,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setGradientType(int gradient). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setGradientType",
args = {int.class}
)
@@ -239,8 +239,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setGradientCenter(float x, float y). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setGradientCenter",
args = {float.class, float.class}
)
@@ -255,8 +255,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setGradientRadius(float gradientRadius). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setGradientRadius",
args = {float.class}
)
@@ -271,8 +271,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setUseLevel(boolean useLevel). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setUseLevel",
args = {boolean.class}
)
@@ -287,7 +287,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test draw(Canvas canvas). Can not assert.",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -303,8 +303,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setColor(int argb). Can not assert, because GradientState is package protected.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setColor",
args = {int.class}
)
@@ -322,7 +322,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChangingConfigurations().",
method = "getChangingConfigurations",
args = {}
@@ -339,7 +339,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAlpha(int alpha). No getter can not be tested",
method = "setAlpha",
args = {int.class}
@@ -353,7 +353,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDither(boolean dither). No getter can not be tested",
method = "setDither",
args = {boolean.class}
@@ -367,7 +367,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setColorFilter(ColorFilter cf). No getter can not be tested",
method = "setColorFilter",
args = {android.graphics.ColorFilter.class}
@@ -383,7 +383,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOpacity(). The method always return value: PixelFormat.TRANSLUCENT.",
method = "getOpacity",
args = {}
@@ -394,7 +394,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onBoundsChange(Rect r). No getter can not be tested",
method = "onBoundsChange",
args = {android.graphics.Rect.class}
@@ -410,7 +410,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onLevelChange(int level). No getter can not be tested",
method = "onLevelChange",
args = {int.class}
@@ -424,10 +424,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test inflate(Resources r, XmlPullParser parser, AttributeSet attrs). no getter can not be tested",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
@ToBeFixed(bug = "1386429", explanation = "no getter can not be tested, and there" +
" should not be a NullPointerException thrown out.")
@@ -461,7 +462,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIntrinsicWidth().",
method = "getIntrinsicWidth",
args = {}
@@ -476,7 +477,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIntrinsicHeight().",
method = "getIntrinsicHeight",
args = {}
@@ -491,7 +492,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getConstantState().",
method = "getConstantState",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java
index 967d3eb..0e01230 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java
@@ -45,16 +45,17 @@
public class InsetDrawableTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s).",
method = "InsetDrawable",
args = {android.graphics.drawable.Drawable.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s).",
method = "InsetDrawable",
- args = {android.graphics.drawable.Drawable.class, int.class, int.class, int.class, int.class}
+ args = {android.graphics.drawable.Drawable.class, int.class, int.class, int.class,
+ int.class}
)
})
public void testConstructor() {
@@ -67,10 +68,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test inflate(Resources r, XmlPullParser parser, AttributeSet attrs).",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
@ToBeFixed(bug = "1386429", explanation = "no getter can not be tested," +
" and there should not be a NullPointerException thrown out.")
@@ -105,8 +107,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test invalidateDrawable(Drawable who). The param \"who\" is not used in this method.",
+ level = TestLevel.COMPLETE,
+ notes = "The param \"who\" is not used in this method.",
method = "invalidateDrawable",
args = {android.graphics.drawable.Drawable.class}
)
@@ -120,8 +122,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test scheduleDrawable(Drawable who, Runnable what, long when). The param \"who\" is not used in this method.",
+ level = TestLevel.COMPLETE,
+ notes = "The param \"who\" is not used in this method.",
method = "scheduleDrawable",
args = {android.graphics.drawable.Drawable.class, java.lang.Runnable.class, long.class}
)
@@ -143,8 +145,8 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test unscheduleDrawable(Drawable who, Runnable what). The param \"who\" is not used in this method.",
+ level = TestLevel.COMPLETE,
+ notes = "The param \"who\" is not used in this method.",
method = "unscheduleDrawable",
args = {android.graphics.drawable.Drawable.class, java.lang.Runnable.class}
)
@@ -166,7 +168,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test draw(Canvas canvas).",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -190,7 +192,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChangingConfigurations().",
method = "getChangingConfigurations",
args = {}
@@ -207,7 +209,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getPadding(Rect padding).",
method = "getPadding",
args = {android.graphics.Rect.class}
@@ -257,7 +259,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setVisible(boolean visible, boolean restart).",
method = "setVisible",
args = {boolean.class, boolean.class}
@@ -272,7 +274,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAlpha(int alpha).",
method = "setAlpha",
args = {int.class}
@@ -291,7 +293,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setColorFilter(ColorFilter cf).",
method = "setColorFilter",
args = {android.graphics.ColorFilter.class}
@@ -310,7 +312,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOpacity().",
method = "getOpacity",
args = {}
@@ -326,7 +328,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isStateful(). This method always return false.",
method = "isStateful",
args = {}
@@ -338,7 +340,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onStateChange(int[] state).",
method = "onStateChange",
args = {int[].class}
@@ -368,7 +370,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onBoundsChange(Rect bounds).",
method = "onBoundsChange",
args = {android.graphics.Rect.class}
@@ -403,7 +405,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIntrinsicWidth().",
method = "getIntrinsicWidth",
args = {}
@@ -423,7 +425,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIntrinsicHeight().",
method = "getIntrinsicHeight",
args = {}
@@ -443,7 +445,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getConstantState().",
method = "getConstantState",
args = {}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java
index 9afd22a..31aad5a 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java
@@ -57,7 +57,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor.",
method = "LevelListDrawable",
args = {}
@@ -70,7 +70,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link LevelListDrawable#addLevel(int, int, Drawable)}.",
method = "addLevel",
args = {int.class, int.class, android.graphics.drawable.Drawable.class}
@@ -97,7 +97,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link LevelListDrawable#onLevelChange(int)}.",
method = "onLevelChange",
args = {int.class}
@@ -135,10 +135,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link LevelListDrawable#inflate(Resources, XmlPullParser, AttributeSet)}.",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
public void testInflate() throws XmlPullParserException, IOException {
XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
@@ -174,10 +175,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LevelListDrawable#inflate(Resources, XmlPullParser, AttributeSet)} with null parameters.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc of "
+ "LevelListDrawable#inflate(Resources, XmlPullParser, AttributeSet) when param r,"
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java
index 14a7bb3..98397ff 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java
@@ -18,9 +18,10 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -54,17 +55,19 @@
mNinePatchDrawable = getNinePatchDrawable(R.drawable.ninepatch_0);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor.",
- targets = {
- @TestTarget(
- methodName = "NinePatchDrawable",
- methodArgs = {Bitmap.class, byte[].class, Rect.class, String.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor.",
+ method = "NinePatchDrawable",
+ args = {android.graphics.Bitmap.class, byte[].class, android.graphics.Rect.class,
+ java.lang.String.class}
),
- @TestTarget(
- methodName = "NinePatchDrawable",
- methodArgs = {NinePatch.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor.",
+ method = "NinePatchDrawable",
+ args = {android.graphics.NinePatch.class}
)
})
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc of "
@@ -127,15 +130,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#draw(Canvas)}.",
- targets = {
- @TestTarget(
- methodName = "draw",
- methodArgs = {Canvas.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#draw(Canvas)}.",
+ method = "draw",
+ args = {android.graphics.Canvas.class}
+ )
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc of "
+ "NinePatchDrawable#draw(Canvas) when param canvas is null")
public void testDraw() {
@@ -169,15 +169,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getChangingConfigurations()}.",
- targets = {
- @TestTarget(
- methodName = "getChangingConfigurations",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getChangingConfigurations()}.",
+ method = "getChangingConfigurations",
+ args = {}
+ )
public void testGetChangingConfigurations() {
ConstantState constantState = mNinePatchDrawable.getConstantState();
@@ -200,15 +197,12 @@
assertEquals(0xffff, mNinePatchDrawable.getChangingConfigurations());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getPadding(Rect)}.",
- targets = {
- @TestTarget(
- methodName = "getPadding",
- methodArgs = {Rect.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getPadding(Rect)}.",
+ method = "getPadding",
+ args = {android.graphics.Rect.class}
+ )
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc of "
+ "NinePatchDrawable#getPadding(Rect) when param padding is null or "
+ "the insternal padding field is not set ")
@@ -241,15 +235,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#setAlpha(int)}.",
- targets = {
- @TestTarget(
- methodName = "setAlpha",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#setAlpha(int)}.",
+ method = "setAlpha",
+ args = {int.class}
+ )
public void testSetAlpha() {
assertEquals(0xff, mNinePatchDrawable.getPaint().getAlpha());
@@ -263,15 +254,12 @@
assertEquals(0xfe, mNinePatchDrawable.getPaint().getAlpha());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#setColorFilter(ColorFilter)}.",
- targets = {
- @TestTarget(
- methodName = "setColorFilter",
- methodArgs = {ColorFilter.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#setColorFilter(ColorFilter)}.",
+ method = "setColorFilter",
+ args = {android.graphics.ColorFilter.class}
+ )
public void testSetColorFilter() {
assertNull(mNinePatchDrawable.getPaint().getColorFilter());
@@ -283,15 +271,12 @@
assertNull(mNinePatchDrawable.getPaint().getColorFilter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#setDither(boolean)}.",
- targets = {
- @TestTarget(
- methodName = "setDither",
- methodArgs = {boolean.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#setDither(boolean)}.",
+ method = "setDither",
+ args = {boolean.class}
+ )
public void testSetDither() {
assertFalse(mNinePatchDrawable.getPaint().isDither());
@@ -302,15 +287,12 @@
assertFalse(mNinePatchDrawable.getPaint().isDither());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getPaint()}.",
- targets = {
- @TestTarget(
- methodName = "getPaint",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getPaint()}.",
+ method = "getPaint",
+ args = {}
+ )
public void testGetPaint() {
Paint paint = mNinePatchDrawable.getPaint();
assertNotNull(paint);
@@ -318,15 +300,12 @@
assertSame(paint, mNinePatchDrawable.getPaint());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getIntrinsicWidth()}.",
- targets = {
- @TestTarget(
- methodName = "getIntrinsicWidth",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getIntrinsicWidth()}.",
+ method = "getIntrinsicWidth",
+ args = {}
+ )
public void testGetIntrinsicWidth() {
Bitmap bmp = BitmapFactory.decodeResource(mResources, R.drawable.ninepatch_0);
assertEquals(bmp.getWidth(), mNinePatchDrawable.getIntrinsicWidth());
@@ -338,15 +317,12 @@
assertEquals(9, mNinePatchDrawable.getIntrinsicWidth());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getMinimumWidth()}.",
- targets = {
- @TestTarget(
- methodName = "getMinimumWidth",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getMinimumWidth()}.",
+ method = "getMinimumWidth",
+ args = {}
+ )
public void testGetMinimumWidth() {
Bitmap bmp = BitmapFactory.decodeResource(mResources, R.drawable.ninepatch_0);
assertEquals(bmp.getWidth(), mNinePatchDrawable.getMinimumWidth());
@@ -358,15 +334,12 @@
assertEquals(9, mNinePatchDrawable.getMinimumWidth());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getIntrinsicHeight()}.",
- targets = {
- @TestTarget(
- methodName = "getIntrinsicHeight",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getIntrinsicHeight()}.",
+ method = "getIntrinsicHeight",
+ args = {}
+ )
public void testGetIntrinsicHeight() {
Bitmap bmp = BitmapFactory.decodeResource(mResources, R.drawable.ninepatch_0);
assertEquals(bmp.getHeight(), mNinePatchDrawable.getIntrinsicHeight());
@@ -378,15 +351,12 @@
assertEquals(9, mNinePatchDrawable.getIntrinsicHeight());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getMinimumHeight()}.",
- targets = {
- @TestTarget(
- methodName = "getMinimumHeight",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getMinimumHeight()}.",
+ method = "getMinimumHeight",
+ args = {}
+ )
public void testGetMinimumHeight() {
Bitmap bmp = BitmapFactory.decodeResource(mResources, R.drawable.ninepatch_0);
assertEquals(bmp.getHeight(), mNinePatchDrawable.getMinimumHeight());
@@ -398,15 +368,12 @@
assertEquals(9, mNinePatchDrawable.getMinimumHeight());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getOpacity()}.",
- targets = {
- @TestTarget(
- methodName = "getOpacity",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getOpacity()}.",
+ method = "getOpacity",
+ args = {}
+ )
public void testGetOpacity() {
assertEquals(PixelFormat.OPAQUE, mNinePatchDrawable.getOpacity());
@@ -414,15 +381,12 @@
assertEquals(PixelFormat.TRANSLUCENT, mNinePatchDrawable.getOpacity());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getTransparentRegion()}.",
- targets = {
- @TestTarget(
- methodName = "getTransparentRegion",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link NinePatchDrawable#getTransparentRegion()}.",
+ method = "getTransparentRegion",
+ args = {}
+ )
public void testGetTransparentRegion() {
// opaque image
Region r = mNinePatchDrawable.getTransparentRegion();
@@ -443,16 +407,12 @@
assertEquals(new Rect(1, 1, 7, 7), r.getBounds());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link NinePatchDrawable#getConstantState()}. "
- + "This method will refresh the configuraion of the state.",
- targets = {
- @TestTarget(
- methodName = "getConstantState",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "This method will refresh the configuraion of the state.",
+ method = "getConstantState",
+ args = {}
+ )
public void testGetConstantState() {
assertNotNull(mNinePatchDrawable.getConstantState());
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java
index bc9fa4e..a4b1ba4 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java
@@ -49,13 +49,13 @@
public class ShapeDrawableTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Constructors",
method = "ShapeDrawable",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Constructors",
method = "ShapeDrawable",
args = {android.graphics.drawable.shapes.Shape.class}
@@ -70,7 +70,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test draw(Canvas)",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -88,7 +88,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChangingConfigurations()",
method = "getChangingConfigurations",
args = {}
@@ -113,7 +113,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getConstantState()",
method = "getConstantState",
args = {}
@@ -129,13 +129,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setIntrinsicHeight(int) and getIntrinsicHeight()",
method = "setIntrinsicHeight",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setIntrinsicHeight(int) and getIntrinsicHeight()",
method = "getIntrinsicHeight",
args = {}
@@ -157,13 +157,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setIntrinsicWidth(int) and getIntrinsicWidth()",
method = "setIntrinsicWidth",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setIntrinsicWidth(int) and getIntrinsicWidth()",
method = "getIntrinsicWidth",
args = {}
@@ -184,7 +184,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOpacity()",
method = "getOpacity",
args = {}
@@ -206,19 +206,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPadding(int,int,int,int), setPadding(Rect) and getPadding(Rect)",
method = "setPadding",
args = {int.class, int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPadding(int,int,int,int), setPadding(Rect) and getPadding(Rect)",
method = "setPadding",
args = {android.graphics.Rect.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPadding(int,int,int,int), setPadding(Rect) and getPadding(Rect)",
method = "getPadding",
args = {android.graphics.Rect.class}
@@ -270,7 +270,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getPaint()",
method = "getPaint",
args = {}
@@ -284,13 +284,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setShaderFactory(ShaderFactory) and getShaderFactory()",
method = "setShaderFactory",
args = {android.graphics.drawable.ShapeDrawable.ShaderFactory.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setShaderFactory(ShaderFactory) and getShaderFactory()",
method = "getShaderFactory",
args = {}
@@ -316,13 +316,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getShape() and setShape(Shape)",
method = "getShape",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getShape() and setShape(Shape)",
method = "setShape",
args = {android.graphics.drawable.shapes.Shape.class}
@@ -341,10 +341,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test inflate(Resources, XmlPullParser, AttributeSet)",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
public void testInflate() throws XmlPullParserException, IOException {
XmlPullParser parser = getContext().getResources().getXml(R.drawable.shapedrawable_test);
@@ -354,10 +355,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test inflateTag(String, Resources, XmlPullParser, AttributeSet)",
method = "inflateTag",
- args = {java.lang.String.class, android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {java.lang.String.class, android.content.res.Resources.class,
+ org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
)
public void testInflateTag() throws XmlPullParserException, IOException {
Resources resources = getContext().getResources();
@@ -381,7 +383,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onBoundsChange(Rect)",
method = "onBoundsChange",
args = {android.graphics.Rect.class}
@@ -431,10 +433,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onDraw(Shape, Canvas, Paint)",
method = "onDraw",
- args = {android.graphics.drawable.shapes.Shape.class, android.graphics.Canvas.class, android.graphics.Paint.class}
+ args = {android.graphics.drawable.shapes.Shape.class, android.graphics.Canvas.class,
+ android.graphics.Paint.class}
)
@ToBeFixed(bug = "1417734", explanation = "NPE is not expected.")
public void testOnDraw() {
@@ -468,7 +471,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAlpha(int)",
method = "setAlpha",
args = {int.class}
@@ -483,7 +486,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setColorFilter(ColorFilter)",
method = "setColorFilter",
args = {android.graphics.ColorFilter.class}
@@ -500,7 +503,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDither(boolean)",
method = "setDither",
args = {boolean.class}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java
index c404733..c3272e4 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java
@@ -26,7 +26,7 @@
@TestTargetClass(ShapeDrawable.ShaderFactory.class)
public class ShapeDrawable_ShaderFactoryTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test resize(int, int)",
method = "resize",
args = {int.class, int.class}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java
index f767a73..afc2683 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java
@@ -59,7 +59,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor.",
method = "StateListDrawable",
args = {}
@@ -72,7 +72,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link StateListDrawable#addState(int[], Drawable)}.",
method = "addState",
args = {int[].class, android.graphics.drawable.Drawable.class}
@@ -107,7 +107,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link StateListDrawable#isStateful()}.Always returns true.",
method = "isStateful",
args = {}
@@ -117,7 +117,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link StateListDrawable#onStateChange(int[])}.",
method = "onStateChange",
args = {int[].class}
@@ -158,8 +158,9 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link StateListDrawable#onStateChange(int[])}. If drawable with wild card state is added before any other drawables, this drawable is always matched at first",
+ level = TestLevel.COMPLETE,
+ notes = "If drawable with wild card state is added before any other drawables, "
+ + "this drawable is always matched at first",
method = "onStateChange",
args = {int[].class}
)
@@ -174,8 +175,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link StateListDrawable#onStateChange(int[])}. A drawable with null state can be added but NPE will be throw when matching the null state",
+ level = TestLevel.COMPLETE,
method = "onStateChange",
args = {int[].class}
)
@@ -198,10 +198,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link StateListDrawable#inflate(Resources, XmlPullParser, AttributeSet)}.",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
public void testInflate() throws XmlPullParserException, IOException {
XmlResourceParser parser = getResourceParser(R.xml.selector_correct);
@@ -251,10 +252,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link StateListDrawable#inflate(Resources, XmlPullParser, AttributeSet)} with null parameters.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "inflate",
- args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class, android.util.AttributeSet.class}
+ args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class,
+ android.util.AttributeSet.class}
)
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc of "
+ "StateListDrawable#inflate(Resources, XmlPullParser, AttributeSet) when param r,"
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
index 58cfc3d..f0c5058 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
@@ -61,13 +61,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link TransitionDrawable#startTransition(int)}.",
method = "startTransition",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link TransitionDrawable#startTransition(int)}.",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -104,13 +104,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link TransitionDrawable#resetTransition()}.",
method = "resetTransition",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link TransitionDrawable#resetTransition()}.",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -144,13 +144,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link TransitionDrawable#reverseTransition()}.",
method = "reverseTransition",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link TransitionDrawable#reverseTransition()}.",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -194,8 +194,9 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link TransitionDrawable#draw(Canvas)}.Test the method with null canvas. This method is tested in directly with real canvas in other tests of this case.",
+ level = TestLevel.COMPLETE,
+ notes = "Test the method with null canvas. This method is tested in directly with real "
+ + "canvas in other tests of this case.",
method = "draw",
args = {android.graphics.Canvas.class}
)
@@ -211,18 +212,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link TransitionDrawable#setCrossFadeEnabled(boolean)} and {@link TransitionDrawable#isCrossFadeEnabled()}. This boolean takes effect when the drawable is drawn and the effect can not be tested.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setCrossFadeEnabled",
args = {boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link TransitionDrawable#setCrossFadeEnabled(boolean)} and {@link TransitionDrawable#isCrossFadeEnabled()}. This boolean takes effect when the drawable is drawn and the effect can not be tested.",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "isCrossFadeEnabled",
args = {}
)
})
+ // This boolean takes effect when the drawable is drawn and the effect can not be tested.
public void testAccessCrossFadeEnabled() {
assertFalse(mTransitionDrawable.isCrossFadeEnabled());
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 40d77d9..f19f26c 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -31,9 +31,10 @@
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
import android.view.SurfaceHolder;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
/**
@@ -230,39 +231,53 @@
* Test case 1: Take a picture and verify all the callback
* functions are called properly.
*/
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test taking picture. There is some problems in testing autoFocus, setErrorCallback",
- targets = {
- @TestTarget(
- methodName = "startPreview",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "startPreview",
+ args = {}
),
- @TestTarget(
- methodName = "setPreviewDisplay",
- methodArgs = {SurfaceHolder.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setPreviewDisplay",
+ args = {android.view.SurfaceHolder.class}
),
- @TestTarget(
- methodName = "open",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "open",
+ args = {}
),
- @TestTarget(
- methodName = "release",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "release",
+ args = {}
),
- @TestTarget(
- methodName = "takePicture",
- methodArgs = {ShutterCallback.class, PictureCallback.class, PictureCallback.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "takePicture",
+ args = {android.hardware.Camera.ShutterCallback.class,
+ android.hardware.Camera.PictureCallback.class,
+ android.hardware.Camera.PictureCallback.class}
),
- @TestTarget(
- methodName = "setErrorCallback",
- methodArgs = {ErrorCallback.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setErrorCallback",
+ args = {android.hardware.Camera.ErrorCallback.class}
),
- @TestTarget(
- methodName = "autoFocus",
- methodArgs = {AutoFocusCallback.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "autoFocus",
+ args = {android.hardware.Camera.AutoFocusCallback.class}
)
})
+ // There is some problems in testing autoFocus, setErrorCallback
public void testTakePicture() throws Exception {
initializeMessageLooper();
syncLock();
@@ -281,37 +296,48 @@
* Test case 2: Set the preview and
* verify the RawPreviewCallback is called
*/
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Preview test",
- targets = {
- @TestTarget(
- methodName = "stopPreview",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Preview test",
+ method = "stopPreview",
+ args = {}
),
- @TestTarget(
- methodName = "setPreviewCallback",
- methodArgs = {PreviewCallback.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Preview test",
+ method = "setPreviewCallback",
+ args = {android.hardware.Camera.PreviewCallback.class}
),
- @TestTarget(
- methodName = "open",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Preview test",
+ method = "open",
+ args = {}
),
- @TestTarget(
- methodName = "release",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Preview test",
+ method = "release",
+ args = {}
),
- @TestTarget(
- methodName = "startPreview",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Preview test",
+ method = "startPreview",
+ args = {}
),
- @TestTarget(
- methodName = "setPreviewDisplay",
- methodArgs = {SurfaceHolder.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Preview test",
+ method = "setPreviewDisplay",
+ args = {android.view.SurfaceHolder.class}
),
- @TestTarget(
- methodName = "setErrorCallback",
- methodArgs = {ErrorCallback.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Preview test",
+ method = "setErrorCallback",
+ args = {android.hardware.Camera.ErrorCallback.class}
)
})
public void testCheckPreview() throws Exception {
@@ -324,17 +350,18 @@
assertTrue(mRawPreviewCallbackResult);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test AccessParameters",
- targets = {
- @TestTarget(
- methodName = "getParameters",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test AccessParameters",
+ method = "getParameters",
+ args = {}
),
- @TestTarget(
- methodName = "setParameters",
- methodArgs = {Parameters.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test AccessParameters",
+ method = "setParameters",
+ args = {android.hardware.Camera.Parameters.class}
)
})
public void testAccessParameters() {
diff --git a/tests/tests/hardware/src/android/hardware/cts/Camera_ParametersTest.java b/tests/tests/hardware/src/android/hardware/cts/Camera_ParametersTest.java
index 68fbc12..75cd2c4 100644
--- a/tests/tests/hardware/src/android/hardware/cts/Camera_ParametersTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/Camera_ParametersTest.java
@@ -18,87 +18,120 @@
import junit.framework.TestCase;
import android.hardware.Camera.Parameters;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(Parameters.class)
public class Camera_ParametersTest extends TestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "We test Camera.Parameters related methods in CameraTest with testAccessParameters()",
- targets = {
- @TestTarget(
- methodName = "get",
- methodArgs = {String.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "get",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "set",
- methodArgs = {String.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "set",
+ args = {java.lang.String.class, int.class}
),
- @TestTarget(
- methodName = "getInt",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getInt",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "set",
- methodArgs = {String.class, String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "set",
+ args = {java.lang.String.class, java.lang.String.class}
),
- @TestTarget(
- methodName = "getPictureFormat",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getPictureFormat",
+ args = {}
),
- @TestTarget(
- methodName = "setPictureFormat",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setPictureFormat",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getPictureSize",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getPictureSize",
+ args = {}
),
- @TestTarget(
- methodName = "setPictureSize",
- methodArgs = {int.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setPictureSize",
+ args = {int.class, int.class}
),
- @TestTarget(
- methodName = "getPreviewFormat",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getPreviewFormat",
+ args = {}
),
- @TestTarget(
- methodName = "setPreviewFormat",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setPreviewFormat",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getPreviewFrameRate",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getPreviewFrameRate",
+ args = {}
),
- @TestTarget(
- methodName = "setPreviewFrameRate",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setPreviewFrameRate",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getPreviewSize",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getPreviewSize",
+ args = {}
),
- @TestTarget(
- methodName = "setPreviewSize",
- methodArgs = {int.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setPreviewSize",
+ args = {int.class, int.class}
),
- @TestTarget(
- methodName = "flatten",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "flatten",
+ args = {}
),
- @TestTarget(
- methodName = "unflatten",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "unflatten",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "remove",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "remove",
+ args = {java.lang.String.class}
)
})
+ // We test Camera.Parameters related methods in CameraTest with testAccessParameters()
public void testAccessMethods() {
// We test Camera.Parameters related methods in android.hardware.cts.CameraTest
// #testAccessParameters().
diff --git a/tests/tests/hardware/src/android/hardware/cts/Camera_SizeTest.java b/tests/tests/hardware/src/android/hardware/cts/Camera_SizeTest.java
index 5870825..f112a35 100644
--- a/tests/tests/hardware/src/android/hardware/cts/Camera_SizeTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/Camera_SizeTest.java
@@ -19,9 +19,10 @@
import junit.framework.TestCase;
import android.hardware.Camera;
import android.hardware.Camera.Parameters;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(Camera.Size.class)
@@ -34,15 +35,12 @@
private final int HEIGHT3 = 640;
private final int WIDTH3 = 480;
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor",
- targets = {
- @TestTarget(
- methodName = "Camera.Size",
- methodArgs = {int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor",
+ method = "Camera.Size",
+ args = {int.class, int.class}
+ )
public void testConstructor() {
Camera camera = Camera.open();
Parameters parameters = camera.getParameters();
diff --git a/tests/tests/location/src/android/location/cts/AddressTest.java b/tests/tests/location/src/android/location/cts/AddressTest.java
index 9e3f5b7..5b17e39 100644
--- a/tests/tests/location/src/android/location/cts/AddressTest.java
+++ b/tests/tests/location/src/android/location/cts/AddressTest.java
@@ -35,7 +35,7 @@
@TestTargetClass(Address.class)
public class AddressTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "Address",
args = {java.util.Locale.class}
@@ -49,7 +49,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents()",
method = "describeContents",
args = {}
@@ -68,13 +68,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAdminArea(String) and getAdminArea()",
method = "setAdminArea",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAdminArea(String) and getAdminArea()",
method = "getAdminArea",
args = {}
@@ -93,13 +93,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setCountryCode(String) and getCountryCode()",
method = "setCountryCode",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setCountryCode(String) and getCountryCode()",
method = "getCountryCode",
args = {}
@@ -118,13 +118,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setCountryName(String) and getCountryName()",
method = "setCountryName",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setCountryName(String) and getCountryName()",
method = "getCountryName",
args = {}
@@ -143,13 +143,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setExtras(Bundle) and getExtras()",
method = "setExtras",
args = {android.os.Bundle.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setExtras(Bundle) and getExtras()",
method = "getExtras",
args = {}
@@ -174,13 +174,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setFeatureName(String) and getFeatureName()",
method = "setFeatureName",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setFeatureName(String) and getFeatureName()",
method = "getFeatureName",
args = {}
@@ -199,25 +199,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLatitude(double) and getLatitude(), clearLatitude(), hasLatitude()",
method = "setLatitude",
args = {double.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLatitude(double) and getLatitude(), clearLatitude(), hasLatitude()",
method = "getLatitude",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLatitude(double) and getLatitude(), clearLatitude(), hasLatitude()",
method = "clearLatitude",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLatitude(double) and getLatitude(), clearLatitude(), hasLatitude()",
method = "hasLatitude",
args = {}
@@ -243,26 +243,26 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setLongitude(double) and getLongitude(), clearLongitude(), hasLongitude()",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setLongitude",
args = {double.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setLongitude(double) and getLongitude(), clearLongitude(), hasLongitude()",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "getLongitude",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setLongitude(double) and getLongitude(), clearLongitude(), hasLongitude()",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "clearLongitude",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setLongitude(double) and getLongitude(), clearLongitude(), hasLongitude()",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "hasLongitude",
args = {}
)
@@ -287,13 +287,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPhone(String) and getPhone()",
method = "setPhone",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPhone(String) and getPhone()",
method = "getPhone",
args = {}
@@ -314,13 +314,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPostalCode(String) and getPostalCode()",
method = "setPostalCode",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPostalCode(String) and getPostalCode()",
method = "getPostalCode",
args = {}
@@ -339,13 +339,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setThoroughfare(String) and getThoroughfare()",
method = "setThoroughfare",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setThoroughfare(String) and getThoroughfare()",
method = "getThoroughfare",
args = {}
@@ -364,13 +364,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setUrl(String) and getUrl()",
method = "setUrl",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setUrl(String) and getUrl()",
method = "getUrl",
args = {}
@@ -389,13 +389,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setSubAdminArea(String) and getSubAdminArea()",
method = "setSubAdminArea",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setSubAdminArea(String) and getSubAdminArea()",
method = "getSubAdminArea",
args = {}
@@ -413,7 +413,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString()",
method = "toString",
args = {}
@@ -432,20 +432,20 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setAddressLine(int, String) and getMaxAddressLineIndex(), getAddressLine(int)",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "setAddressLine",
args = {int.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setAddressLine(int, String) and getMaxAddressLineIndex(), getAddressLine(int)",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "getMaxAddressLineIndex",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test setAddressLine(int, String) and getMaxAddressLineIndex(), getAddressLine(int)",
+ level = TestLevel.COMPLETE,
+ notes = "",
method = "getAddressLine",
args = {int.class}
)
@@ -485,7 +485,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLocale()",
method = "getLocale",
args = {}
@@ -505,13 +505,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLocality(String) and getLocality()",
method = "setLocality",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setLocality(String) and getLocality()",
method = "getLocality",
args = {}
@@ -529,7 +529,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel(Parcel, int), this function ignores the parameter 'flag'.",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
diff --git a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
index f2ddd21..e8697be 100644
--- a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -41,7 +41,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getNetworkInfo(int networkType).",
method = "getNetworkInfo",
args = {int.class}
@@ -73,13 +73,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isNetworkTypeValid(int networkType).",
method = "isNetworkTypeValid",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isNetworkTypeValid(int networkType).",
method = "getAllNetworkInfo",
args = {}
@@ -97,13 +97,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "getNetworkPreference",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "setNetworkPreference",
args = {int.class}
@@ -133,7 +133,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getAllNetworkInfo().",
method = "getAllNetworkInfo",
args = {}
@@ -149,14 +149,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test startUsingNetworkFeature(int networkType, String feature)."
+ "Only test failure case.",
method = "startUsingNetworkFeature",
args = {int.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test stopUsingNetworkFeature(int networkType, String feature)."
+ "Only test failure case.",
method = "stopUsingNetworkFeature",
@@ -176,12 +176,14 @@
invalidateFeature));
// Should return failure(-1) because MMS is not supported on WIFI.
- assertEquals(failureCode, mCm.startUsingNetworkFeature(ConnectivityManager.TYPE_WIFI, mmsFeature));
- assertEquals(failureCode, mCm.stopUsingNetworkFeature(ConnectivityManager.TYPE_WIFI, mmsFeature));
+ assertEquals(failureCode,
+ mCm.startUsingNetworkFeature(ConnectivityManager.TYPE_WIFI, mmsFeature));
+ assertEquals(failureCode,
+ mCm.stopUsingNetworkFeature(ConnectivityManager.TYPE_WIFI, mmsFeature));
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test requestRouteToHost(int networkType, int hostAddress).",
method = "requestRouteToHost",
args = {int.class, int.class}
@@ -197,7 +199,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getActiveNetworkInfo().",
method = "getActiveNetworkInfo",
args = {}
diff --git a/tests/tests/net/src/android/net/cts/CredentialsTest.java b/tests/tests/net/src/android/net/cts/CredentialsTest.java
index 0f6e49e..fe65805 100644
--- a/tests/tests/net/src/android/net/cts/CredentialsTest.java
+++ b/tests/tests/net/src/android/net/cts/CredentialsTest.java
@@ -28,25 +28,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of Credentials, and test getGid, getPid, getUid.",
method = "Credentials",
args = {int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of Credentials, and test getGid, getPid, getUid.",
method = "getGid",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of Credentials, and test getGid, getPid, getUid.",
method = "getPid",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of Credentials, and test getGid, getPid, getUid.",
method = "getUid",
args = {}
diff --git a/tests/tests/net/src/android/net/cts/DhcpInfoTest.java b/tests/tests/net/src/android/net/cts/DhcpInfoTest.java
index 657d03c..1a1ad47 100644
--- a/tests/tests/net/src/android/net/cts/DhcpInfoTest.java
+++ b/tests/tests/net/src/android/net/cts/DhcpInfoTest.java
@@ -27,7 +27,7 @@
public class DhcpInfoTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test DhcpInfo's constructor.",
method = "DhcpInfo",
args = {}
@@ -37,7 +37,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString function.",
method = "toString",
args = {}
diff --git a/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java b/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java
index 4fb8481..a6511e8 100644
--- a/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java
+++ b/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java
@@ -25,41 +25,51 @@
import android.net.LocalSocketAddress;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@TestTargetClass(LocalServerSocket.class)
public class LocalServerSocketTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test LocalServerSocket",
- targets = {
- @TestTarget(
- methodName = "accept",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test LocalServerSocket",
+ method = "accept",
+ args = {}
),
- @TestTarget(
- methodName = "close",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test LocalServerSocket",
+ method = "close",
+ args = {}
),
- @TestTarget(
- methodName = "getFileDescriptor",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test LocalServerSocket",
+ method = "getFileDescriptor",
+ args = {}
),
- @TestTarget(
- methodName = "getLocalSocketAddress",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test LocalServerSocket",
+ method = "getLocalSocketAddress",
+ args = {}
),
- @TestTarget(
- methodName = "LocalServerSocket",
- methodArgs = {FileDescriptor.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test LocalServerSocket",
+ method = "LocalServerSocket",
+ args = {java.io.FileDescriptor.class}
),
- @TestTarget(
- methodName = "LocalServerSocket",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test LocalServerSocket",
+ method = "LocalServerSocket",
+ args = {java.lang.String.class}
)
})
@ToBeFixed(bug = "1520987", explanation = "Cannot find a proper FileDescriptor for " +
diff --git a/tests/tests/net/src/android/net/cts/LocalSocketAddressTest.java b/tests/tests/net/src/android/net/cts/LocalSocketAddressTest.java
index cc3a1d3..75232c4 100644
--- a/tests/tests/net/src/android/net/cts/LocalSocketAddressTest.java
+++ b/tests/tests/net/src/android/net/cts/LocalSocketAddressTest.java
@@ -34,25 +34,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test LocalSocketAddress",
method = "LocalSocketAddress",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test LocalSocketAddress",
method = "LocalSocketAddress",
args = {java.lang.String.class, android.net.LocalSocketAddress.Namespace.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test LocalSocketAddress",
method = "getName",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test LocalSocketAddress",
method = "getNamespace",
args = {}
@@ -65,17 +65,19 @@
assertEquals(Namespace.ABSTRACT, localSocketAddress.getNamespace());
// specify the namespace
- LocalSocketAddress localSocketAddress2 = new LocalSocketAddress("name2", Namespace.ABSTRACT);
+ LocalSocketAddress localSocketAddress2 =
+ new LocalSocketAddress("name2", Namespace.ABSTRACT);
assertEquals("name2", localSocketAddress2.getName());
assertEquals(Namespace.ABSTRACT, localSocketAddress2.getNamespace());
- LocalSocketAddress localSocketAddress3 = new LocalSocketAddress("name3", Namespace.FILESYSTEM);
+ LocalSocketAddress localSocketAddress3 =
+ new LocalSocketAddress("name3", Namespace.FILESYSTEM);
assertEquals("name3", localSocketAddress3.getName());
assertEquals(Namespace.FILESYSTEM, localSocketAddress3.getNamespace());
- LocalSocketAddress localSocketAddress4 = new LocalSocketAddress("name4", Namespace.RESERVED);
+ LocalSocketAddress localSocketAddress4 =
+ new LocalSocketAddress("name4", Namespace.RESERVED);
assertEquals("name4", localSocketAddress4.getName());
assertEquals(Namespace.RESERVED, localSocketAddress4.getNamespace());
}
}
-
diff --git a/tests/tests/net/src/android/net/cts/LocalSocketAddress_NamespaceTest.java b/tests/tests/net/src/android/net/cts/LocalSocketAddress_NamespaceTest.java
index a9acaa3..5d29c81 100644
--- a/tests/tests/net/src/android/net/cts/LocalSocketAddress_NamespaceTest.java
+++ b/tests/tests/net/src/android/net/cts/LocalSocketAddress_NamespaceTest.java
@@ -32,7 +32,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test valueOf(String name).",
method = "valueOf",
args = {java.lang.String.class}
@@ -44,7 +44,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test values().",
method = "values",
args = {}
@@ -56,4 +56,3 @@
assertEquals(Namespace.FILESYSTEM, expected[2]);
}
}
-
diff --git a/tests/tests/net/src/android/net/cts/LocalSocketTest.java b/tests/tests/net/src/android/net/cts/LocalSocketTest.java
index ae0b51c..8e3cd67 100644
--- a/tests/tests/net/src/android/net/cts/LocalSocketTest.java
+++ b/tests/tests/net/src/android/net/cts/LocalSocketTest.java
@@ -36,73 +36,73 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "LocalSocket",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "close",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "connect",
args = {android.net.LocalSocketAddress.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "getAncillaryFileDescriptors",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "getFileDescriptor",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "getInputStream",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "getOutputStream",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "getPeerCredentials",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "isConnected",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "setFileDescriptorsForSend",
args = {java.io.FileDescriptor[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "shutdownInput",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test core functions of LocalSocket",
method = "shutdownOutput",
args = {}
@@ -192,91 +192,91 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "bind",
args = {android.net.LocalSocketAddress.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "connect",
args = {android.net.LocalSocketAddress.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "getLocalSocketAddress",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "getReceiveBufferSize",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "getRemoteSocketAddress",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "getSendBufferSize",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "getSoTimeout",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "isBound",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "isClosed",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "isInputShutdown",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "isOutputShutdown",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "setReceiveBufferSize",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "setSendBufferSize",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "setSoTimeout",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test secondary functions of LocalSocket",
method = "toString",
args = {}
@@ -285,7 +285,7 @@
public void testAccessors() throws IOException{
LocalSocket socket = new LocalSocket();
LocalSocketAddress addr = new LocalSocketAddress("secondary");
-
+
assertFalse(socket.isBound());
socket.bind(addr);
assertTrue(socket.isBound());
diff --git a/tests/tests/net/src/android/net/cts/MailToTest.java b/tests/tests/net/src/android/net/cts/MailToTest.java
index e419272..e64aaf4 100644
--- a/tests/tests/net/src/android/net/cts/MailToTest.java
+++ b/tests/tests/net/src/android/net/cts/MailToTest.java
@@ -28,7 +28,8 @@
public class MailToTest extends AndroidTestCase {
private static final String MAILTOURI_1 = "mailto:chris@example.com";
private static final String MAILTOURI_2 = "mailto:infobot@example.com?subject=current-issue";
- private static final String MAILTOURI_3 = "mailto:infobot@example.com?body=send%20current-issue";
+ private static final String MAILTOURI_3 =
+ "mailto:infobot@example.com?body=send%20current-issue";
private static final String MAILTOURI_4 = "mailto:infobot@example.com?body=send%20current-" +
"issue%0D%0Asend%20index";
private static final String MAILTOURI_5 = "mailto:joe@example.com?" +
@@ -43,49 +44,49 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "parse",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "isMailTo",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "getTo",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "getSubject",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "getBody",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "getCc",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "toString",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test parse mailto URI.",
method = "getHeaders",
args = {}
@@ -136,7 +137,8 @@
assertEquals("send current-issue\r\nsend index", mailTo_4.getBody());
assertNull(mailTo_4.getCc());
assertNull(mailTo_4.getSubject());
- assertEquals("mailto:?body=send%20current-issue%0D%0Asend%20index&to=infobot%40example.com&",
+ assertEquals(
+ "mailto:?body=send%20current-issue%0D%0Asend%20index&to=infobot%40example.com&",
mailTo_4.toString());
assertTrue(MailTo.isMailTo(MAILTOURI_5));
@@ -164,4 +166,3 @@
mailTo_6.toString());
}
}
-
diff --git a/tests/tests/net/src/android/net/cts/NetworkInfoTest.java b/tests/tests/net/src/android/net/cts/NetworkInfoTest.java
index 5036c4a..46da3ca 100644
--- a/tests/tests/net/src/android/net/cts/NetworkInfoTest.java
+++ b/tests/tests/net/src/android/net/cts/NetworkInfoTest.java
@@ -16,10 +16,6 @@
package android.net.cts;
-import dalvik.annotation.TestInfo;
-import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
import android.content.Context;
@@ -29,6 +25,11 @@
import android.net.NetworkInfo.State;
import android.os.Parcel;
import android.test.AndroidTestCase;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
@TestTargetClass(NetworkInfo.class)
public class NetworkInfoTest extends AndroidTestCase {
@@ -41,65 +42,90 @@
.getSystemService(Context.CONNECTIVITY_SERVICE);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test isConnectedOrConnecting().",
- targets = {
- @TestTarget(
- methodName = "isConnectedOrConnecting",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "isConnectedOrConnecting",
+ args = {}
),
- @TestTarget(
- methodName = "setFailover",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "setFailover",
+ args = {boolean.class}
),
- @TestTarget(
- methodName = "isFailover",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "isFailover",
+ args = {}
),
- @TestTarget(
- methodName = "getType",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "getType",
+ args = {}
),
- @TestTarget(
- methodName = "getTypeName",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "getTypeName",
+ args = {}
),
- @TestTarget(
- methodName = "setIsAvailable",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "setIsAvailable",
+ args = {boolean.class}
),
- @TestTarget(
- methodName = "isAvailable",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "isAvailable",
+ args = {}
),
- @TestTarget(
- methodName = "isConnected",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "isConnected",
+ args = {}
),
- @TestTarget(
- methodName = "describeContents",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "describeContents",
+ args = {}
),
- @TestTarget(
- methodName = "getDetailedState",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "getDetailedState",
+ args = {}
),
- @TestTarget(
- methodName = "getState",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "getState",
+ args = {}
),
- @TestTarget(
- methodName = "getReason",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "getReason",
+ args = {}
),
- @TestTarget(
- methodName = "getExtraInfo",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "getExtraInfo",
+ args = {}
),
- @TestTarget(
- methodName = "toString",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isConnectedOrConnecting().",
+ method = "toString",
+ args = {}
)
})
public void testAccessNetworkInfoProperties() {
@@ -137,17 +163,13 @@
assertNotNull(ni[ConnectivityManager.TYPE_WIFI].toString());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test writeToParcel(Parcel dest, int flags).",
- targets = {
- @TestTarget(
- methodName = "writeToParcel",
- methodArgs = {Parcel.class, Integer.class}
- )
- })
- @ToBeFixed(bug = "1703933", explanation = "Cannot test if the data was written correctly,"
- + " if build CTS against SDK.")
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test writeToParcel(Parcel dest, int flags).",
+ method = "writeToParcel",
+ args = {android.os.Parcel.class, java.lang.Integer.class}
+ )
+ //@ToBeFixed(bug = "1703933", explanation = "Cannot test if the data was written correctly,"
public void testWriteToParcel() {
NetworkInfo[] networkInfos = mConnectivityManager.getAllNetworkInfo();
NetworkInfo mobileInfo = networkInfos[ConnectivityManager.TYPE_MOBILE];
diff --git a/tests/tests/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java b/tests/tests/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
index 6459724..002adfe 100644
--- a/tests/tests/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
+++ b/tests/tests/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
@@ -18,9 +18,10 @@
import android.net.NetworkInfo.DetailedState;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(DetailedState.class)
@@ -31,15 +32,12 @@
super.setUp();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test valueOf(String name).",
- targets = {
- @TestTarget(
- methodName = "valueOf",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test valueOf(String name).",
+ method = "valueOf",
+ args = {java.lang.String.class}
+ )
public void testValueOf() {
assertEquals(DetailedState.AUTHENTICATING, DetailedState
.valueOf("AUTHENTICATING"));
@@ -60,15 +58,12 @@
.valueOf("SUSPENDED"));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test values().",
- targets = {
- @TestTarget(
- methodName = "values",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test values().",
+ method = "values",
+ args = {}
+ )
public void testValues() {
DetailedState[] expected = DetailedState.values();
assertEquals(10, expected.length);
diff --git a/tests/tests/net/src/android/net/cts/NetworkInfo_StateTest.java b/tests/tests/net/src/android/net/cts/NetworkInfo_StateTest.java
index b03c3f0..2f58784 100644
--- a/tests/tests/net/src/android/net/cts/NetworkInfo_StateTest.java
+++ b/tests/tests/net/src/android/net/cts/NetworkInfo_StateTest.java
@@ -17,9 +17,10 @@
package android.net.cts;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import android.net.NetworkInfo.State;
@@ -31,15 +32,12 @@
super.setUp();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test valueOf(String name).",
- targets = {
- @TestTarget(
- methodName = "valueOf",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test valueOf(String name).",
+ method = "valueOf",
+ args = {java.lang.String.class}
+ )
public void testValueOf() {
assertEquals(State.CONNECTED, State.valueOf("CONNECTED"));
assertEquals(State.CONNECTING, State.valueOf("CONNECTING"));
@@ -49,15 +47,12 @@
assertEquals(State.UNKNOWN, State.valueOf("UNKNOWN"));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test values().",
- targets = {
- @TestTarget(
- methodName = "values",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test values().",
+ method = "values",
+ args = {}
+ )
public void testValues() {
State[] expected = State.values();
assertEquals(6, expected.length);
diff --git a/tests/tests/net/src/android/net/cts/UriTest.java b/tests/tests/net/src/android/net/cts/UriTest.java
index 84b58c0..067ce52 100644
--- a/tests/tests/net/src/android/net/cts/UriTest.java
+++ b/tests/tests/net/src/android/net/cts/UriTest.java
@@ -30,7 +30,7 @@
@TestTargetClass(Uri.class)
public class UriTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test write to and read frome parcel.",
method = "writeToParcel",
args = {android.os.Parcel.class, android.net.Uri.class}
@@ -61,7 +61,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test buildUpon",
method = "buildUpon",
args = {}
@@ -94,73 +94,73 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getSchemeSpecificPart",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getEncodedSchemeSpecificPart",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getEncodedPath",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getPath",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getEncodedQuery",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getQuery",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getEncodedFragment",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getHost",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getPort",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getUserInfo",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "getEncodedUserInfo",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test string uri.",
method = "parse",
args = {java.lang.String.class}
@@ -203,7 +203,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test compareTo",
method = "compareTo",
args = {android.net.Uri.class}
@@ -220,13 +220,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals and hashCode.",
method = "equals",
args = {java.lang.Object.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals and hashCode.",
method = "hashCode",
args = {}
@@ -262,19 +262,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test encode and decode.",
method = "encode",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test encode and decode.",
method = "encode",
args = {java.lang.String.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test encode and decode.",
method = "decode",
args = {java.lang.String.class}
@@ -301,7 +301,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test fromFile.",
method = "fromFile",
args = {java.io.File.class}
@@ -318,13 +318,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test get query parameters.",
method = "getQueryParameter",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test get query parameters.",
method = "getQueryParameters",
args = {java.lang.String.class}
@@ -347,19 +347,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "getPathSegments",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "getLastPathSegment",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "withAppendedPath",
args = {android.net.Uri.class, java.lang.String.class}
@@ -404,55 +404,55 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "isAbsolute",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "isOpaque",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "isRelative",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "getHost",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "getPort",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "getScheme",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "getSchemeSpecificPart",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "fromParts",
args = {java.lang.String.class, java.lang.String.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test opaque uri.",
method = "toString",
args = {}
@@ -514,91 +514,91 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getAuthority",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getScheme",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getEncodedAuthority",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getPath",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getEncodedPath",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getQuery",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getEncodedQuery",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getFragment",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getEncodedFragment",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "getSchemeSpecificPart",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "isAbsolute",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "isHierarchical",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "isOpaque",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "isRelative",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hierarchical uris.",
method = "toString",
args = {}
diff --git a/tests/tests/net/src/android/net/cts/Uri_BuilderTest.java b/tests/tests/net/src/android/net/cts/Uri_BuilderTest.java
index 8a1b423..66bdb07 100644
--- a/tests/tests/net/src/android/net/cts/Uri_BuilderTest.java
+++ b/tests/tests/net/src/android/net/cts/Uri_BuilderTest.java
@@ -28,103 +28,103 @@
public class Uri_BuilderTest extends TestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "Uri.Builder",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "build",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "scheme",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "authority",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "path",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "query",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "opaquePart",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "fragment",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "appendEncodedPath",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "appendPath",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "appendQueryParameter",
args = {java.lang.String.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "encodedAuthority",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "encodedFragment",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "encodedPath",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "encodedQuery",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "encodedOpaquePart",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test Builder operations.",
method = "toString",
args = {}
@@ -171,4 +171,3 @@
assertEquals("nobody", uri.getEncodedSchemeSpecificPart());
}
}
-
diff --git a/tests/tests/net/src/android/net/http/cts/SslCertificateTest.java b/tests/tests/net/src/android/net/http/cts/SslCertificateTest.java
index 6e23419..91ca876 100644
--- a/tests/tests/net/src/android/net/http/cts/SslCertificateTest.java
+++ b/tests/tests/net/src/android/net/http/cts/SslCertificateTest.java
@@ -46,13 +46,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of SslCertificate.",
method = "SslCertificate",
- args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class}
+ args = {java.lang.String.class, java.lang.String.class, java.lang.String.class,
+ java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of SslCertificate.",
method = "SslCertificate",
args = {java.security.cert.X509Certificate.class}
@@ -205,13 +206,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test saveState and restoreState(SslCertificate certificate).",
method = "saveState",
args = {android.net.http.SslCertificate.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test saveState and restoreState(SslCertificate certificate).",
method = "restoreState",
args = {android.os.Bundle.class}
@@ -240,31 +241,31 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIssuedTo().",
method = "getIssuedTo",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIssuedTo().",
method = "getIssuedBy",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIssuedTo().",
method = "getValidNotAfter",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIssuedTo().",
method = "getValidNotBefore",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getIssuedTo().",
method = "toString",
args = {}
diff --git a/tests/tests/net/src/android/net/http/cts/SslCertificate_DNameTest.java b/tests/tests/net/src/android/net/http/cts/SslCertificate_DNameTest.java
index 7562e3a..848bf7b 100644
--- a/tests/tests/net/src/android/net/http/cts/SslCertificate_DNameTest.java
+++ b/tests/tests/net/src/android/net/http/cts/SslCertificate_DNameTest.java
@@ -32,31 +32,31 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test DName.",
method = "SslCertificate.DName",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test DName.",
method = "getCName",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test DName.",
method = "getDName",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test DName.",
method = "getOName",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test DName.",
method = "getUName",
args = {}
diff --git a/tests/tests/os/src/android/os/cts/BadParcelableExceptionTest.java b/tests/tests/os/src/android/os/cts/BadParcelableExceptionTest.java
index a89fcd3..7e39e8a 100644
--- a/tests/tests/os/src/android/os/cts/BadParcelableExceptionTest.java
+++ b/tests/tests/os/src/android/os/cts/BadParcelableExceptionTest.java
@@ -17,24 +17,26 @@
import junit.framework.TestCase;
import android.os.BadParcelableException;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(BadParcelableException.class)
public class BadParcelableExceptionTest extends TestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: BadParcelableException",
- targets = {
- @TestTarget(
- methodName = "BadParcelableException",
- methodArgs = {Exception.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: BadParcelableException",
+ method = "BadParcelableException",
+ args = {java.lang.Exception.class}
),
- @TestTarget(
- methodName = "BadParcelableException",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: BadParcelableException",
+ method = "BadParcelableException",
+ args = {java.lang.String.class}
)
})
public void testBadParcelableException(){
diff --git a/tests/tests/os/src/android/os/cts/BundleTest.java b/tests/tests/os/src/android/os/cts/BundleTest.java
index 71f2930..b0aa270 100644
--- a/tests/tests/os/src/android/os/cts/BundleTest.java
+++ b/tests/tests/os/src/android/os/cts/BundleTest.java
@@ -48,25 +48,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test all constructors",
method = "Bundle",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test all constructors",
method = "Bundle",
args = {android.os.Bundle.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test all constructors",
method = "Bundle",
args = {java.lang.ClassLoader.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test all constructors",
method = "Bundle",
args = {int.class}
@@ -87,14 +87,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "first put sth into tested Bundle, it shouldn't be empty,"
+ " then clear it and it should be empty",
method = "clear",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "first put sth into tested Bundle, it shouldn't be empty,"
+ " then clear it and it should be empty",
method = "isEmpty",
@@ -110,7 +110,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "fisst clone the tested Bundle, then compare the original"
+ " Bundle with the cloned Bundle, they should equal",
method = "clone",
@@ -121,7 +121,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "containsKey would return false if nothing has been put into the Bundle,"
+ " else containsKey would return true if any putXXX has been called before",
method = "containsKey",
@@ -134,7 +134,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "get would return null if nothing has been put into the Bundle,"
+ " else get would return the value set by putXXX",
method = "get",
@@ -148,13 +148,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBoolean should only return the Boolean set by putBoolean",
method = "getBoolean",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBoolean should only return the Boolean set by putBoolean",
method = "putBoolean",
args = {java.lang.String.class, boolean.class}
@@ -168,13 +168,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBoolean should only return the Boolean set by putBoolean",
method = "getBoolean",
args = {java.lang.String.class, boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBoolean should only return the Boolean set by putBoolean",
method = "putBoolean",
args = {java.lang.String.class, boolean.class}
@@ -188,13 +188,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBooleanArray should only return the BooleanArray set by putBooleanArray",
method = "getBooleanArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBooleanArray should only return the BooleanArray set by putBooleanArray",
method = "putBooleanArray",
args = {java.lang.String.class, boolean[].class}
@@ -215,13 +215,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBundle should only return the Bundle set by putBundle",
method = "getBundle",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getBundle should only return the Bundle set by putBundle",
method = "putBundle",
args = {java.lang.String.class, android.os.Bundle.class}
@@ -236,13 +236,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getByte should only return the Byte set by putByte",
method = "getByte",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getByte should only return the Byte set by putByte",
method = "putByte",
args = {java.lang.String.class, byte.class}
@@ -258,13 +258,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getByte should only return the Byte set by putByte",
method = "getByte",
args = {java.lang.String.class, byte.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getByte should only return the Byte set by putByte",
method = "putByte",
args = {java.lang.String.class, byte.class}
@@ -281,13 +281,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getByteArray should only return the ByteArray set by putByteArray",
method = "getByteArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getByteArray should only return the ByteArray set by putByteArray",
method = "putByteArray",
args = {java.lang.String.class, byte[].class}
@@ -308,13 +308,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getChar should only return the Char set by putChar",
method = "getChar",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getChar should only return the Char set by putChar",
method = "putChar",
args = {java.lang.String.class, char.class}
@@ -330,13 +330,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getChar should only return the Char set by putChar",
method = "getChar",
args = {java.lang.String.class, char.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getChar should only return the Char set by putChar",
method = "putChar",
args = {java.lang.String.class, char.class}
@@ -353,13 +353,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getCharArray should only return the CharArray set by putCharArray",
method = "getCharArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getCharArray should only return the CharArray set by putCharArray",
method = "putCharArray",
args = {java.lang.String.class, char[].class}
@@ -377,13 +377,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getCharSequence should only return the CharSequence set by putCharSequence",
method = "getCharSequence",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getCharSequence should only return the CharSequence set by putCharSequence",
method = "putCharSequence",
args = {java.lang.String.class, java.lang.CharSequence.class}
@@ -399,13 +399,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getDouble should return the Double set by putDouble",
method = "getDouble",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getDouble should return the Double set by putDouble",
method = "putDouble",
args = {java.lang.String.class, double.class}
@@ -421,13 +421,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getDouble should return the Double set by putDouble",
method = "getDouble",
args = {java.lang.String.class, double.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getDouble should return the Double set by putDouble",
method = "putDouble",
args = {java.lang.String.class, double.class}
@@ -444,13 +444,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getDoubleArray should only return the DoubleArray set by putDoubleArray",
method = "getDoubleArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getDoubleArray should only return the DoubleArray set by putDoubleArray",
method = "putDoubleArray",
args = {java.lang.String.class, double[].class}
@@ -468,13 +468,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getFloat should only return the Float set by putFloat",
method = "getFloat",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getFloat should only return the Float set by putFloat",
method = "putFloat",
args = {java.lang.String.class, float.class}
@@ -490,13 +490,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getFloat should only return the Float set by putFloat",
method = "getFloat",
args = {java.lang.String.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getFloat should only return the Float set by putFloat",
method = "putFloat",
args = {java.lang.String.class, float.class}
@@ -513,13 +513,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getFloatArray should only return the FloatArray set by putFloatArray",
method = "getFloatArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getFloatArray should only return the FloatArray set by putFloatArray",
method = "putFloatArray",
args = {java.lang.String.class, float[].class}
@@ -537,13 +537,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getInt should only return the Int set by putInt",
method = "getInt",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getInt should only return the Int set by putInt",
method = "putInt",
args = {java.lang.String.class, int.class}
@@ -559,13 +559,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getInt should only return the Int set by putInt",
method = "getInt",
args = {java.lang.String.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getInt should only return the Int set by putInt",
method = "putInt",
args = {java.lang.String.class, int.class}
@@ -582,13 +582,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getIntArray should only return the IntArray set by putIntArray",
method = "getIntArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getIntArray should only return the IntArray set by putIntArray",
method = "putIntArray",
args = {java.lang.String.class, int[].class}
@@ -606,14 +606,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getIntegerArrayList should only return the IntegerArrayList,"
+ " which set by putIntegerArrayList",
method = "getIntegerArrayList",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getIntegerArrayList should only return the IntegerArrayList,"
+ " which set by putIntegerArrayList",
method = "putIntegerArrayList",
@@ -638,13 +638,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getLong should only return the Long set by putLong",
method = "getLong",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getLong should only return the Long set by putLong",
method = "putLong",
args = {java.lang.String.class, long.class}
@@ -660,13 +660,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getLong should only return the Long set by putLong",
method = "getLong",
args = {java.lang.String.class, long.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getLong should only return the Long set by putLong",
method = "putLong",
args = {java.lang.String.class, long.class}
@@ -683,13 +683,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getLongArray should only return the LongArray set by putLongArray",
method = "getLongArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getLongArray should only return the LongArray set by putLongArray",
method = "putLongArray",
args = {java.lang.String.class, long[].class}
@@ -707,13 +707,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getParcelable should only return the Parcelable set by putParcelable",
method = "getParcelable",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getParcelable should only return the Parcelable set by putParcelable",
method = "putParcelable",
args = {java.lang.String.class, android.os.Parcelable.class}
@@ -728,14 +728,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getParcelableArray should only return the ParcelableArray,"
+ " which set by putParcelableArray",
method = "getParcelableArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getParcelableArray should only return the ParcelableArray,"
+ " which set by putParcelableArray",
method = "putParcelableArray",
@@ -757,14 +757,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getParcelableArrayList should only return the parcelableArrayList,"
+ " which set by putParcelableArrayList",
method = "getParcelableArrayList",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getParcelableArrayList should only return the parcelableArrayList,"
+ " which set by putParcelableArrayList",
method = "putParcelableArrayList",
@@ -787,13 +787,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getSerializable should only return the Serializable set by putSerializable",
method = "getSerializable",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getSerializable should only return the Serializable set by putSerializable",
method = "putSerializable",
args = {java.lang.String.class, java.io.Serializable.class}
@@ -807,13 +807,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getShort should only return the Short set by putShort",
method = "getShort",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getShort should only return the Short set by putShort",
method = "putShort",
args = {java.lang.String.class, short.class}
@@ -829,13 +829,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getShort should only return the Short set by putShort",
method = "getShort",
args = {java.lang.String.class, short.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getShort should only return the Short set by putShort",
method = "putShort",
args = {java.lang.String.class, short.class}
@@ -852,13 +852,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getShortArray should only return the ShortArray set by putShortArray",
method = "getShortArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getShortArray should only return the ShortArray set by putShortArray",
method = "putShortArray",
args = {java.lang.String.class, short[].class}
@@ -879,14 +879,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getSparseParcelableArray should only return the SparseArray<Parcelable>,"
+ " which set by putSparseParcelableArray",
method = "getSparseParcelableArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getSparseParcelableArray should only return the SparseArray<Parcelable>m,"
+ " which set by putSparseParcelableArray",
method = "putSparseParcelableArray",
@@ -910,13 +910,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getString should only return the String set by putString",
method = "getString",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getString should only return the String set by putString",
method = "putString",
args = {java.lang.String.class, java.lang.String.class}
@@ -930,13 +930,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getStringArray should only return the StringArray set by putStringArray",
method = "getStringArray",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getStringArray should only return the StringArray set by putStringArray",
method = "putStringArray",
args = {java.lang.String.class, java.lang.String[].class}
@@ -955,14 +955,14 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getStringArrayList should only return the StringArrayList,"
+ " which set by putStringArrayList",
method = "getStringArrayList",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "getStringArrayList should only return the StringArrayList,"
+ " which set by putStringArrayList",
method = "putStringArrayList",
@@ -984,7 +984,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "keySet should contains all keys that have been set",
method = "keySet",
args = {}
@@ -1003,7 +1003,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "same as hasFileDescriptors, the only difference is that describeContents returns"
+ " CONTENTS_FILE_DESCRIPTOR if the tested Bundle has FileDescriptor, else returns 0.",
method = "describeContents",
@@ -1023,7 +1023,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "case 1: The default bundle doesn't has FileDescriptor."
+ "case 2: The tested Bundle should has FileDescriptor"
+ " if it read data from a Parcel object, which is created with a FileDescriptor."
@@ -1048,7 +1048,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "No way to verify that the class loader setter can work.",
method = "setClassLoader",
args = {java.lang.ClassLoader.class}
@@ -1060,7 +1060,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Write the bundle(A) to a parcel(B), and then create a bundle(C) from B."
+ "C should be same as A.",
method = "writeToParcel",
@@ -1079,13 +1079,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test the size should be right after add/remove key-value pair of the Bundle.",
method = "size",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test the size should be right after add/remove key-value pair of the Bundle.",
method = "remove",
args = {java.lang.String.class}
@@ -1124,13 +1124,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "The return value of toString() should not be null.",
method = "toString",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "The return value of toString() should not be null.",
method = "readFromParcel",
args = {android.os.Parcel.class}
@@ -1144,7 +1144,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "The tested Bundle should hold mappings from the given after putAll be invoked.",
method = "putAll",
args = {android.os.Bundle.class}
diff --git a/tests/tests/os/src/android/os/cts/DeadObjectExceptionTest.java b/tests/tests/os/src/android/os/cts/DeadObjectExceptionTest.java
index 079928b..ec5eca5 100644
--- a/tests/tests/os/src/android/os/cts/DeadObjectExceptionTest.java
+++ b/tests/tests/os/src/android/os/cts/DeadObjectExceptionTest.java
@@ -17,22 +17,20 @@
import junit.framework.TestCase;
import android.os.DeadObjectException;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(DeadObjectException.class)
public class DeadObjectExceptionTest extends TestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: DeadObjectException",
- targets = {
- @TestTarget(
- methodName = "DeadObjectException",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: DeadObjectException",
+ method = "DeadObjectException",
+ args = {}
+ )
public void testDeadObjectException(){
DeadObjectException ne = null;
boolean isThrowed = false;
diff --git a/tests/tests/os/src/android/os/cts/FileAcessPermissionTest.java b/tests/tests/os/src/android/os/cts/FileAcessPermissionTest.java
index d53c210..06a6de6 100644
--- a/tests/tests/os/src/android/os/cts/FileAcessPermissionTest.java
+++ b/tests/tests/os/src/android/os/cts/FileAcessPermissionTest.java
@@ -26,14 +26,13 @@
/**
* This is testing for file access permissions.
- *
+ *
* <LI><B>/system should be mounted read-only</B><BR> <LI><B>applications should
* be able to read/write to their own data directory (and only this directory,
* except for external storage -- see below)</B><BR> <LI><B>applications should
* not be able to read/write data in another applications /data/data space</B>
* <BR> <LI><B>external storage directory (/sdcard on G1) should be world
* read/write</B>
- *
* Pay attention that if run test test on emulator. You must using mksdcard to
* create a sdcard image file then start emulator with command emulator -sdcard <filepath>
* If run this on device, must insert a sdcard into device.
diff --git a/tests/tests/os/src/android/os/cts/HandlerThreadTest.java b/tests/tests/os/src/android/os/cts/HandlerThreadTest.java
index 696f221..789981e 100644
--- a/tests/tests/os/src/android/os/cts/HandlerThreadTest.java
+++ b/tests/tests/os/src/android/os/cts/HandlerThreadTest.java
@@ -32,13 +32,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "HandlerThread",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "HandlerThread",
args = {java.lang.String.class, int.class}
@@ -46,32 +46,32 @@
})
public void testConstructor() {
// new the HandlerThread instance
- HandlerThread handlerThread = new HandlerThread("test");
+ new HandlerThread("test");
// new the HandlerThread instance
- handlerThread = new HandlerThread("test", Thread.MAX_PRIORITY);
+ new HandlerThread("test", Thread.MAX_PRIORITY);
}
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getThreadId, onLooperPrepared, ",
method = "getThreadId",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getThreadId, onLooperPrepared, ",
method = "onLooperPrepared",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getThreadId, onLooperPrepared, ",
method = "getLooper",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getThreadId, onLooperPrepared, ",
method = "run",
args = {}
diff --git a/tests/tests/os/src/android/os/cts/MemoryFileTest.java b/tests/tests/os/src/android/os/cts/MemoryFileTest.java
index 94a0fb4..3044a90 100644
--- a/tests/tests/os/src/android/os/cts/MemoryFileTest.java
+++ b/tests/tests/os/src/android/os/cts/MemoryFileTest.java
@@ -22,9 +22,10 @@
import junit.framework.TestCase;
import android.os.MemoryFile;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -38,17 +39,18 @@
mMemoryFile = null;
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor",
- targets = {
- @TestTarget(
- methodName = "MemoryFile",
- methodArgs = {String.class, int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor",
+ method = "MemoryFile",
+ args = {java.lang.String.class, int.class}
),
- @TestTarget(
- methodName = "finalize",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor",
+ method = "finalize",
+ args = {}
)
})
public void testConstructor() {
@@ -56,15 +58,12 @@
new MemoryFile("Test File", 1024);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test writeBytes",
- targets = {
- @TestTarget(
- methodName = "writeBytes",
- methodArgs = {byte[].class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test writeBytes",
+ method = "writeBytes",
+ args = {byte[].class, int.class, int.class, int.class}
+ )
public void testWriteBytes() {
// new the MemoryFile instance
mMemoryFile = new MemoryFile("Test File", 1024);
@@ -100,17 +99,18 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getOutputStream and getInputStream function",
- targets = {
- @TestTarget(
- methodName = "getOutputStream",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getOutputStream and getInputStream function",
+ method = "getOutputStream",
+ args = {}
),
- @TestTarget(
- methodName = "getInputStream",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getOutputStream and getInputStream function",
+ method = "getInputStream",
+ args = {}
)
})
public void testGetOutputStream() {
@@ -136,17 +136,18 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test allowPurging and isPurgingAllowed",
- targets = {
- @TestTarget(
- methodName = "allowPurging",
- methodArgs = {boolean.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test allowPurging and isPurgingAllowed",
+ method = "allowPurging",
+ args = {boolean.class}
),
- @TestTarget(
- methodName = "isPurgingAllowed",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test allowPurging and isPurgingAllowed",
+ method = "isPurgingAllowed",
+ args = {}
)
})
@ToBeFixed(bug = "1537041", explanation = "When set mAllowPurging to true, writeBytes"
@@ -178,15 +179,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test length",
- targets = {
- @TestTarget(
- methodName = "length",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test length",
+ method = "length",
+ args = {}
+ )
public void testLength() {
// new the MemoryFile instance
mMemoryFile = new MemoryFile("Test File", 1024);
@@ -202,15 +200,12 @@
assertEquals(Integer.MIN_VALUE, mMemoryFile.length());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test readBytes",
- targets = {
- @TestTarget(
- methodName = "readBytes",
- methodArgs = {byte[].class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test readBytes",
+ method = "readBytes",
+ args = {byte[].class, int.class, int.class, int.class}
+ )
public void testReadBytes() {
// new the MemoryFile instance
mMemoryFile = new MemoryFile("Test File", 1024);
@@ -251,15 +246,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test close function",
- targets = {
- @TestTarget(
- methodName = "close",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test close function",
+ method = "close",
+ args = {}
+ )
@ToBeFixed(bug="1398215", explanation="the file still can be read even after it closes.")
public void testClose() {
// new the MemoryFile instance
diff --git a/tests/tests/os/src/android/os/cts/ParcelFormatExceptionTest.java b/tests/tests/os/src/android/os/cts/ParcelFormatExceptionTest.java
index 966cece..9047421 100644
--- a/tests/tests/os/src/android/os/cts/ParcelFormatExceptionTest.java
+++ b/tests/tests/os/src/android/os/cts/ParcelFormatExceptionTest.java
@@ -17,24 +17,26 @@
import junit.framework.TestCase;
import android.os.ParcelFormatException;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(ParcelFormatException.class)
public class ParcelFormatExceptionTest extends TestCase{
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: ParcelFormatException",
- targets = {
- @TestTarget(
- methodName = "ParcelFormatException",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: ParcelFormatException",
+ method = "ParcelFormatException",
+ args = {}
),
- @TestTarget(
- methodName = "ParcelFormatException",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: ParcelFormatException",
+ method = "ParcelFormatException",
+ args = {java.lang.String.class}
)
})
public void testParcelFormatException(){
diff --git a/tests/tests/os/src/android/os/cts/PatternMatcherTest.java b/tests/tests/os/src/android/os/cts/PatternMatcherTest.java
index 1fe07ec..22a4299 100644
--- a/tests/tests/os/src/android/os/cts/PatternMatcherTest.java
+++ b/tests/tests/os/src/android/os/cts/PatternMatcherTest.java
@@ -38,13 +38,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "PatternMatcher",
args = {android.os.Parcel.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "PatternMatcher",
args = {java.lang.String.class, int.class}
@@ -67,7 +67,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getType",
method = "getType",
args = {}
@@ -85,7 +85,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getPath",
method = "getPath",
args = {}
@@ -105,7 +105,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString",
method = "toString",
args = {}
@@ -130,7 +130,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
@@ -149,7 +149,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test describeContents",
method = "describeContents",
args = {}
@@ -162,7 +162,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test match",
method = "match",
args = {java.lang.String.class}
diff --git a/tests/tests/os/src/android/os/cts/SystemClockTest.java b/tests/tests/os/src/android/os/cts/SystemClockTest.java
index be67c76..3286e13 100644
--- a/tests/tests/os/src/android/os/cts/SystemClockTest.java
+++ b/tests/tests/os/src/android/os/cts/SystemClockTest.java
@@ -37,7 +37,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test currentThreadTimeMillis(), the sleep() will not affect the thread",
method = "currentThreadTimeMillis",
args = {}
@@ -52,7 +52,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test elapsedRealtime()",
method = "elapsedRealtime",
args = {}
@@ -67,7 +67,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setCurrentTimeMillis(long).",
method = "setCurrentTimeMillis",
args = {long.class}
@@ -82,7 +82,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test sleep(long), it is similar to Thread.sleep().",
method = "sleep",
args = {long.class}
@@ -107,7 +107,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test uptimeMillis()",
method = "uptimeMillis",
args = {}
diff --git a/tests/tests/os/src/android/os/cts/VibratorTest.java b/tests/tests/os/src/android/os/cts/VibratorTest.java
index cf0534d..52d0d40 100644
--- a/tests/tests/os/src/android/os/cts/VibratorTest.java
+++ b/tests/tests/os/src/android/os/cts/VibratorTest.java
@@ -37,7 +37,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test cancel()",
method = "cancel",
args = {}
@@ -58,13 +58,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test vibrate",
method = "vibrate",
args = {long[].class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test vibrate",
method = "vibrate",
args = {long.class}
@@ -86,7 +86,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test vibrator with multi thread.",
method = "vibrate",
args = {long.class}
diff --git a/tests/tests/provider/src/android/provider/cts/BrowserTest.java b/tests/tests/provider/src/android/provider/cts/BrowserTest.java
index 2abd0ed..3892cac 100644
--- a/tests/tests/provider/src/android/provider/cts/BrowserTest.java
+++ b/tests/tests/provider/src/android/provider/cts/BrowserTest.java
@@ -30,9 +30,10 @@
import android.provider.Browser.SearchColumns;
import android.test.ActivityInstrumentationTestCase2;
import android.webkit.WebIconDatabase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -130,17 +131,18 @@
super.tearDown();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods to access the search string in the searches database",
- targets = {
- @TestTarget(
- methodName = "addSearchUrl",
- methodArgs = {ContentResolver.class, String.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods to access the search string in the searches database",
+ method = "addSearchUrl",
+ args = {android.content.ContentResolver.class, java.lang.String.class}
),
- @TestTarget(
- methodName = "clearSearches",
- methodArgs = {ContentResolver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods to access the search string in the searches database",
+ method = "clearSearches",
+ args = {android.content.ContentResolver.class}
)
})
public void testAccessSearches() {
@@ -197,15 +199,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test getAllBookmarks(ContentResolver cr)",
- targets = {
- @TestTarget(
- methodName = "getAllBookmarks",
- methodArgs = {ContentResolver.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test getAllBookmarks(ContentResolver cr)",
+ method = "getAllBookmarks",
+ args = {android.content.ContentResolver.class}
+ )
public void testGetAllBookmarks() {
Cursor cursor;
final String bookmarkUrl1 = "www.bookmark1.com";
@@ -238,15 +237,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test getAllVisitedUrls(ContentResolver cr)",
- targets = {
- @TestTarget(
- methodName = "getAllVisitedUrls",
- methodArgs = {ContentResolver.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test getAllVisitedUrls(ContentResolver cr)",
+ method = "getAllVisitedUrls",
+ args = {android.content.ContentResolver.class}
+ )
public void testGetAllVisitedUrls() {
Cursor cursor;
final String visitedUrl1 = "www.visited1.com";
@@ -284,15 +280,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test updateVisitedHistory(ContentResolver cr, String url, boolean real)",
- targets = {
- @TestTarget(
- methodName = "updateVisitedHistory",
- methodArgs = {ContentResolver.class, String.class, boolean.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test updateVisitedHistory(ContentResolver cr, String url, boolean real)",
+ method = "updateVisitedHistory",
+ args = {android.content.ContentResolver.class, java.lang.String.class, boolean.class}
+ )
public void testUpdateVisitedHistory() {
Cursor cursor;
final String visitedHistoryUrl = "www.visited-history.com";
@@ -313,7 +306,8 @@
assertEquals(1, cursor.getCount());
cursor.moveToFirst();
assertEquals(visitedHistoryUrl, cursor.getString(Browser.HISTORY_PROJECTION_URL_INDEX));
- assertEquals(visitedHistoryUrl, cursor.getString(Browser.HISTORY_PROJECTION_TITLE_INDEX));
+ assertEquals(visitedHistoryUrl,
+ cursor.getString(Browser.HISTORY_PROJECTION_TITLE_INDEX));
assertEquals(0, cursor.getInt(Browser.HISTORY_PROJECTION_BOOKMARK_INDEX));
assertEquals(1, cursor.getInt(Browser.HISTORY_PROJECTION_VISITS_INDEX));
oldTime = cursor.getLong(Browser.HISTORY_PROJECTION_DATE_INDEX);
@@ -327,7 +321,8 @@
assertEquals(1, cursor.getCount());
cursor.moveToFirst();
assertEquals(visitedHistoryUrl, cursor.getString(Browser.HISTORY_PROJECTION_URL_INDEX));
- assertEquals(visitedHistoryUrl, cursor.getString(Browser.HISTORY_PROJECTION_TITLE_INDEX));
+ assertEquals(visitedHistoryUrl,
+ cursor.getString(Browser.HISTORY_PROJECTION_TITLE_INDEX));
assertEquals(0, cursor.getInt(Browser.HISTORY_PROJECTION_BOOKMARK_INDEX));
assertEquals(2, cursor.getInt(Browser.HISTORY_PROJECTION_VISITS_INDEX));
assertTrue(oldTime < cursor.getLong(Browser.HISTORY_PROJECTION_DATE_INDEX));
@@ -337,29 +332,36 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test methods which help user to access the history table",
- targets = {
- @TestTarget(
- methodName = "truncateHistory",
- methodArgs = {ContentResolver.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods which help user to access the history table",
+ method = "truncateHistory",
+ args = {android.content.ContentResolver.class}
),
- @TestTarget(
- methodName = "clearHistory",
- methodArgs = {ContentResolver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods which help user to access the history table",
+ method = "clearHistory",
+ args = {android.content.ContentResolver.class}
),
- @TestTarget(
- methodName = "canClearHistory",
- methodArgs = {ContentResolver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods which help user to access the history table",
+ method = "canClearHistory",
+ args = {android.content.ContentResolver.class}
),
- @TestTarget(
- methodName = "deleteFromHistory",
- methodArgs = {ContentResolver.class, String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods which help user to access the history table",
+ method = "deleteFromHistory",
+ args = {android.content.ContentResolver.class, java.lang.String.class}
),
- @TestTarget(
- methodName = "deleteHistoryTimeFrame",
- methodArgs = {ContentResolver.class, long.class, long.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods which help user to access the history table",
+ method = "deleteHistoryTimeFrame",
+ args = {android.content.ContentResolver.class, long.class, long.class}
)
})
public void testAccessHistory() {
@@ -449,7 +451,8 @@
int historyCountAfterDelete = cursor.getCount();
assertEquals(historyCountBeforeDelete - 1, historyCountAfterDelete);
cursor.moveToLast();
- assertEquals(MAX_HISTORY_COUNT - 1, cursor.getLong(Browser.HISTORY_PROJECTION_DATE_INDEX));
+ assertEquals(MAX_HISTORY_COUNT - 1,
+ cursor.getLong(Browser.HISTORY_PROJECTION_DATE_INDEX));
cursor.close();
// Specify a url which is not existed in current table.
@@ -535,28 +538,23 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test requestAllIcons(ContentResolver, String, WebIconDatabase.IconListener).",
- targets = {
- @TestTarget(
- methodName = "requestAllIcons",
- methodArgs = {ContentResolver.class, String.class, WebIconDatabase.IconListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test requestAllIcons(ContentResolver, String, WebIconDatabase.IconListener).",
+ method = "requestAllIcons",
+ args = {android.content.ContentResolver.class, java.lang.String.class,
+ android.webkit.WebIconDatabase.IconListener.class}
+ )
public void testRequestAllIcons() {
Browser.requestAllIcons(mContentResolver, null, null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test saveBookmark(Context c, String title, String url)",
- targets = {
- @TestTarget(
- methodName = "saveBookmark",
- methodArgs = {Context.class, String.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test saveBookmark(Context c, String title, String url)",
+ method = "saveBookmark",
+ args = {android.content.Context.class, java.lang.String.class, java.lang.String.class}
+ )
@ToBeFixed( bug = "1558560", explanation = "Can not select activity item in ResolverActivity" +
" by getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_CENTER)")
public void testSaveBookmark() {
@@ -574,15 +572,12 @@
// TODO: how to finish the activity.
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test sendString(Context c, String s)",
- targets = {
- @TestTarget(
- methodName = "sendString",
- methodArgs = {Context.class, String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test sendString(Context c, String s)",
+ method = "sendString",
+ args = {android.content.Context.class, java.lang.String.class}
+ )
@ToBeFixed( bug = "1558273", explanation = "android.provider.Browser#" +
"sendString(Context c, String s) does not return")
public void testSendString() {
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_ContactMethodsTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_ContactMethodsTest.java
index 49a881d..32ec738 100644
--- a/tests/tests/provider/src/android/provider/cts/Contacts_ContactMethodsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Contacts_ContactMethodsTest.java
@@ -23,43 +23,44 @@
import com.android.internal.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@TestTargetClass(android.provider.Contacts.ContactMethods.class)
public class Contacts_ContactMethodsTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test addPostalLocation function",
- targets = {
- @TestTarget(
- methodName = "addPostalLocation",
- methodArgs = {Context.class, long.class, double.class, double.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test addPostalLocation function",
+ method = "addPostalLocation",
+ args = {android.content.Context.class, long.class, double.class, double.class}
+ )
@ToBeFixed(explanation = "This function is not static, but we can't new a" +
" instance to call it because the constructor is private.")
public void testAddPostalLocation() {
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which encode or decode protocol",
- targets = {
- @TestTarget(
- methodName = "encodePredefinedImProtocol",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which encode or decode protocol",
+ method = "encodePredefinedImProtocol",
+ args = {int.class}
),
- @TestTarget(
- methodName = "encodeCustomImProtocol",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which encode or decode protocol",
+ method = "encodeCustomImProtocol",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "decodeImProtocol",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which encode or decode protocol",
+ method = "decodeImProtocol",
+ args = {java.lang.String.class}
)
})
public void testEncodeAndDecodeProtocol() {
@@ -85,15 +86,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getDisplayLabel(Context context, int kind, int type, CharSequence label)",
- targets = {
- @TestTarget(
- methodName = "getDisplayLabel",
- methodArgs = {Context.class, int.class, int.class, CharSequence.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getDisplayLabel(Context context, int kind, int type, CharSequence label)",
+ method = "getDisplayLabel",
+ args = {android.content.Context.class, int.class, int.class, java.lang.CharSequence.class}
+ )
public void test() {
String label = "label";
String display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_OrganizationsTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_OrganizationsTest.java
index 76153d1..8b3c7b8 100644
--- a/tests/tests/provider/src/android/provider/cts/Contacts_OrganizationsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Contacts_OrganizationsTest.java
@@ -19,22 +19,20 @@
import android.content.Context;
import android.provider.Contacts.Organizations;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(android.provider.Contacts.Organizations.class)
public class Contacts_OrganizationsTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getDisplayLabel(Context context, int type, CharSequence label",
- targets = {
- @TestTarget(
- methodName = "getDisplayLabel",
- methodArgs = {Context.class, int.class, CharSequence.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getDisplayLabel(Context context, int type, CharSequence label",
+ method = "getDisplayLabel",
+ args = {android.content.Context.class, int.class, java.lang.CharSequence.class}
+ )
public void testGetDisplayLabel() {
String label = "label";
String display = Organizations.getDisplayLabel(getContext(),
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
index f3dfb47..b57e4e0 100644
--- a/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
@@ -30,9 +30,10 @@
import android.provider.Contacts.Groups;
import android.provider.Contacts.People;
import android.test.InstrumentationTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import java.io.IOException;
@@ -112,29 +113,36 @@
super.tearDown();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which add person to a group",
- targets = {
- @TestTarget(
- methodName = "addToMyContactsGroup",
- methodArgs = {ContentResolver.class, long.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which add person to a group",
+ method = "addToMyContactsGroup",
+ args = {android.content.ContentResolver.class, long.class}
),
- @TestTarget(
- methodName = "addToGroup",
- methodArgs = {ContentResolver.class, long.class, long.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which add person to a group",
+ method = "addToGroup",
+ args = {android.content.ContentResolver.class, long.class, long.class}
),
- @TestTarget(
- methodName = "addToGroup",
- methodArgs = {ContentResolver.class, long.class, String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which add person to a group",
+ method = "addToGroup",
+ args = {android.content.ContentResolver.class, long.class, java.lang.String.class}
),
- @TestTarget(
- methodName = "queryGroups",
- methodArgs = {ContentResolver.class, long.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which add person to a group",
+ method = "queryGroups",
+ args = {android.content.ContentResolver.class, long.class}
),
- @TestTarget(
- methodName = "createPersonInMyContactsGroup",
- methodArgs = {ContentResolver.class, ContentValues.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which add person to a group",
+ method = "createPersonInMyContactsGroup",
+ args = {android.content.ContentResolver.class, android.content.ContentValues.class}
)
})
public void testAddToGroup() {
@@ -223,15 +231,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test markAsContacted(ContentResolver resolver, long personId)",
- targets = {
- @TestTarget(
- methodName = "markAsContacted",
- methodArgs = {ContentResolver.class, long.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test markAsContacted(ContentResolver resolver, long personId)",
+ method = "markAsContacted",
+ args = {android.content.ContentResolver.class, long.class}
+ )
public void testMarkAsContacted() {
Cursor cursor;
try {
@@ -262,21 +267,25 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods access the photo data of person",
- targets = {
- @TestTarget(
- methodName = "setPhotoData",
- methodArgs = {ContentResolver.class, Uri.class, byte[].class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods access the photo data of person",
+ method = "setPhotoData",
+ args = {android.content.ContentResolver.class, android.net.Uri.class, byte[].class}
),
- @TestTarget(
- methodName = "loadContactPhoto",
- methodArgs = {Context.class, Uri.class, int.class, BitmapFactory.Options.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods access the photo data of person",
+ method = "loadContactPhoto",
+ args = {android.content.Context.class, android.net.Uri.class, int.class,
+ android.graphics.BitmapFactory.Options.class}
),
- @TestTarget(
- methodName = "openContactPhotoInputStream",
- methodArgs = {ContentResolver.class, Uri.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods access the photo data of person",
+ method = "openContactPhotoInputStream",
+ args = {android.content.ContentResolver.class, android.net.Uri.class}
)
})
public void testAccessPhotoData() {
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_PhonesTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_PhonesTest.java
index 3f26c3f..3c2b0d2 100644
--- a/tests/tests/provider/src/android/provider/cts/Contacts_PhonesTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Contacts_PhonesTest.java
@@ -19,22 +19,20 @@
import android.content.Context;
import android.provider.Contacts.Phones;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(android.provider.Contacts.Phones.class)
public class Contacts_PhonesTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getDisplayLabel(Context context, int type, CharSequence label)",
- targets = {
- @TestTarget(
- methodName = "getDisplayLabel",
- methodArgs = {Context.class, int.class, CharSequence.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getDisplayLabel(Context context, int type, CharSequence label)",
+ method = "getDisplayLabel",
+ args = {android.content.Context.class, int.class, java.lang.CharSequence.class}
+ )
public void testGetDisplayLabel() {
CharSequence label = "label";
String display = Phones.getDisplayLabel(getContext(),
@@ -72,15 +70,13 @@
assertEquals(labels[Phones.TYPE_OTHER - 1], display);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getDisplayLabel which need specify a labelArray",
- targets = {
- @TestTarget(
- methodName = "getDisplayLabel",
- methodArgs = {Context.class, int.class, CharSequence.class, CharSequence[].class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getDisplayLabel which need specify a labelArray",
+ method = "getDisplayLabel",
+ args = {android.content.Context.class, int.class, java.lang.CharSequence.class,
+ java.lang.CharSequence[].class}
+ )
public void testGetDisplayLabelCharSequenceArray() {
CharSequence label = "label";
CharSequence[] labelArray = new CharSequence[] {
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_SettingsTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_SettingsTest.java
index 360a7b1..02ce7bd 100644
--- a/tests/tests/provider/src/android/provider/cts/Contacts_SettingsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Contacts_SettingsTest.java
@@ -22,9 +22,10 @@
import android.provider.Contacts;
import android.provider.Contacts.Settings;
import android.test.InstrumentationTestCase;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -80,19 +81,22 @@
super.tearDown();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which access setting",
- targets = {
- @TestTarget(
- methodName = "getSetting",
- methodArgs = {ContentResolver.class, String.class, String.class}
- ),
- @TestTarget(
- methodName = "setSetting",
- methodArgs = {ContentResolver.class, String.class, String.class, String.class}
- )
- })
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access setting",
+ method = "getSetting",
+ args = {android.content.ContentResolver.class, java.lang.String.class,
+ java.lang.String.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access setting",
+ method = "setSetting",
+ args = {android.content.ContentResolver.class, java.lang.String.class,
+ java.lang.String.class, java.lang.String.class}
+ )
+ })
public void testAccessSetting() {
String key1 = "key 1";
String value1 = "value 1";
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 b4d6e24..bb6e020 100644
--- a/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
+++ b/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
@@ -31,7 +31,7 @@
Factory mFactory;
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test newEditable(CharSequence source)",
method = "newEditable",
args = {java.lang.CharSequence.class}
@@ -50,7 +50,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getInstance()",
method = "getInstance",
args = {}
diff --git a/tests/tests/text/src/android/text/cts/LayoutTest.java b/tests/tests/text/src/android/text/cts/LayoutTest.java
index b4fb1bd..6433094 100644
--- a/tests/tests/text/src/android/text/cts/LayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/LayoutTest.java
@@ -29,7 +29,6 @@
import android.text.TextPaint;
import android.text.Layout.Alignment;
import android.text.style.StrikethroughSpan;
-import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
@@ -64,10 +63,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link Layout}",
method = "Layout",
- args = {java.lang.CharSequence.class, android.text.TextPaint.class, int.class, android.text.Layout.Alignment.class, float.class, float.class}
+ args = {java.lang.CharSequence.class, android.text.TextPaint.class, int.class,
+ android.text.Layout.Alignment.class, float.class, float.class}
)
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc " +
" of Layout constructor when the width is smaller than 0")
@@ -82,7 +82,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#draw(Canvas)}",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -102,10 +102,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#draw(Canvas, Path, Paint, int)}",
method = "draw",
- args = {android.graphics.Canvas.class, android.graphics.Path.class, android.graphics.Paint.class, int.class}
+ args = {android.graphics.Canvas.class, android.graphics.Path.class,
+ android.graphics.Paint.class, int.class}
)
@ToBeFixed(bug = "1386429", explanation = "can not get the" +
" package protected class Directions")
@@ -130,7 +131,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getText()}",
method = "getText",
args = {}
@@ -146,7 +147,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getPaint()}",
method = "getPaint",
args = {}
@@ -162,7 +163,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getWidth()}",
method = "getWidth",
args = {}
@@ -177,7 +178,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getEllipsizedWidth()}",
method = "getEllipsizedWidth",
args = {}
@@ -192,7 +193,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#increaseWidthTo(int)}",
method = "increaseWidthTo",
args = {int.class}
@@ -218,7 +219,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getHeight}",
method = "getHeight",
args = {}
@@ -230,7 +231,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getAlignment}",
method = "getAlignment",
args = {}
@@ -245,7 +246,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getSpacingMultiplier}",
method = "getSpacingMultiplier",
args = {}
@@ -259,7 +260,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getSpacingAdd}",
method = "getSpacingAdd",
args = {}
@@ -273,7 +274,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineBounds(int, Rect)}",
method = "getLineBounds",
args = {int.class, android.graphics.Rect.class}
@@ -291,7 +292,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getPrimaryHorizontal(int)}",
method = "getPrimaryHorizontal",
args = {int.class}
@@ -309,7 +310,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getSecondaryHorizontal(int)}",
method = "getSecondaryHorizontal",
args = {int.class}
@@ -327,7 +328,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineLeft(int)}",
method = "getLineLeft",
args = {int.class}
@@ -341,7 +342,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineRight(int)}",
method = "getLineRight",
args = {int.class}
@@ -355,7 +356,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineMax(int)}",
method = "getLineMax",
args = {int.class}
@@ -369,7 +370,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineWidth(int)}",
method = "getLineWidth",
args = {int.class}
@@ -383,7 +384,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineForVertical(int)}",
method = "getLineForVertical",
args = {int.class}
@@ -398,7 +399,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineForOffset(int)}",
method = "getLineForOffset",
args = {int.class}
@@ -413,7 +414,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getOffsetForHorizontal(int, float)}",
method = "getOffsetForHorizontal",
args = {int.class, float.class}
@@ -431,7 +432,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineEnd(int)}",
method = "getLineEnd",
args = {int.class}
@@ -443,7 +444,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineVisibleEnd(int)}",
method = "getLineVisibleEnd",
args = {int.class}
@@ -465,7 +466,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineBottom(int)}",
method = "getLineBottom",
args = {int.class}
@@ -477,7 +478,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineBaseline(int)}",
method = "getLineBaseline",
args = {int.class}
@@ -489,7 +490,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getLineAscent(int)}",
method = "getLineAscent",
args = {int.class}
@@ -501,7 +502,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getOffsetToLeftOf(int)}",
method = "getOffsetToLeftOf",
args = {int.class}
@@ -519,7 +520,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getOffsetToRightOf(int)}",
method = "getOffsetToRightOf",
args = {int.class}
@@ -537,7 +538,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getCursorPath(int, Path, CharSequence)}",
method = "getCursorPath",
args = {int.class, android.graphics.Path.class, java.lang.CharSequence.class}
@@ -555,7 +556,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getSelectionPath(int, int, Path)}",
method = "getSelectionPath",
args = {int.class, int.class, android.graphics.Path.class}
@@ -583,7 +584,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getParagraphAlignment(int)}",
method = "getParagraphAlignment",
args = {int.class}
@@ -600,7 +601,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getParagraphLeft(int)}",
method = "getParagraphLeft",
args = {int.class}
@@ -612,7 +613,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#getParagraphRight(int)}",
method = "getParagraphRight",
args = {int.class}
@@ -624,7 +625,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Layout#isSpanned}",
method = "isSpanned",
args = {}
diff --git a/tests/tests/text/src/android/text/cts/LoginFilterTest.java b/tests/tests/text/src/android/text/cts/LoginFilterTest.java
index 3fa7a3a..d5028d9 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilterTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilterTest.java
@@ -38,10 +38,10 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend).",
+ level = TestLevel.COMPLETE,
method = "filter",
- args = {java.lang.CharSequence.class, int.class, int.class, android.text.Spanned.class, int.class, int.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 " +
" of LoginFilter#filter(CharSequence, int, int, Spanned, int, int) when" +
@@ -136,33 +136,36 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test onInvalidCharacter(char c). This method does nothing. we only test onInvalidCharacter function here, the callback should be tested in testFilter()",
+ 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');
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test onStop(). This method does nothing. we only test onStop function here, the callback should be tested in testFilter()",
+ 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();
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test onStart(). This method does nothing. we only test onStart function here, the callback should be tested in testFilter()",
+ 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/SelectionTest.java b/tests/tests/text/src/android/text/cts/SelectionTest.java
index afb28d2..4270b0c 100644
--- a/tests/tests/text/src/android/text/cts/SelectionTest.java
+++ b/tests/tests/text/src/android/text/cts/SelectionTest.java
@@ -32,7 +32,7 @@
@TestTargetClass(Selection.class)
public class SelectionTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getSelectionStart(CharSequence text).",
method = "getSelectionStart",
args = {java.lang.CharSequence.class}
@@ -55,7 +55,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getSelectionEnd(CharSequence text).",
method = "getSelectionEnd",
args = {java.lang.CharSequence.class}
@@ -78,7 +78,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setSelection(Spannable text, int start, int stop).",
method = "setSelection",
args = {android.text.Spannable.class, int.class, int.class}
@@ -121,7 +121,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setSelection(Spannable text, int index).",
method = "setSelection",
args = {android.text.Spannable.class, int.class}
@@ -161,7 +161,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeSelection(Spannable text).",
method = "removeSelection",
args = {android.text.Spannable.class}
@@ -193,7 +193,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test selectAll(Spannable text).",
method = "selectAll",
args = {android.text.Spannable.class}
@@ -232,7 +232,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test moveLeft(Spannable text, Layout layout).",
method = "moveLeft",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -291,7 +291,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test moveRight(Spannable text, Layout layout).",
method = "moveRight",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -354,7 +354,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test moveUp(Spannable text, Layout layout).",
method = "moveUp",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -403,7 +403,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test moveDown(Spannable text, Layout layout).",
method = "moveDown",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -461,7 +461,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test extendSelection(Spannable text, int index).",
method = "extendSelection",
args = {android.text.Spannable.class, int.class}
@@ -515,7 +515,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test extendLeft(Spannable text, Layout layout).",
method = "extendLeft",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -573,7 +573,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test extendRight(Spannable text, Layout layout).",
method = "extendRight",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -627,7 +627,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test extendUp(Spannable text, Layout layout).",
method = "extendUp",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -676,7 +676,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test extendDown(Spannable text, Layout layout).",
method = "extendDown",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -729,7 +729,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test extendToLeftEdge(Spannable text, Layout layout).",
method = "extendToLeftEdge",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -783,7 +783,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test extendToRightEdge(Spannable text, Layout layout).",
method = "extendToRightEdge",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -835,7 +835,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test moveToLeftEdge(Spannable text, Layout layout).",
method = "moveToLeftEdge",
args = {android.text.Spannable.class, android.text.Layout.class}
@@ -885,7 +885,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ 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/SpannableStringBuilderTest.java b/tests/tests/text/src/android/text/cts/SpannableStringBuilderTest.java
index 97a03e6..ca208ef 100644
--- a/tests/tests/text/src/android/text/cts/SpannableStringBuilderTest.java
+++ b/tests/tests/text/src/android/text/cts/SpannableStringBuilderTest.java
@@ -48,13 +48,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link SpannableStringBuilder}.",
method = "SpannableStringBuilder",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link SpannableStringBuilder}.",
method = "SpannableStringBuilder",
args = {java.lang.CharSequence.class}
@@ -73,7 +73,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link SpannableStringBuilder}.",
method = "SpannableStringBuilder",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -104,7 +104,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#getSpanFlags(Object)}.",
method = "getSpanFlags",
args = {java.lang.Object.class}
@@ -123,7 +123,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#nextSpanTransition(int, int, Class)}.",
method = "nextSpanTransition",
args = {int.class, int.class, java.lang.Class.class}
@@ -144,7 +144,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#setSpan(Object, int, int, int)}.",
method = "setSpan",
args = {java.lang.Object.class, int.class, int.class, int.class}
@@ -177,7 +177,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#valueOf(CharSequence)}.",
method = "valueOf",
args = {java.lang.CharSequence.class}
@@ -203,7 +203,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#replace(int, int, CharSequence)}.",
method = "replace",
args = {int.class, int.class, java.lang.CharSequence.class}
@@ -239,7 +239,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#replace(int, int, CharSequence, int, int)}.",
method = "replace",
args = {int.class, int.class, java.lang.CharSequence.class, int.class, int.class}
@@ -292,7 +292,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#subSequence(int, int)}.",
method = "subSequence",
args = {int.class, int.class}
@@ -313,7 +313,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#getChars(int, int, char[], int)}.",
method = "getChars",
args = {int.class, int.class, char[].class, int.class}
@@ -350,7 +350,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#append(CharSequence)}.",
method = "append",
args = {java.lang.CharSequence.class}
@@ -368,7 +368,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#append(CharSequence, int, int)}.",
method = "append",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -403,7 +403,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#append(char)}.",
method = "append",
args = {char.class}
@@ -424,7 +424,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#clearSpans()}.",
method = "clearSpans",
args = {}
@@ -444,7 +444,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#getSpanStart(Object)}.",
method = "getSpanStart",
args = {java.lang.Object.class}
@@ -459,13 +459,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Filters.",
method = "getFilters",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test set and get Filters.",
method = "setFilters",
args = {android.text.InputFilter[].class}
@@ -486,7 +486,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#removeSpan(Object)}.",
method = "removeSpan",
args = {java.lang.Object.class}
@@ -514,7 +514,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#toString()}.",
method = "toString",
args = {}
@@ -528,7 +528,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = " Test {@link SpannableStringBuilder#getSpanEnd(Object)}.",
method = "getSpanEnd",
args = {java.lang.Object.class}
@@ -542,7 +542,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#charAt(int)}.",
method = "charAt",
args = {int.class}
@@ -566,7 +566,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#insert(int, CharSequence, int, int)}.",
method = "insert",
args = {int.class, java.lang.CharSequence.class, int.class, int.class}
@@ -613,7 +613,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#insert(int, CharSequence)}.",
method = "insert",
args = {int.class, java.lang.CharSequence.class}
@@ -648,7 +648,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#clear()}.",
method = "clear",
args = {}
@@ -661,7 +661,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#getSpans(int, int, Class<T>)}.",
method = "getSpans",
args = {int.class, int.class, java.lang.Class.class}
@@ -686,7 +686,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#length()}.",
method = "length",
args = {}
@@ -699,7 +699,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannableStringBuilder#delete(int, int)}.",
method = "delete",
args = {int.class, int.class}
diff --git a/tests/tests/text/src/android/text/cts/SpannedStringTest.java b/tests/tests/text/src/android/text/cts/SpannedStringTest.java
index 729e6f6..5b1cc6c 100644
--- a/tests/tests/text/src/android/text/cts/SpannedStringTest.java
+++ b/tests/tests/text/src/android/text/cts/SpannedStringTest.java
@@ -27,7 +27,7 @@
@TestTargetClass(SpannedString.class)
public class SpannedStringTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link SpannedString}",
method = "SpannedString",
args = {java.lang.CharSequence.class}
@@ -45,7 +45,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannedString#valueOf(CharSequence)}",
method = "valueOf",
args = {java.lang.CharSequence.class}
@@ -68,7 +68,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SpannedString#subSequence(int, int)}",
method = "subSequence",
args = {int.class, int.class}
diff --git a/tests/tests/text/src/android/text/cts/TextPaintTest.java b/tests/tests/text/src/android/text/cts/TextPaintTest.java
index 832e4e6..8987ad0 100644
--- a/tests/tests/text/src/android/text/cts/TextPaintTest.java
+++ b/tests/tests/text/src/android/text/cts/TextPaintTest.java
@@ -36,19 +36,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link TextPaint}",
method = "TextPaint",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link TextPaint}",
method = "TextPaint",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link TextPaint}",
method = "TextPaint",
args = {android.graphics.Paint.class}
@@ -85,7 +85,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link TextPaint#set(TextPaint)}",
method = "set",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/cts/TextUtilsTest.java b/tests/tests/text/src/android/text/cts/TextUtilsTest.java
index 8d969a6..c60e4ab 100644
--- a/tests/tests/text/src/android/text/cts/TextUtilsTest.java
+++ b/tests/tests/text/src/android/text/cts/TextUtilsTest.java
@@ -42,6 +42,7 @@
import java.util.ArrayList;
import java.util.regex.Pattern;
+
/**
* Test {@link TextUtils}.
*/
@@ -76,7 +77,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test commaEllipsize method",
method = "commaEllipsize",
args = {java.lang.CharSequence.class, android.text.TextPaint.class, float.class,
@@ -138,7 +139,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test concat method",
method = "concat",
args = {java.lang.CharSequence[].class}
@@ -188,7 +189,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test copySpansFrom method",
method = "copySpansFrom",
args = {android.text.Spanned.class, int.class, int.class, java.lang.Class.class,
@@ -314,7 +315,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test copySpansFrom method's NullPointerException",
method = "copySpansFrom",
args = {android.text.Spanned.class, int.class, int.class, java.lang.Class.class,
@@ -343,7 +344,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test ellipsize method",
method = "ellipsize",
args = {java.lang.CharSequence.class, android.text.TextPaint.class, float.class,
@@ -392,7 +393,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test ellipsize method which can set callback class and can enable"
+ "or disable to preserve length",
method = "ellipsize",
@@ -510,7 +511,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test equals method",
method = "equals",
args = {java.lang.CharSequence.class, java.lang.CharSequence.class}
@@ -537,7 +538,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test expandTemplate method",
method = "expandTemplate",
args = {java.lang.CharSequence.class, java.lang.CharSequence[].class}
@@ -624,7 +625,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChars method",
method = "getChars",
args = {java.lang.CharSequence.class, int.class, int.class, char[].class, int.class}
@@ -706,7 +707,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChars method's NullPointerException",
method = "getChars",
args = {java.lang.CharSequence.class, int.class, int.class, char[].class, int.class}
@@ -788,7 +789,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOffsetAfter method",
method = "getOffsetAfter",
args = {java.lang.CharSequence.class, int.class}
@@ -821,7 +822,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOffsetAfter method's NullPointerException",
method = "getOffsetAfter",
args = {java.lang.CharSequence.class, int.class}
@@ -837,7 +838,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOffsetBefore method",
method = "getOffsetBefore",
args = {java.lang.CharSequence.class, int.class}
@@ -869,7 +870,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getOffsetBefore method's NullPointerException",
method = "getOffsetBefore",
args = {java.lang.CharSequence.class, int.class}
@@ -885,7 +886,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getReverse method",
method = "getReverse",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -919,7 +920,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getReverse method's InternalError",
method = "getReverse",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -936,7 +937,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getReverse method's NegativeArraySizeException",
method = "getReverse",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -953,7 +954,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getReverse method's NullPointerException",
method = "getReverse",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -969,7 +970,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTrimmedLength method",
method = "getTrimmedLength",
args = {java.lang.CharSequence.class}
@@ -998,7 +999,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test htmlEncode method",
method = "htmlEncode",
args = {java.lang.String.class}
@@ -1017,7 +1018,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test indexOf(CharSequence s, char ch)",
method = "indexOf",
args = {java.lang.CharSequence.class, char.class}
@@ -1049,7 +1050,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test indexOf(CharSequence s, char ch, int start)",
method = "indexOf",
args = {java.lang.CharSequence.class, char.class, int.class}
@@ -1077,7 +1078,8 @@
assertEquals(-1, TextUtils.indexOf(stringBuffer, 'r', Integer.MAX_VALUE));
StringBuilder stringBuilder = new StringBuilder(searchString);
- assertEquals(INDEX_OF_SECOND_R, TextUtils.indexOf(stringBuilder, 'r', INDEX_OF_FIRST_R + 1));
+ assertEquals(INDEX_OF_SECOND_R,
+ TextUtils.indexOf(stringBuilder, 'r', INDEX_OF_FIRST_R + 1));
MockGetChars mockGetChars = new MockGetChars();
TextUtils.indexOf(mockGetChars, 'r', INDEX_OF_FIRST_R + 1);
@@ -1089,7 +1091,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test indexOf(CharSequence s, char ch, int start, int end)",
method = "indexOf",
args = {java.lang.CharSequence.class, char.class, int.class, int.class}
@@ -1141,7 +1143,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test indexOf(CharSequence s, CharSequence needle)",
method = "indexOf",
args = {java.lang.CharSequence.class, java.lang.CharSequence.class}
@@ -1170,7 +1172,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test indexOf(CharSequence s, CharSequence needle, int start)",
method = "indexOf",
args = {java.lang.CharSequence.class, java.lang.CharSequence.class, int.class}
@@ -1221,7 +1223,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test indexOf(CharSequence s, CharSequence needle, int start, int end)",
method = "indexOf",
args = {java.lang.CharSequence.class, java.lang.CharSequence.class, int.class, int.class}
@@ -1278,7 +1280,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isDigitsOnly method",
method = "isDigitsOnly",
args = {java.lang.CharSequence.class}
@@ -1298,7 +1300,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isEmpty method",
method = "isEmpty",
args = {java.lang.CharSequence.class}
@@ -1311,7 +1313,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isGraphic(char c)",
method = "isGraphic",
args = {char.class}
@@ -1340,7 +1342,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isGraphic(CharSequence str)",
method = "isGraphic",
args = {java.lang.CharSequence.class}
@@ -1363,7 +1365,7 @@
@SuppressWarnings("unchecked")
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test join(CharSequence delimiter, Iterable tokens)",
method = "join",
args = {java.lang.CharSequence.class, java.lang.Iterable.class}
@@ -1393,7 +1395,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test join(CharSequence delimiter, Object[] tokens)",
method = "join",
args = {java.lang.CharSequence.class, java.lang.Object[].class}
@@ -1420,7 +1422,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test lastIndexOf(CharSequence s, char ch)",
method = "lastIndexOf",
args = {java.lang.CharSequence.class, char.class}
@@ -1451,7 +1453,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test lastIndexOf(CharSequence s, char ch)",
method = "lastIndexOf",
args = {java.lang.CharSequence.class, char.class, int.class}
@@ -1491,7 +1493,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test lastIndexOf(CharSequence s, char ch, int start, int last)",
method = "lastIndexOf",
args = {java.lang.CharSequence.class, char.class, int.class, int.class}
@@ -1538,10 +1540,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test regionMatches method",
method = "regionMatches",
- args = {java.lang.CharSequence.class, int.class, java.lang.CharSequence.class, int.class, int.class}
+ args = {java.lang.CharSequence.class, int.class, java.lang.CharSequence.class,
+ int.class, int.class}
)
@ToBeFixed(bug = "1417734", explanation = "StringIndexOutOfBoundsException issue")
public void testRegionMatches() {
@@ -1608,10 +1611,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test regionMatches method's NullPointerException",
method = "regionMatches",
- args = {java.lang.CharSequence.class, int.class, java.lang.CharSequence.class, int.class, int.class}
+ args = {java.lang.CharSequence.class, int.class, java.lang.CharSequence.class,
+ int.class, int.class}
)
@ToBeFixed(bug = "1371108", explanation = "NullPointerException issue")
public void testRegionMatchesNullPointerException() {
@@ -1633,7 +1637,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test replace method",
method = "replace",
args = {java.lang.CharSequence.class, java.lang.String[].class,
@@ -1693,7 +1697,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test split(String text, Pattern pattern)",
method = "split",
args = {java.lang.String.class, java.util.regex.Pattern.class}
@@ -1723,7 +1727,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test split(String text, String expression)",
method = "split",
args = {java.lang.String.class, java.lang.String.class}
@@ -1752,7 +1756,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test stringOrSpannedString method",
method = "stringOrSpannedString",
args = {java.lang.CharSequence.class}
@@ -1777,7 +1781,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test substring method",
method = "substring",
args = {java.lang.CharSequence.class, int.class, int.class}
@@ -1834,7 +1838,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel method",
method = "writeToParcel",
args = {java.lang.CharSequence.class, android.os.Parcel.class, int.class}
@@ -1907,7 +1911,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel method",
method = "writeToParcel",
args = {java.lang.CharSequence.class, android.os.Parcel.class, int.class}
diff --git a/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java b/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java
index 921a197..b4fcfb0 100644
--- a/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java
+++ b/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java
@@ -32,7 +32,7 @@
@TestTargetClass(SimpleStringSplitter.class)
public class TextUtils_SimpleStringSplitterTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "TextUtils.SimpleStringSplitter",
args = {char.class}
@@ -46,7 +46,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hasNext method",
method = "hasNext",
args = {}
@@ -69,7 +69,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test iterator method",
method = "iterator",
args = {}
@@ -92,7 +92,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test next method",
method = "next",
args = {}
@@ -113,7 +113,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test next method",
method = "next",
args = {}
@@ -138,7 +138,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test remove method",
method = "remove",
args = {}
@@ -154,7 +154,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setString method",
method = "setString",
args = {java.lang.String.class}
diff --git a/tests/tests/text/src/android/text/format/cts/FormatterTest.java b/tests/tests/text/src/android/text/format/cts/FormatterTest.java
index 604e39f..5af068e 100644
--- a/tests/tests/text/src/android/text/format/cts/FormatterTest.java
+++ b/tests/tests/text/src/android/text/format/cts/FormatterTest.java
@@ -30,7 +30,7 @@
@TestTargetClass(Formatter.class)
public class FormatterTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Formatter#formatFileSize(Context, long).",
method = "formatFileSize",
args = {android.content.Context.class, long.class}
diff --git a/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java
index ca3c704..d3af26b 100644
--- a/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java
@@ -34,7 +34,7 @@
@TestTargetClass(DialerKeyListener.class)
public class DialerKeyListenerTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link DialerKeyListener}",
method = "DialerKeyListener",
args = {}
@@ -44,7 +44,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DialerKeyListener#lookup(KeyEvent, Spannable)}",
method = "lookup",
args = {android.view.KeyEvent.class, android.text.Spannable.class}
@@ -68,7 +68,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DialerKeyListener#getInstance()}",
method = "getInstance",
args = {}
@@ -85,7 +85,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DialerKeyListener#getAcceptedChars()}",
method = "getAcceptedChars",
args = {}
@@ -98,9 +98,9 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DialerKeyListener#getContentType()}",
- method = "getContentType",
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link DialerKeyListener#getInputType()}",
+ method = "getInputType",
args = {}
)
public void testGetInputType() {
diff --git a/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java
index f512377..5279d1e 100644
--- a/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java
@@ -29,6 +29,8 @@
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -38,10 +40,11 @@
@TestTargetClass(MetaKeyKeyListener.class)
public class MetaKeyKeyListenerTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link MetaKeyKeyListener#onKeyDown(View, Editable, int, KeyEvent)}",
method = "onKeyDown",
- args = {android.view.View.class, android.text.Editable.class, int.class, android.view.KeyEvent.class}
+ args = {android.view.View.class, android.text.Editable.class, int.class,
+ android.view.KeyEvent.class}
)
public void testPressKey() {
final CharSequence str = "123456";
@@ -75,10 +78,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link MetaKeyKeyListener#onKeyUp(View, Editable, int, KeyEvent)}",
method = "onKeyUp",
- args = {android.view.View.class, android.text.Editable.class, int.class, android.view.KeyEvent.class}
+ args = {android.view.View.class, android.text.Editable.class, int.class,
+ android.view.KeyEvent.class}
)
public void testReleaseKey() {
final CharSequence str = "123456";
@@ -112,7 +116,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link MetaKeyKeyListener#adjustMetaAfterKeypress(Spannable)}",
method = "adjustMetaAfterKeypress",
args = {android.text.Spannable.class}
@@ -147,7 +151,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link MetaKeyKeyListener#resetMetaState(Spannable)}",
method = "resetMetaState",
args = {android.text.Spannable.class}
@@ -180,14 +184,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link MetaKeyKeyListener#getMetaState(CharSequence)} and {@link MetaKeyKeyListener#getMetaState(CharSequence, int)}",
+ level = TestLevel.COMPLETE,
method = "getMetaState",
args = {java.lang.CharSequence.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link MetaKeyKeyListener#getMetaState(CharSequence)} and {@link MetaKeyKeyListener#getMetaState(CharSequence, int)}",
+ level = TestLevel.COMPLETE,
method = "getMetaState",
args = {java.lang.CharSequence.class, int.class}
)
@@ -219,7 +221,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link MetaKeyKeyListener#isMetaTracker(CharSequence, Object)}",
method = "isMetaTracker",
args = {java.lang.CharSequence.class, java.lang.Object.class}
@@ -231,7 +233,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link MetaKeyKeyListener#resetLockedMeta(Spannable)}",
method = "resetLockedMeta",
args = {android.text.Spannable.class}
@@ -265,8 +267,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test clearMetaKeyState(View, Editable, int), this function ignores 'View' parameter",
+ level = TestLevel.COMPLETE,
method = "clearMetaKeyState",
args = {android.view.View.class, android.text.Editable.class, int.class}
)
diff --git a/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java b/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java
index a8ce864..575c796 100644
--- a/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java
@@ -28,7 +28,7 @@
@TestTargetClass(RelativeSizeSpan.class)
public class RelativeSizeSpanTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of RelativeSizeSpan.",
method = "RelativeSizeSpan",
args = {float.class}
@@ -40,7 +40,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getSizeChange().",
method = "getSizeChange",
args = {}
@@ -54,7 +54,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateMeasureState(TextPaint ds).",
method = "updateMeasureState",
args = {android.text.TextPaint.class}
@@ -86,7 +86,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateDrawState(TextPaint ds).",
method = "updateDrawState",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java b/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java
index 556626e..e724a60 100644
--- a/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java
@@ -30,7 +30,7 @@
@TestTargetClass(ReplacementSpan.class)
public class ReplacementSpanTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateMeasureState(TextPaint p). this method does nothing",
method = "updateMeasureState",
args = {android.text.TextPaint.class}
@@ -41,7 +41,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateDrawState(TextPaint ds). this method does nothing",
method = "updateDrawState",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java b/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java
index 7de1dd3..885a44a 100644
--- a/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java
@@ -28,7 +28,7 @@
@TestTargetClass(ScaleXSpan.class)
public class ScaleXSpanTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of ScaleXSpan.",
method = "ScaleXSpan",
args = {float.class}
@@ -40,7 +40,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateDrawState(TextPaint ds).",
method = "updateDrawState",
args = {android.text.TextPaint.class}
@@ -69,7 +69,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateMeasureState(TextPaint ds).",
method = "updateMeasureState",
args = {android.text.TextPaint.class}
@@ -98,7 +98,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getScaleX().",
method = "getScaleX",
args = {}
diff --git a/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java b/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java
index f1d9372..e8f58cc 100644
--- a/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java
@@ -28,7 +28,7 @@
@TestTargetClass(StrikethroughSpan.class)
public class StrikethroughSpanTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link StrikethroughSpan#updateDrawState(TextPaint)}",
method = "updateDrawState",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java b/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
index b019e9b..6511b2e 100644
--- a/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
@@ -29,7 +29,7 @@
@TestTargetClass(StyleSpan.class)
public class StyleSpanTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of StyleSpan.",
method = "StyleSpan",
args = {int.class}
@@ -41,7 +41,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getStyle().",
method = "getStyle",
args = {}
@@ -55,7 +55,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateMeasureState(TextPaint paint).",
method = "updateMeasureState",
args = {android.text.TextPaint.class}
@@ -86,7 +86,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateDrawState(TextPaint ds).",
method = "updateDrawState",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java b/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java
index 8b5327a..ae3644a 100644
--- a/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java
@@ -28,7 +28,7 @@
@TestTargetClass(SubscriptSpan.class)
public class SubscriptSpanTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateMeasureState(TextPaint tp).",
method = "updateMeasureState",
args = {android.text.TextPaint.class}
@@ -56,7 +56,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateDrawState(TextPaint tp).",
method = "updateDrawState",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java b/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java
index 18543a6..010743e 100644
--- a/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java
@@ -28,7 +28,7 @@
@TestTargetClass(SuperscriptSpan.class)
public class SuperscriptSpanTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateMeasureState(TextPaint tp).",
method = "updateMeasureState",
args = {android.text.TextPaint.class}
@@ -56,7 +56,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateDrawState(TextPaint tp).",
method = "updateDrawState",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java b/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java
index e048691..bdea9a6 100644
--- a/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java
+++ b/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java
@@ -27,7 +27,7 @@
@TestTargetClass(Standard.class)
public class TabStopSpan_StandardTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of Standard.",
method = "TabStopSpan.Standard",
args = {int.class}
@@ -39,7 +39,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTabStop().",
method = "getTabStop",
args = {}
diff --git a/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java b/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java
index d4a2e30..83f721b0 100644
--- a/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java
@@ -32,22 +32,24 @@
public class TextAppearanceSpanTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of TextAppearanceSpan.",
method = "TextAppearanceSpan",
args = {android.content.Context.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of TextAppearanceSpan.",
method = "TextAppearanceSpan",
args = {android.content.Context.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of TextAppearanceSpan.",
method = "TextAppearanceSpan",
- args = {java.lang.String.class, int.class, int.class, android.content.res.ColorStateList.class, android.content.res.ColorStateList.class}
+ args = {java.lang.String.class, int.class, int.class,
+ android.content.res.ColorStateList.class,
+ android.content.res.ColorStateList.class}
)
})
@ToBeFixed(bug = "1417734", explanation = "should add @throws NullPointerException clause" +
@@ -82,7 +84,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFamily().",
method = "getFamily",
args = {}
@@ -103,7 +105,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateMeasureState(TextPaint ds).",
method = "updateMeasureState",
args = {android.text.TextPaint.class}
@@ -133,7 +135,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextColor().",
method = "getTextColor",
args = {}
@@ -151,7 +153,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextSize().",
method = "getTextSize",
args = {}
@@ -172,7 +174,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getTextStyle().",
method = "getTextStyle",
args = {}
@@ -193,7 +195,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLinkTextColor().",
method = "getLinkTextColor",
args = {}
@@ -211,7 +213,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateDrawState(TextPaint ds).",
method = "updateDrawState",
args = {android.text.TextPaint.class}
diff --git a/tests/tests/text/src/android/text/util/cts/LinkifyTest.java b/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
index 2f7caca..6bbcfc8 100644
--- a/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
+++ b/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
@@ -74,7 +74,7 @@
};
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor of {@link Linkify}",
method = "Linkify",
args = {}
@@ -84,7 +84,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Linkify#addLinks(Spannable, int)}",
method = "addLinks",
args = {android.text.Spannable.class, int.class}
@@ -123,7 +123,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Linkify#addLinks(TextView, int)}",
method = "addLinks",
args = {android.widget.TextView.class, int.class}
@@ -157,7 +157,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Linkify#addLinks(TextView, Pattern, String)}",
method = "addLinks",
args = {android.widget.TextView.class, java.util.regex.Pattern.class,
@@ -207,7 +207,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Linkify#addLinks(TextView, Pattern, String, MatchFilter,"
+ " TransformFilter)}",
method = "addLinks",
@@ -265,7 +265,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Linkify#addLinks(Spannable, Pattern, String)}",
method = "addLinks",
args = {android.text.Spannable.class, java.util.regex.Pattern.class, java.lang.String.class}
@@ -302,7 +302,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Linkify#addLinks(Spannable, Pattern, String, MatchFilter,"
+ " TransformFilter)}",
method = "addLinks",
diff --git a/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java b/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java
index 9c7175e..5e05631 100644
--- a/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java
+++ b/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java
@@ -31,19 +31,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test exception methods",
method = "AndroidException",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test exception methods",
method = "AndroidException",
args = {java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test exception methods",
method = "AndroidException",
args = {java.lang.Exception.class}
diff --git a/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java b/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java
index 690b7db..f908ffc 100644
--- a/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java
+++ b/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java
@@ -31,19 +31,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test AndroidRuntimeException",
method = "AndroidRuntimeException",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test AndroidRuntimeException",
method = "AndroidRuntimeException",
args = {java.lang.Exception.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test AndroidRuntimeException",
method = "AndroidRuntimeException",
args = {java.lang.String.class}
diff --git a/tests/tests/util/src/android/util/cts/DebugUtilsTest.java b/tests/tests/util/src/android/util/cts/DebugUtilsTest.java
index 8098afb0..67fd32e 100644
--- a/tests/tests/util/src/android/util/cts/DebugUtilsTest.java
+++ b/tests/tests/util/src/android/util/cts/DebugUtilsTest.java
@@ -17,22 +17,20 @@
import junit.framework.TestCase;
import android.util.DebugUtils;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(DebugUtils.class)
public class DebugUtilsTest extends TestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test method: isObjectSelected",
- targets = {
- @TestTarget(
- methodName = "isObjectSelected",
- methodArgs = {Object.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test method: isObjectSelected",
+ method = "isObjectSelected",
+ args = {java.lang.Object.class}
+ )
public void testIsObjectSelected(){
// note: because System.getenv("ANDROID_OBJECT_FILTER") always return null, can't test
// the case that the method isObjectSelected return true
diff --git a/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java b/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java
index eca398e..50aaa8e 100644
--- a/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java
+++ b/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java
@@ -38,19 +38,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link DisplayMetrics}",
method = "DisplayMetrics",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: setTo",
method = "setTo",
args = {DisplayMetrics.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: setToDefaults",
method = "setToDefaults",
args = {}
diff --git a/tests/tests/util/src/android/util/cts/FloatMathTest.java b/tests/tests/util/src/android/util/cts/FloatMathTest.java
index b566ab9..541db04 100644
--- a/tests/tests/util/src/android/util/cts/FloatMathTest.java
+++ b/tests/tests/util/src/android/util/cts/FloatMathTest.java
@@ -17,36 +17,44 @@
import junit.framework.TestCase;
import android.util.FloatMath;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(FloatMath.class)
public class FloatMathTest extends TestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test float math related methods",
- targets = {
- @TestTarget(
- methodName = "ceil",
- methodArgs = {float.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test float math related methods",
+ method = "ceil",
+ args = {float.class}
),
- @TestTarget(
- methodName = "floor",
- methodArgs = {float.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test float math related methods",
+ method = "floor",
+ args = {float.class}
),
- @TestTarget(
- methodName = "cos",
- methodArgs = {float.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test float math related methods",
+ method = "cos",
+ args = {float.class}
),
- @TestTarget(
- methodName = "sin",
- methodArgs = {float.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test float math related methods",
+ method = "sin",
+ args = {float.class}
),
- @TestTarget(
- methodName = "sqrt",
- methodArgs = {float.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test float math related methods",
+ method = "sqrt",
+ args = {float.class}
)
})
public void testFloatMathMethods() {
diff --git a/tests/tests/util/src/android/util/cts/LogPrinterTest.java b/tests/tests/util/src/android/util/cts/LogPrinterTest.java
index 7948958..655d231 100644
--- a/tests/tests/util/src/android/util/cts/LogPrinterTest.java
+++ b/tests/tests/util/src/android/util/cts/LogPrinterTest.java
@@ -33,7 +33,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of LogPrinter.",
method = "LogPrinter",
args = {int.class, java.lang.String.class}
@@ -51,7 +51,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test println(String x).",
method = "println",
args = {java.lang.String.class}
diff --git a/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java b/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java
index 5a81480..c51e430 100644
--- a/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java
+++ b/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java
@@ -35,13 +35,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of MonthDisplayHelper.",
method = "MonthDisplayHelper",
args = {int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of MonthDisplayHelper.",
method = "MonthDisplayHelper",
args = {int.class, int.class}
@@ -86,13 +86,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getNumberOfDaysInMonth().",
method = "getNumberOfDaysInMonth",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getNumberOfDaysInMonth().",
method = "MonthDisplayHelper",
args = {int.class, int.class}
@@ -109,19 +109,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test nextMonth().",
method = "nextMonth",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test nextMonth().",
method = "getDigitsForRow",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test nextMonth().",
method = "getMonth",
args = {}
@@ -142,13 +142,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getRowOf(int day).",
method = "getRowOf",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getRowOf(int day).",
method = "MonthDisplayHelper",
args = {int.class, int.class}
@@ -167,25 +167,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getWeekStartDay().",
method = "getWeekStartDay",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getWeekStartDay().",
method = "getOffset",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getWeekStartDay().",
method = "MonthDisplayHelper",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getWeekStartDay().",
method = "MonthDisplayHelper",
args = {int.class, int.class, int.class}
@@ -203,19 +203,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getDigitsForRow(int row).",
method = "getDigitsForRow",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getDigitsForRow(int row).",
method = "MonthDisplayHelper",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getDigitsForRow(int row).",
method = "MonthDisplayHelper",
args = {int.class, int.class, int.class}
@@ -246,13 +246,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFirstDayOfMonth().",
method = "getFirstDayOfMonth",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFirstDayOfMonth().",
method = "MonthDisplayHelper",
args = {int.class, int.class}
@@ -270,13 +270,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getColumnOf(int day).",
method = "getColumnOf",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getColumnOf(int day).",
method = "MonthDisplayHelper",
args = {int.class, int.class}
@@ -294,7 +294,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getDayAt(int row, int column).",
method = "getDayAt",
args = {int.class, int.class}
@@ -308,25 +308,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test previousMonth().",
method = "previousMonth",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test previousMonth().",
method = "getDigitsForRow",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test previousMonth().",
method = "getYear",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test previousMonth().",
method = "getMonth",
args = {}
@@ -354,7 +354,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isWithinCurrentMonth(int row, int column).",
method = "isWithinCurrentMonth",
args = {int.class, int.class}
diff --git a/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java b/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java
index 437af03..ea9d3d2 100644
--- a/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java
+++ b/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java
@@ -43,7 +43,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of PrintWriterPrinter.",
method = "PrintWriterPrinter",
args = {java.io.PrintWriter.class}
@@ -61,7 +61,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test println(String x).",
method = "println",
args = {java.lang.String.class}
diff --git a/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java b/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java
index 93787b7..cc0092e 100644
--- a/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java
+++ b/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java
@@ -17,24 +17,26 @@
import android.test.AndroidTestCase;
import android.util.StringBuilderPrinter;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(StringBuilderPrinter.class)
public class StringBuilderPrinterTest extends AndroidTestCase{
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test methods: StringBuilderPrinter and println",
- targets = {
- @TestTarget(
- methodName = "StringBuilderPrinter",
- methodArgs = {StringBuilder.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: StringBuilderPrinter and println",
+ method = "StringBuilderPrinter",
+ args = {java.lang.StringBuilder.class}
),
- @TestTarget(
- methodName = "println",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test methods: StringBuilderPrinter and println",
+ method = "println",
+ args = {java.lang.String.class}
)
})
public void testStringBuilderPrinter(){
diff --git a/tests/tests/util/src/android/util/cts/TimeUtilsTest.java b/tests/tests/util/src/android/util/cts/TimeUtilsTest.java
index b978a54..5a5bd20 100644
--- a/tests/tests/util/src/android/util/cts/TimeUtilsTest.java
+++ b/tests/tests/util/src/android/util/cts/TimeUtilsTest.java
@@ -29,7 +29,7 @@
public class TimeUtilsTest extends TestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: getTimeZone",
method = "getTimeZone",
args = {int.class, boolean.class, long.class, String.class}
@@ -62,7 +62,7 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: getTimeZone",
method = "getTimeZone",
args = {int.class, boolean.class, long.class, String.class}
@@ -87,7 +87,7 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: getTimeZone",
method = "getTimeZone",
args = {int.class, boolean.class, long.class, String.class}
@@ -111,7 +111,7 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: getTimeZone",
method = "getTimeZone",
args = {int.class, boolean.class, long.class, String.class}
@@ -437,7 +437,7 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: getTimeZone",
method = "getTimeZone",
args = {int.class, boolean.class, long.class, String.class}
@@ -465,7 +465,7 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test method: getTimeZoneDatabaseVersion",
method = "getTimeZoneDatabaseVersion",
args = {}
diff --git a/tests/tests/util/src/android/util/cts/TypedValueTest.java b/tests/tests/util/src/android/util/cts/TypedValueTest.java
index 737fdbf..1a26601 100644
--- a/tests/tests/util/src/android/util/cts/TypedValueTest.java
+++ b/tests/tests/util/src/android/util/cts/TypedValueTest.java
@@ -29,7 +29,7 @@
public class TypedValueTest extends TestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link TypedValue}",
method = "TypedValue",
args = {}
@@ -39,7 +39,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFloat().",
method = "getFloat",
args = {}
@@ -53,13 +53,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test complexToDimension().",
method = "getFloat",
args = {int.class, DisplayMetrics.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test complexToDimensionPixelOffset().",
method = "complexToDimensionPixelOffset",
args = {int.class, DisplayMetrics.class}
@@ -81,7 +81,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setTo().",
method = "setTo",
args = {TypedValue.class}
@@ -107,7 +107,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFraction().",
method = "getFraction",
args = {float.class, float.class}
@@ -121,7 +121,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test complexToDimensionPixelSize().",
method = "complexToDimensionPixelSize",
args = {int.class, DisplayMetrics.class}
@@ -147,7 +147,7 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test complexToFraction().",
method = "complexToFraction",
args = {int.class, float.class, float.class}
@@ -169,7 +169,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test toString().",
method = "toString",
args = {}
@@ -191,7 +191,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test applyDimension().",
method = "applyDimension",
args = {int.class, float.class, DisplayMetrics.class}
@@ -219,7 +219,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test coerceToString().",
method = "coerceToString",
args = {}
@@ -240,7 +240,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test coerceToString().",
method = "coerceToString",
args = {int.class, int.class}
@@ -263,7 +263,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test complexToFloat().",
method = "complexToFloat",
args = {int.class}
@@ -282,7 +282,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getDimension().",
method = "getDimension",
args = {DisplayMetrics.class}
@@ -303,7 +303,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test complexToDimensionNoisy().",
method = "complexToDimensionNoisy",
args = {int.class, DisplayMetrics.class}
diff --git a/tests/tests/util/src/android/util/cts/XmlEncodingTest.java b/tests/tests/util/src/android/util/cts/XmlEncodingTest.java
index 4c63599..b922df1 100644
--- a/tests/tests/util/src/android/util/cts/XmlEncodingTest.java
+++ b/tests/tests/util/src/android/util/cts/XmlEncodingTest.java
@@ -29,9 +29,10 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
/**
@@ -73,17 +74,18 @@
private static final String STR_START_TAG = "start:";
private static final String STR_CHARACTERS_TAG = "characters:";
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test valueOf(String name).",
- targets = {
- @TestTarget(
- methodName = "valueOf",
- methodArgs = {String.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test valueOf(String name).",
+ method = "valueOf",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "values",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test valueOf(String name).",
+ method = "values",
+ args = {}
)
})
public void testValueOf() {
diff --git a/tests/tests/util/src/android/util/cts/XmlTest.java b/tests/tests/util/src/android/util/cts/XmlTest.java
index 0807c94..e8a0e27 100644
--- a/tests/tests/util/src/android/util/cts/XmlTest.java
+++ b/tests/tests/util/src/android/util/cts/XmlTest.java
@@ -16,11 +16,6 @@
package android.util.cts;
-import dalvik.annotation.TestInfo;
-import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
-import dalvik.annotation.TestTargetClass;
-
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -35,6 +30,12 @@
import android.util.Xml;
import android.util.Xml.Encoding;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.TestStatus;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -89,28 +90,22 @@
final String sourceStr = "<" + TAG_TEST + "><" + TAG_SON + " " + ATT_NAME + "=\"" + STR_ABC
+ "\"/></" + TAG_TEST + ">";
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of Xml.",
- targets = {
- @TestTarget(
- methodName = "Xml",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of Xml.",
+ method = "Xml",
+ args = {}
+ )
public void testConstructor() {
new Xml();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test parse(String xml, ContentHandler contentHandler).",
- targets = {
- @TestTarget(
- methodName = "parse",
- methodArgs = {String.class, ContentHandler.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test parse(String xml, ContentHandler contentHandler).",
+ method = "parse",
+ args = {java.lang.String.class, org.xml.sax.ContentHandler.class}
+ )
public void testParseStringContentHandler() {
final String xmlStr = "<Test><Son name=\"abc\"/></Test>";
DefaultContentHandler dc = new DefaultContentHandler();
@@ -210,15 +205,12 @@
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test parse(Reader in, ContentHandler contentHandler).",
- targets = {
- @TestTarget(
- methodName = "parse",
- methodArgs = {Reader.class, ContentHandler.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test parse(Reader in, ContentHandler contentHandler).",
+ method = "parse",
+ args = {java.io.Reader.class, org.xml.sax.ContentHandler.class}
+ )
public void testParseReaderContentHander() {
ByteArrayOutputStream bout = new ByteArrayOutputStream();
DataOutputStream dout = new DataOutputStream(bout);
@@ -267,15 +259,13 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test parse(InputStream in, Encoding encoding, ContentHandler contentHandler).",
- targets = {
- @TestTarget(
- methodName = "parse",
- methodArgs = {InputStream.class, Encoding.class, ContentHandler.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test parse(InputStream in, Encoding encoding, ContentHandler contentHandler).",
+ method = "parse",
+ args = {java.io.InputStream.class, android.util.Xml.Encoding.class,
+ org.xml.sax.ContentHandler.class}
+ )
public void testParseInputStreamEncodingContentHandler() {
// test US-ASCII
@@ -407,17 +397,18 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test newSerializer() and newPullParser().",
- targets = {
- @TestTarget(
- methodName = "newSerializer",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test newSerializer() and newPullParser().",
+ method = "newSerializer",
+ args = {}
),
- @TestTarget(
- methodName = "newPullParser",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test newSerializer() and newPullParser().",
+ method = "newPullParser",
+ args = {}
)
})
public void testNewSerializer() {
@@ -428,15 +419,12 @@
assertNotNull(xp);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test findEncodingByName(String encodingName).",
- targets = {
- @TestTarget(
- methodName = "findEncodingByName",
- methodArgs = {String.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test findEncodingByName(String encodingName).",
+ method = "findEncodingByName",
+ args = {java.lang.String.class}
+ )
public void testFindEncodingByName() {
try {
@@ -456,15 +444,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test asAttributeSet(XmlPullParser parser).",
- targets = {
- @TestTarget(
- methodName = "asAttributeSet",
- methodArgs = {XmlPullParser.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test asAttributeSet(XmlPullParser parser).",
+ method = "asAttributeSet",
+ args = {org.xmlpull.v1.XmlPullParser.class}
+ )
public void testAsAttributeSet() {
XmlResourceParser xp = getContext().getResources().getLayout(
com.android.cts.stub.R.layout.xml_test);
diff --git a/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java b/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java
index 6e2bde3..3b9c8ef 100644
--- a/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java
+++ b/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java
@@ -25,7 +25,6 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
-
@TestTargetClass(AbsSavedState.class)
public class AbsSavedStateTest extends InstrumentationTestCase {
@@ -34,19 +33,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor and describeContents of AbsSavedState",
method = "AbsSavedState",
args = {android.os.Parcelable.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor and describeContents of AbsSavedState",
method = "AbsSavedState",
args = {android.os.Parcel.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor and describeContents of AbsSavedState",
method = "describeContents",
args = {}
@@ -65,7 +64,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getSuperState function",
method = "getSuperState",
args = {}
@@ -79,7 +78,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test writeToParcel function",
method = "writeToParcel",
args = {android.os.Parcel.class, int.class}
diff --git a/tests/tests/view/src/android/view/cts/GravityTest.java b/tests/tests/view/src/android/view/cts/GravityTest.java
index ed47c81..7723587 100644
--- a/tests/tests/view/src/android/view/cts/GravityTest.java
+++ b/tests/tests/view/src/android/view/cts/GravityTest.java
@@ -40,7 +40,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link Gravity}",
method = "Gravity",
args = {}
@@ -51,16 +51,16 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link Gravity#apply(int, int, int, Rect, Rect)} and {@link Gravity#apply(int, int, int, Rect, int, int, Rect)}",
+ level = TestLevel.COMPLETE,
method = "apply",
- args = {int.class, int.class, int.class, android.graphics.Rect.class, android.graphics.Rect.class}
+ args = {int.class, int.class, int.class, android.graphics.Rect.class,
+ android.graphics.Rect.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link Gravity#apply(int, int, int, Rect, Rect)} and {@link Gravity#apply(int, int, int, Rect, int, int, Rect)}",
+ level = TestLevel.COMPLETE,
method = "apply",
- args = {int.class, int.class, int.class, android.graphics.Rect.class, int.class, int.class, android.graphics.Rect.class}
+ args = {int.class, int.class, int.class, android.graphics.Rect.class, int.class,
+ int.class, android.graphics.Rect.class}
)
})
public void testApply() {
@@ -155,7 +155,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Gravity#isVertical(int)}",
method = "isVertical",
args = {int.class}
@@ -167,7 +167,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Gravity#isHorizontal(int)}",
method = "isHorizontal",
args = {int.class}
diff --git a/tests/tests/view/src/android/view/cts/InflateExceptionTest.java b/tests/tests/view/src/android/view/cts/InflateExceptionTest.java
index 345b42a..27ca37f 100644
--- a/tests/tests/view/src/android/view/cts/InflateExceptionTest.java
+++ b/tests/tests/view/src/android/view/cts/InflateExceptionTest.java
@@ -17,32 +17,38 @@
import junit.framework.TestCase;
import android.view.InflateException;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(InflateException.class)
public class InflateExceptionTest extends TestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test InflateException",
- targets = {
- @TestTarget(
- methodName = "InflateException",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test InflateException",
+ method = "InflateException",
+ args = {}
),
- @TestTarget(
- methodName = "InflateException",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test InflateException",
+ method = "InflateException",
+ args = {java.lang.String.class}
),
- @TestTarget(
- methodName = "InflateException",
- methodArgs = {String.class, Throwable.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test InflateException",
+ method = "InflateException",
+ args = {java.lang.String.class, java.lang.Throwable.class}
),
- @TestTarget(
- methodName = "InflateException",
- methodArgs = {Throwable.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test InflateException",
+ method = "InflateException",
+ args = {java.lang.Throwable.class}
)
})
public void testInflateException(){
diff --git a/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java b/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
index 37d8fbf..d126c98 100644
--- a/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
+++ b/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
@@ -39,9 +39,10 @@
import com.android.internal.util.XmlUtils;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(LayoutInflater.class)
@@ -75,21 +76,24 @@
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "from",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "from",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "LayoutInflater",
- methodArgs = {Context.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "LayoutInflater",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "LayoutInflater",
- methodArgs = {LayoutInflater.class, Context.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "LayoutInflater",
+ args = {android.view.LayoutInflater.class, android.content.Context.class}
)
})
public void testFrom() {
@@ -105,33 +109,42 @@
assertNotNull(layoutInflater);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "setFilter",
- methodArgs = {Filter.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setFilter",
+ args = {android.view.LayoutInflater.Filter.class}
),
- @TestTarget(
- methodName = "getFilter",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getFilter",
+ args = {}
),
- @TestTarget(
- methodName = "setFactory",
- methodArgs = {Factory.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "setFactory",
+ args = {android.view.LayoutInflater.Factory.class}
),
- @TestTarget(
- methodName = "getFactory",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getFactory",
+ args = {}
),
- @TestTarget(
- methodName = "getContext",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "getContext",
+ args = {}
),
- @TestTarget(
- methodName = "cloneInContext",
- methodArgs = {Context.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "cloneInContext",
+ args = {android.content.Context.class}
)
})
public void testAccessLayoutInflaterProperties() {
@@ -180,15 +193,12 @@
return attrs;
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "createView",
- methodArgs = {String.class, String.class, AttributeSet.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "createView",
+ args = {java.lang.String.class, java.lang.String.class, android.util.AttributeSet.class}
+ )
public void testCreateView() {
AttributeSet attrs = getAttrs();
@@ -265,17 +275,18 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "inflate",
- methodArgs = {int.class, ViewGroup.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "inflate",
+ args = {int.class, android.view.ViewGroup.class}
),
- @TestTarget(
- methodName = "onCreateView",
- methodArgs = {String.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "onCreateView",
+ args = {java.lang.String.class, android.util.AttributeSet.class}
)
})
public void testInflate() {
@@ -303,17 +314,18 @@
assertEquals(1, mLayout.getChildCount());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "inflate",
- methodArgs = {int.class, ViewGroup.class, boolean.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "inflate",
+ args = {int.class, android.view.ViewGroup.class, boolean.class}
),
- @TestTarget(
- methodName = "onCreateView",
- methodArgs = {String.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "onCreateView",
+ args = {java.lang.String.class, android.util.AttributeSet.class}
)
})
public void testInflate2() {
@@ -347,19 +359,19 @@
assertEquals(1, mLayout.getChildCount());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "inflate",
- methodArgs = {XmlPullParser.class, ViewGroup.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "inflate",
+ args = {org.xmlpull.v1.XmlPullParser.class, android.view.ViewGroup.class}
),
- @TestTarget(
- methodName = "onCreateView",
- methodArgs = {String.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "onCreateView",
+ args = {java.lang.String.class, android.util.AttributeSet.class}
)
-
})
public void testInflate3() {
XmlResourceParser parser = getContext().getResources().getLayout(
@@ -406,17 +418,18 @@
assertEquals(3, mLayout.getChildCount());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "",
- targets = {
- @TestTarget(
- methodName = "inflate",
- methodArgs = {XmlPullParser.class, ViewGroup.class, boolean.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "inflate",
+ args = {org.xmlpull.v1.XmlPullParser.class, android.view.ViewGroup.class, boolean.class}
),
- @TestTarget(
- methodName = "onCreateView",
- methodArgs = {String.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "",
+ method = "onCreateView",
+ args = {java.lang.String.class, android.util.AttributeSet.class}
)
})
public void testInflate4() {
diff --git a/tests/tests/view/src/android/view/cts/MenuInflaterTest.java b/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
index c65a525..6b516f2 100644
--- a/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
+++ b/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
@@ -58,7 +58,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor.",
method = "MenuInflater",
args = {android.content.Context.class}
@@ -68,7 +68,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link MenuInflater#inflate(int, Menu)}",
method = "inflate",
args = {int.class, android.view.Menu.class}
@@ -97,11 +97,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link MenuInflater#inflate(int, Menu)}.Check wheher the objects are created correctly from xml files",
+ level = TestLevel.COMPLETE,
method = "inflate",
args = {int.class, android.view.Menu.class}
)
+ // Check wheher the objects are created correctly from xml files
public void testInflateFromXml(){
// the visibility and shortcut
Menu menu = new MenuBuilder(mActivity);
diff --git a/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java b/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java
index 6cd8054..5c1bc52 100644
--- a/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java
+++ b/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java
@@ -34,7 +34,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getContantForFocusDirection.",
method = "getContantForFocusDirection",
args = {int.class}
diff --git a/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java b/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java
index aaca466..53845bc 100644
--- a/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java
+++ b/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java
@@ -17,24 +17,26 @@
import junit.framework.TestCase;
import android.view.SurfaceHolder.BadSurfaceTypeException;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(BadSurfaceTypeException.class)
public class SurfaceHolder_BadSurfaceTypeExceptionTest extends TestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test BadSurfaceTypeException",
- targets = {
- @TestTarget(
- methodName = "SurfaceHolder.BadSurfaceTypeException",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test BadSurfaceTypeException",
+ method = "SurfaceHolder.BadSurfaceTypeException",
+ args = {}
),
- @TestTarget(
- methodName = "SurfaceHolder.BadSurfaceTypeException",
- methodArgs = {String.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test BadSurfaceTypeException",
+ method = "SurfaceHolder.BadSurfaceTypeException",
+ args = {java.lang.String.class}
)
})
public void testBadSurfaceTypeException(){
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupTest.java b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
index c009dff..cfe303c 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
@@ -40,7 +40,6 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewParent;
import android.view.WindowManager;
import android.view.View.BaseSavedState;
import android.view.View.MeasureSpec;
@@ -83,32 +82,32 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "ViewGroup",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "ViewGroup",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "ViewGroup",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
)
})
public void testConstructor() {
- MockViewGroup vg = new MockViewGroup(mContext);
- vg = new MockViewGroup(mContext, null);
- vg = new MockViewGroup(mContext, null, 0);
+ new MockViewGroup(mContext);
+ new MockViewGroup(mContext, null);
+ new MockViewGroup(mContext, null, 0);
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addFocusables",
method = "addFocusables",
args = {java.util.ArrayList.class, int.class}
@@ -135,13 +134,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addStatesFromChildren",
method = "addStatesFromChildren",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addStatesFromChildren",
method = "setAddStatesFromChildren",
args = {boolean.class}
@@ -161,13 +160,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addTouchables function",
method = "addTouchables",
args = {java.util.ArrayList.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addTouchables function",
method = "getChildAt",
args = {int.class}
@@ -206,7 +205,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addView function",
method = "addView",
args = {android.view.View.class}
@@ -222,7 +221,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addView function",
method = "addView",
args = {android.view.View.class, int.class}
@@ -238,7 +237,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addView function",
method = "addView",
args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class}
@@ -255,7 +254,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addView function",
method = "addView",
args = {android.view.View.class, int.class, int.class}
@@ -276,7 +275,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addView function",
method = "addView",
args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class}
@@ -293,7 +292,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addViewInLayout function",
method = "addViewInLayout",
args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class}
@@ -314,10 +313,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test attachLayoutAnimationParameters function",
method = "attachLayoutAnimationParameters",
- args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class, int.class, int.class}
+ args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class, int.class,
+ int.class}
)
public void testAttachLayoutAnimationParameters() {
MockViewGroup vg = new MockViewGroup(mContext);
@@ -329,7 +329,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test attachViewToParent function",
method = "attachViewToParent",
args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class}
@@ -350,10 +350,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addViewInLayout function",
method = "addViewInLayout",
- args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class, boolean.class}
+ args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class,
+ boolean.class}
)
public void testAddViewInLayoutWithParamViewIntLayB() {
MockViewGroup vg = new MockViewGroup(mContext);
@@ -372,7 +373,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test bringChildToFront function",
method = "bringChildToFront",
args = {android.view.View.class}
@@ -402,7 +403,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test canAnimate function",
method = "canAnimate",
args = {}
@@ -419,7 +420,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test checkLayoutParams function",
method = "checkLayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
@@ -432,7 +433,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test childDrawableStateChanged function",
method = "childDrawableStateChanged",
args = {android.view.View.class}
@@ -446,7 +447,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test cleanupLayoutState function",
method = "cleanupLayoutState",
args = {android.view.View.class}
@@ -463,13 +464,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clearChildFocus and getFocusedChild function",
method = "clearChildFocus",
args = {android.view.View.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clearChildFocus and getFocusedChild function",
method = "getFocusedChild",
args = {}
@@ -490,7 +491,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clearDisappearingChildren function",
method = "clearDisappearingChildren",
args = {}
@@ -524,7 +525,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test clearFocus",
method = "clearFocus",
args = {}
@@ -540,7 +541,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test detachAllViewsFromParent function",
method = "detachAllViewsFromParent",
args = {}
@@ -558,7 +559,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test detachViewFromParent function",
method = "detachViewFromParent",
args = {int.class}
@@ -577,7 +578,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test detachViewFromParent function",
method = "detachViewFromParent",
args = {android.view.View.class}
@@ -597,7 +598,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test detachViewsFromParent function",
method = "detachViewsFromParent",
args = {int.class, int.class}
@@ -621,7 +622,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchDraw function",
method = "dispatchDraw",
args = {android.graphics.Canvas.class}
@@ -636,7 +637,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchFreezeSelfOnly function",
method = "dispatchFreezeSelfOnly",
args = {android.util.SparseArray.class}
@@ -654,7 +655,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchKeyEvent function",
method = "dispatchKeyEvent",
args = {android.view.KeyEvent.class}
@@ -674,14 +675,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test dispatchRestoreInstanceState function and dispatchSaveInstanceState function",
+ level = TestLevel.COMPLETE,
method = "dispatchRestoreInstanceState",
args = {android.util.SparseArray.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test dispatchRestoreInstanceState function and dispatchSaveInstanceState function",
+ level = TestLevel.COMPLETE,
method = "dispatchSaveInstanceState",
args = {android.util.SparseArray.class}
)
@@ -708,7 +707,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchSetPressed function",
method = "dispatchSetPressed",
args = {boolean.class}
@@ -726,7 +725,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchSetSelected function",
method = "dispatchSetSelected",
args = {boolean.class}
@@ -744,7 +743,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchSetSelected function",
method = "dispatchThawSelfOnly",
args = {android.util.SparseArray.class}
@@ -762,7 +761,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchTouchEvent function",
method = "dispatchTouchEvent",
args = {android.view.MotionEvent.class}
@@ -808,7 +807,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchTrackballEvent function",
method = "dispatchTrackballEvent",
args = {android.view.MotionEvent.class}
@@ -828,7 +827,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchUnhandledMove function",
method = "dispatchUnhandledMove",
args = {android.view.View.class, int.class}
@@ -845,7 +844,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchWindowFocusChanged function",
method = "dispatchWindowFocusChanged",
args = {boolean.class}
@@ -863,7 +862,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchWindowVisibilityChanged function",
method = "dispatchWindowVisibilityChanged",
args = {int.class}
@@ -879,7 +878,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test drawableStateChanged function",
method = "drawableStateChanged",
args = {}
@@ -896,7 +895,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test drawChild function",
method = "drawChild",
args = {android.graphics.Canvas.class, android.view.View.class, long.class}
@@ -919,7 +918,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test findFocus function",
method = "findFocus",
args = {}
@@ -938,7 +937,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test fitSystemWindows function",
method = "fitSystemWindows",
args = {android.graphics.Rect.class}
@@ -983,7 +982,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test focusableViewAvailable function",
method = "focusableViewAvailable",
args = {android.view.View.class}
@@ -1000,7 +999,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test focusSearch function",
method = "focusSearch",
args = {android.view.View.class, int.class}
@@ -1016,7 +1015,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test gatherTransparentRegion function",
method = "gatherTransparentRegion",
args = {android.graphics.Region.class}
@@ -1036,7 +1035,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test generateDefaultLayoutParams function",
method = "generateDefaultLayoutParams",
args = {}
@@ -1050,7 +1049,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test generateLayoutParams function",
method = "generateLayoutParams",
args = {android.util.AttributeSet.class}
@@ -1070,7 +1069,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test generateLayoutParams function",
method = "generateLayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
@@ -1083,7 +1082,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChildDrawingOrder function",
method = "getChildDrawingOrder",
args = {int.class, int.class}
@@ -1095,7 +1094,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChildMeasureSpec function",
method = "getChildMeasureSpec",
args = {int.class, int.class, int.class}
@@ -1114,7 +1113,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChildStaticTransformation function",
method = "getChildStaticTransformation",
args = {android.view.View.class, android.view.animation.Transformation.class}
@@ -1125,7 +1124,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getChildVisibleRect function",
method = "getChildVisibleRect",
args = {android.view.View.class, android.graphics.Rect.class, android.graphics.Point.class}
@@ -1147,7 +1146,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getDescendantFocusability function",
method = "getDescendantFocusability",
args = {}
@@ -1162,7 +1161,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLayoutAnimation function",
method = "getLayoutAnimation",
args = {}
@@ -1180,13 +1179,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLayoutAnimationListener and setLayoutAnimationListener",
method = "getLayoutAnimationListener",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getLayoutAnimationListener and setLayoutAnimationListener",
method = "setLayoutAnimationListener",
args = {android.view.animation.Animation.AnimationListener.class}
@@ -1213,7 +1212,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getPersistentDrawingCache function",
method = "getPersistentDrawingCache",
args = {}
@@ -1229,7 +1228,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hasFocus function",
method = "hasFocus",
args = {}
@@ -1247,7 +1246,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test hasFocusable function",
method = "hasFocusable",
args = {}
@@ -1262,7 +1261,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test indexOfChild function",
method = "indexOfChild",
args = {android.view.View.class}
@@ -1288,13 +1287,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test invalidateChild function",
method = "invalidateChild",
args = {android.view.View.class, android.graphics.Rect.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test invalidateChild function",
method = "invalidateChildInParent",
args = {int[].class, android.graphics.Rect.class}
@@ -1325,13 +1324,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isAlwaysDrawnWithCacheEnabled function",
method = "isAlwaysDrawnWithCacheEnabled",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isAlwaysDrawnWithCacheEnabled function",
method = "setAlwaysDrawnWithCacheEnabled",
args = {boolean.class}
@@ -1350,13 +1349,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isAnimationCacheEnabled function",
method = "isAnimationCacheEnabled",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isAnimationCacheEnabled function",
method = "setAnimationCacheEnabled",
args = {boolean.class}
@@ -1374,7 +1373,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isChildrenDrawnWithCacheEnabled function",
method = "isChildrenDrawnWithCacheEnabled",
args = {}
@@ -1389,7 +1388,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test measureChild function",
method = "measureChild",
args = {android.view.View.class, int.class, int.class}
@@ -1413,7 +1412,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test measureChildren function",
method = "measureChildren",
args = {int.class, int.class}
@@ -1439,7 +1438,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test measureChildWithMargins function",
method = "measureChildWithMargins",
args = {android.view.View.class, int.class, int.class, int.class, int.class}
@@ -1473,7 +1472,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offsetDescendantRectToMyCoords function",
method = "offsetDescendantRectToMyCoords",
args = {android.view.View.class, android.graphics.Rect.class}
@@ -1499,7 +1498,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test offsetRectIntoDescendantCoords function",
method = "offsetRectIntoDescendantCoords",
args = {android.view.View.class, android.graphics.Rect.class}
@@ -1527,7 +1526,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onAnimationStart function",
method = "onAnimationEnd",
args = {}
@@ -1566,7 +1565,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onAnimationStart function",
method = "onAnimationStart",
args = {}
@@ -1594,7 +1593,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onCreateDrawableState function",
method = "onCreateDrawableState",
args = {int.class}
@@ -1608,7 +1607,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onInterceptTouchEvent function",
method = "onInterceptTouchEvent",
args = {android.view.MotionEvent.class}
@@ -1624,7 +1623,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onLayout function",
method = "onLayout",
args = {boolean.class, int.class, int.class, int.class, int.class}
@@ -1643,7 +1642,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onRequestFocusInDescendants function",
method = "onRequestFocusInDescendants",
args = {int.class, android.graphics.Rect.class}
@@ -1656,7 +1655,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test recomputeViewAttributes function",
method = "recomputeViewAttributes",
args = {android.view.View.class}
@@ -1672,13 +1671,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeAllViews function",
method = "removeAllViews",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeAllViews function",
method = "getChildCount",
args = {}
@@ -1698,7 +1697,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeAllViewsInLayout function",
method = "removeAllViewsInLayout",
args = {}
@@ -1722,7 +1721,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeDetachedView function",
method = "removeDetachedView",
args = {android.view.View.class, boolean.class}
@@ -1756,7 +1755,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeView function",
method = "removeView",
args = {android.view.View.class}
@@ -1776,7 +1775,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeViewAt function",
method = "removeViewAt",
args = {int.class}
@@ -1803,7 +1802,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeViewInLayout function",
method = "removeViewInLayout",
args = {android.view.View.class}
@@ -1823,7 +1822,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeViews function",
method = "removeViews",
args = {int.class, int.class}
@@ -1849,7 +1848,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeViewsInLayout function",
method = "removeViewsInLayout",
args = {int.class, int.class}
@@ -1875,7 +1874,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test requestChildFocus function",
method = "requestChildFocus",
args = {android.view.View.class, android.view.View.class}
@@ -1894,7 +1893,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test requestChildRectangleOnScreen function",
method = "requestChildRectangleOnScreen",
args = {android.view.View.class, android.graphics.Rect.class, boolean.class}
@@ -1905,7 +1904,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test requestDisallowInterceptTouchEvent function",
method = "requestDisallowInterceptTouchEvent",
args = {boolean.class}
@@ -1921,7 +1920,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test requestFocus function",
method = "requestFocus",
args = {int.class, android.graphics.Rect.class}
@@ -1934,7 +1933,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test requestTransparentRegion function",
method = "requestTransparentRegion",
args = {android.view.View.class}
@@ -1950,7 +1949,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test scheduleLayoutAnimation function",
method = "scheduleLayoutAnimation",
args = {}
@@ -1982,7 +1981,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAddStatesFromChildren function",
method = "setAddStatesFromChildren",
args = {boolean.class}
@@ -1997,7 +1996,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setChildrenDrawingCacheEnabled function",
method = "setChildrenDrawingCacheEnabled",
args = {boolean.class}
@@ -2015,7 +2014,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setChildrenDrawnWithCacheEnabled function",
method = "setChildrenDrawnWithCacheEnabled",
args = {boolean.class}
@@ -2033,7 +2032,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setClipChildren function",
method = "setClipChildren",
args = {boolean.class}
@@ -2095,7 +2094,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setClipToPadding function",
method = "setClipToPadding",
args = {boolean.class}
@@ -2134,7 +2133,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDescendantFocusability function",
method = "setDescendantFocusability",
args = {int.class}
@@ -2154,7 +2153,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setOnHierarchyChangeListener function",
method = "setOnHierarchyChangeListener",
args = {android.view.ViewGroup.OnHierarchyChangeListener.class}
@@ -2172,7 +2171,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPadding function",
method = "setPadding",
args = {int.class, int.class, int.class, int.class}
@@ -2196,7 +2195,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setPersistentDrawingCache function",
method = "setPersistentDrawingCache",
args = {int.class}
@@ -2209,7 +2208,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test showContextMenuForChild function",
method = "showContextMenuForChild",
args = {android.view.View.class}
@@ -2225,13 +2224,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test startLayoutAnimation and setLayoutAnimation",
method = "startLayoutAnimation",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test startLayoutAnimation and setLayoutAnimation",
method = "setLayoutAnimation",
args = {android.view.animation.LayoutAnimationController.class}
@@ -2250,7 +2249,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test updateViewLayout function",
method = "updateViewLayout",
args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class}
@@ -2267,7 +2266,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test debug function",
method = "debug",
args = {int.class}
@@ -2687,4 +2686,3 @@
}
}
}
-
diff --git a/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java b/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
index 1d4d679..3a98af1 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
@@ -35,7 +35,6 @@
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.ToBeFixed;
@TestTargetClass(ViewGroup.LayoutParams.class)
public class ViewGroup_LayoutParamsTest extends AndroidTestCase {
@@ -43,19 +42,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "ViewGroup.LayoutParams",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "ViewGroup.LayoutParams",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "ViewGroup.LayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
@@ -75,7 +74,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setBaseAttributes(TypedArray, int, int)",
method = "setBaseAttributes",
args = {android.content.res.TypedArray.class, int.class, int.class}
diff --git a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
index a79d0ca..b395fc7 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
@@ -45,25 +45,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test MarginLayoutParams constructor",
method = "ViewGroup.MarginLayoutParams",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test MarginLayoutParams constructor",
method = "ViewGroup.MarginLayoutParams",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test MarginLayoutParams constructor",
method = "ViewGroup.MarginLayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test MarginLayoutParams constructor",
method = "ViewGroup.MarginLayoutParams",
args = {android.view.ViewGroup.MarginLayoutParams.class}
@@ -102,7 +102,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setMargins function",
method = "setMargins",
args = {int.class, int.class, int.class, int.class}
diff --git a/tests/tests/view/src/android/view/cts/ViewStubTest.java b/tests/tests/view/src/android/view/cts/ViewStubTest.java
index 3662767..b29ad2c 100644
--- a/tests/tests/view/src/android/view/cts/ViewStubTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewStubTest.java
@@ -60,25 +60,25 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ViewStub}",
method = "ViewStub",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ViewStub}",
method = "ViewStub",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ViewStub}",
method = "ViewStub",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ViewStub}",
method = "ViewStub",
args = {android.content.Context.class, int.class}
@@ -119,7 +119,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#draw(Canvas)}",
method = "draw",
args = {android.graphics.Canvas.class}
@@ -132,7 +132,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#dispatchDraw(Canvas)}",
method = "dispatchDraw",
args = {android.graphics.Canvas.class}
@@ -144,7 +144,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#setVisibility(int)}",
method = "setVisibility",
args = {int.class}
@@ -184,14 +184,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ViewStub#getLayoutResource()} and {@link ViewStub#setLayoutResource(int)}",
+ level = TestLevel.COMPLETE,
method = "getLayoutResource",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ViewStub#getLayoutResource()} and {@link ViewStub#setLayoutResource(int)}",
+ level = TestLevel.COMPLETE,
method = "setLayoutResource",
args = {int.class}
)
@@ -210,7 +208,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#onMeasure(int, int)}",
method = "onMeasure",
args = {int.class, int.class}
@@ -229,7 +227,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#setOnInflateListener(OnInflateListener)}",
method = "setOnInflateListener",
args = {android.view.ViewStub.OnInflateListener.class}
@@ -246,8 +244,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test abnormal condition of {@link ViewStub#setOnInflateListener(OnInflateListener)}",
+ level = TestLevel.COMPLETE,
method = "setOnInflateListener",
args = {android.view.ViewStub.OnInflateListener.class}
)
@@ -265,13 +262,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#getInflatedId()} and {@link ViewStub#setInflatedId(int)}",
method = "getInflatedId",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#getInflatedId()} and {@link ViewStub#setInflatedId(int)}",
method = "setInflatedId",
args = {int.class}
@@ -289,7 +286,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewStub#inflate()}",
method = "inflate",
args = {}
@@ -316,7 +313,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test abnormal condition of {@link ViewStub#inflate()}",
method = "inflate",
args = {}
diff --git a/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java b/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
index 26583f4..587e8b0 100644
--- a/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
@@ -74,7 +74,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addOnGlobalFocusChangeListener(OnGlobalFocusChangeListener)",
method = "addOnGlobalFocusChangeListener",
args = {android.view.ViewTreeObserver.OnGlobalFocusChangeListener.class}
@@ -100,7 +100,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addOnGlobalLayoutListener(OnGlobalLayoutListener)",
method = "addOnGlobalLayoutListener",
args = {android.view.ViewTreeObserver.OnGlobalLayoutListener.class}
@@ -118,7 +118,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addOnPreDrawListener(OnPreDrawListener)",
method = "addOnPreDrawListener",
args = {android.view.ViewTreeObserver.OnPreDrawListener.class}
@@ -135,7 +135,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addOnTouchModeChangeListener(OnTouchModeChangeListener)",
method = "addOnTouchModeChangeListener",
args = {android.view.ViewTreeObserver.OnTouchModeChangeListener.class}
@@ -162,7 +162,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addOnComputeInternalInsetsListener(OnComputeInternalInsetsListener)",
method = "addOnComputeInternalInsetsListener",
args = {android.view.ViewTreeObserver.OnComputeInternalInsetsListener.class}
@@ -176,7 +176,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeOnComputeInternalInsetsListener(OnComputeInternalInsetsListener)",
method = "removeOnComputeInternalInsetsListener",
args = {android.view.ViewTreeObserver.OnComputeInternalInsetsListener.class}
@@ -190,7 +190,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchOnGlobalLayout()",
method = "dispatchOnGlobalLayout",
args = {}
@@ -207,7 +207,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test dispatchOnPreDraw()",
method = "dispatchOnPreDraw",
args = {}
@@ -224,7 +224,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test isAlive()",
method = "isAlive",
args = {}
@@ -237,7 +237,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeGlobalOnLayoutListener(OnGlobalLayoutListener)",
method = "removeGlobalOnLayoutListener",
args = {android.view.ViewTreeObserver.OnGlobalLayoutListener.class}
@@ -260,7 +260,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeOnGlobalFocusChangeListener(OnGlobalFocusChangeListener)",
method = "removeOnGlobalFocusChangeListener",
args = {android.view.ViewTreeObserver.OnGlobalFocusChangeListener.class}
@@ -295,7 +295,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeOnPreDrawListener(OnPreDrawListener)",
method = "removeOnPreDrawListener",
args = {android.view.ViewTreeObserver.OnPreDrawListener.class}
@@ -318,7 +318,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test removeOnTouchModeChangeListener(OnTouchModeChangeListener)",
method = "removeOnTouchModeChangeListener",
args = {android.view.ViewTreeObserver.OnTouchModeChangeListener.class}
diff --git a/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java b/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java
index e40eadf..28d2e05 100644
--- a/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java
+++ b/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java
@@ -47,7 +47,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "This is a foo test, just add annotation for constructor, to make nooser pass",
method = "View.MeasureSpec",
args = {}
@@ -56,7 +56,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test View.MeasureSpec#getSize(int)",
method = "getSize",
args = {int.class}
@@ -71,7 +71,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test View.MeasureSpec#toString(int)",
method = "toString",
args = {int.class}
@@ -86,7 +86,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test View.MeasureSpec#getMode(int)",
method = "getMode",
args = {int.class}
@@ -101,7 +101,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test View.MeasureSpec#makeMeasureSpec(int, int)",
method = "makeMeasureSpec",
args = {int.class, int.class}
diff --git a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
index defa828..a5fc482 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
@@ -59,19 +59,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link AbsSeekBar}.",
method = "AbsSeekBar",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link AbsSeekBar}.",
method = "AbsSeekBar",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link AbsSeekBar}.",
method = "AbsSeekBar",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -87,13 +87,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getThumbOffset() and setThumbOffset(int) function",
method = "setThumbOffset",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getThumbOffset() and setThumbOffset(int) function",
method = "getThumbOffset",
args = {}
@@ -116,7 +116,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setThumb(Drawable) function.",
method = "setThumb",
args = {android.graphics.drawable.Drawable.class}
@@ -139,7 +139,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onTouchEvent(MotionEvent) function.",
method = "onTouchEvent",
args = {android.view.MotionEvent.class}
@@ -171,7 +171,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test drawableStateChanged() function.",
method = "drawableStateChanged",
args = {}
@@ -191,7 +191,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onDraw(Canvas)",
method = "onDraw",
args = {android.graphics.Canvas.class}
@@ -215,7 +215,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onMeasure(int, int) function.",
method = "onMeasure",
args = {int.class, int.class}
@@ -282,13 +282,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test verifyDrawable(Drawable) and setThumb(Drawable) function.",
method = "setThumb",
args = {android.graphics.drawable.Drawable.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test verifyDrawable(Drawable) and setThumb(Drawable) function.",
method = "verifyDrawable",
args = {android.graphics.drawable.Drawable.class}
@@ -333,7 +333,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onSizeChanged(int, int, int, int) function.",
method = "onSizeChanged",
args = {int.class, int.class, int.class, int.class}
diff --git a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
index a426ef6..3b907d3 100644
--- a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
@@ -41,9 +41,10 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -97,21 +98,24 @@
android.R.layout.simple_dropdown_item_1line, WORDS);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test the constructor AutoCompleteTextView(Context)",
- targets = {
- @TestTarget(
- methodName = "AutoCompleteTextView",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test the constructor AutoCompleteTextView(Context)",
+ method = "AutoCompleteTextView",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "AutoCompleteTextView",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test the constructor AutoCompleteTextView(Context)",
+ method = "AutoCompleteTextView",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
),
- @TestTarget(
- methodName = "AutoCompleteTextView",
- methodArgs = {Context.class, AttributeSet.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test the constructor AutoCompleteTextView(Context)",
+ method = "AutoCompleteTextView",
+ args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
)
})
@ToBeFixed(bug = "1417734", explanation = "should add NullPointerException @throws" +
@@ -148,15 +152,12 @@
new AutoCompleteTextView(mActivity, null, -1);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#enoughToFilter()}.",
- targets = {
- @TestTarget(
- methodName = "enoughToFilter",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#enoughToFilter()}.",
+ method = "enoughToFilter",
+ args = {}
+ )
public void testEnoughToFilter() {
mAutoCompleteTextView.setThreshold(3);
assertEquals(3, mAutoCompleteTextView.getThreshold());
@@ -180,23 +181,21 @@
assertFalse(mAutoCompleteTextView.enoughToFilter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#setAdapter(ListAdapter)} and " +
- "{@link AutoCompleteTextView#getAdapter()} and " +
- "{@link AutoCompleteTextView#setAdapter(getFilter)}.",
- targets = {
- @TestTarget(
- methodName = "setAdapter",
- methodArgs = {ListAdapter.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setAdapter",
+ args = {android.widget.ListAdapter.class}
),
- @TestTarget(
- methodName = "getAdapter",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getAdapter",
+ args = {}
),
- @TestTarget(
- methodName = "getFilter",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getFilter",
+ args = {}
)
})
public void testAccessAdapter() {
@@ -222,18 +221,16 @@
assertNull(autoCompleteTextView.getFilter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#setOnItemClickListener(AdapterView."
- + "OnItemClickListener)} and {@link AutoCompleteTextView#getItemClickListener()}.",
- targets = {
- @TestTarget(
- methodName = "setOnItemClickListener",
- methodArgs = {AdapterView.OnItemClickListener.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnItemClickListener",
+ args = {android.widget.AdapterView.OnItemClickListener.class}
),
- @TestTarget(
- methodName = "getItemClickListener",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getItemClickListener",
+ args = {}
)
})
public void testAccessItemClickListener() {
@@ -252,20 +249,17 @@
assertNull(mAutoCompleteTextView.getItemClickListener());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#setOnItemSelectedListener(AdapterView."
- + "OnItemSelectedListener)} and {@link AutoCompleteTextView#"
- + "getItemSelectedListener()}.",
- targets = {
- @TestTarget(
- methodName = "setOnItemSelectedListener",
- methodArgs = {AdapterView.OnItemSelectedListener.class}
- ),
- @TestTarget(
- methodName = "getItemSelectedListener",
- methodArgs = {}
- )
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnItemSelectedListener",
+ args = {android.widget.AdapterView.OnItemSelectedListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getItemSelectedListener",
+ args = {}
+ )
})
public void testAccessItemSelectedListener() {
MockOnItemSelectedListener testOnItemSelectedListener = new MockOnItemSelectedListener();
@@ -283,15 +277,12 @@
assertNull(mAutoCompleteTextView.getItemSelectedListener());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#convertSelectionToString(Object)}.",
- targets = {
- @TestTarget(
- methodName = "convertSelectionToString",
- methodArgs = {Object.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#convertSelectionToString(Object)}.",
+ method = "convertSelectionToString",
+ args = {java.lang.Object.class}
+ )
public void testConvertSelectionToString() {
MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
@@ -304,15 +295,12 @@
assertEquals(STRING_TEST, autoCompleteTextView.convertSelectionToString(STRING_TEST));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#onTextChanged(CharSequence, int, int, int)}.",
- targets = {
- @TestTarget(
- methodName = "onTextChanged",
- methodArgs = {CharSequence.class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#onTextChanged(CharSequence, int, int, int)}.",
+ method = "onTextChanged",
+ args = {java.lang.CharSequence.class, int.class, int.class, int.class}
+ )
public void testOnTextChanged() {
MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
@@ -341,26 +329,26 @@
assertEquals(STRING_CHECK.length(), autoCompleteTextView.getAfter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onFocusChanged(boolean, int, Rect), dismissDropDown(), showDropDown()"
- + " and isPopupShowing().",
- targets = {
- @TestTarget(
- methodName = "onFocusChanged",
- methodArgs = {boolean.class, int.class, Rect.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "onFocusChanged",
+ args = {boolean.class, int.class, android.graphics.Rect.class}
),
- @TestTarget(
- methodName = "dismissDropDown",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "dismissDropDown",
+ args = {}
),
- @TestTarget(
- methodName = "showDropDown",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "showDropDown",
+ args = {}
),
- @TestTarget(
- methodName = "isPopupShowing",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isPopupShowing",
+ args = {}
)
})
@UiThreadTest
@@ -388,15 +376,12 @@
assertEquals(STRING_VALIDATED, mAutoCompleteTextView.getText().toString());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#replaceText(CharSequence)}.",
- targets = {
- @TestTarget(
- methodName = "replaceText",
- methodArgs = {CharSequence.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#replaceText(CharSequence)}.",
+ method = "replaceText",
+ args = {java.lang.CharSequence.class}
+ )
public void testReplaceText() {
MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
@@ -413,15 +398,12 @@
assertTrue(autoCompleteTextView.isOnTextChanged());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#setFrame(int, int, int, int)}.",
- targets = {
- @TestTarget(
- methodName = "setFrame",
- methodArgs = {int.class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#setFrame(int, int, int, int)}.",
+ method = "setFrame",
+ args = {int.class, int.class, int.class, int.class}
+ )
public void testSetFrame() {
MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
@@ -446,18 +428,16 @@
assertEquals(5, autoCompleteTextView.getBottom());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#getThreshold()} and " +
- "{@link AutoCompleteTextView#setThreshold(int)}.",
- targets = {
- @TestTarget(
- methodName = "getThreshold",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getThreshold",
+ args = {}
),
- @TestTarget(
- methodName = "setThreshold",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setThreshold",
+ args = {int.class}
)
})
public void testGetThreshold() {
@@ -478,18 +458,16 @@
assertEquals(1, autoCompleteTextView.getThreshold());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#getValidator()} and " +
- "{@link AutoCompleteTextView#setValidator(Validator)}.",
- targets = {
- @TestTarget(
- methodName = "getValidator",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getValidator",
+ args = {}
),
- @TestTarget(
- methodName = "setValidator",
- methodArgs = {Validator.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setValidator",
+ args = {android.widget.AutoCompleteTextView.Validator.class}
)
})
public void testAccessValidater() {
@@ -504,18 +482,14 @@
assertNull(mAutoCompleteTextView.getValidator());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#onFilterComplete()}." +
- " This function can only be test by indirect calling.",
- targets = {
- @TestTarget(
- methodName = "onFilterComplete",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "onFilterComplete",
+ args = {int.class}
+ )
@ToBeFixed(bug = "", explanation = "This case needs more carefully examined")
- public void TestOnFilterComplete() {
+ // This function can only be test by indirect calling.
+ public void _testOnFilterComplete() {
// Set Threshold to 4 characters
mAutoCompleteTextView.setThreshold(4);
@@ -555,17 +529,18 @@
assertTrue(mAutoCompleteTextView.isPopupShowing());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onKeyDown and performFiltering.",
- targets = {
- @TestTarget(
- methodName = "onKeyDown",
- methodArgs = {int.class, KeyEvent.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onKeyDown and performFiltering.",
+ method = "onKeyDown",
+ args = {int.class, android.view.KeyEvent.class}
),
- @TestTarget(
- methodName = "performFiltering",
- methodArgs = {CharSequence.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onKeyDown and performFiltering.",
+ method = "performFiltering",
+ args = {java.lang.CharSequence.class, int.class}
)
})
@ToBeFixed( bug = "", explanation = "mAutoCompleteTextView.isPopupShowing() should be false")
@@ -618,21 +593,22 @@
assertEquals(STRING_TEST, filter.getResult());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test performCompletion() and onKeyUp(int , KeyEvent).",
- targets = {
- @TestTarget(
- methodName = "performCompletion",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test performCompletion() and onKeyUp(int , KeyEvent).",
+ method = "performCompletion",
+ args = {}
),
- @TestTarget(
- methodName = "onKeyUp",
- methodArgs = {int.class, KeyEvent.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test performCompletion() and onKeyUp(int , KeyEvent).",
+ method = "onKeyUp",
+ args = {int.class, android.view.KeyEvent.class}
)
})
@ToBeFixed( bug = "", explanation = "This test is really broken and needs to be updated.")
- public void TestPerformCompletion() {
+ public void _testPerformCompletion() {
final MockOnItemClickListener listener = new MockOnItemClickListener();
mActivity.runOnUiThread(new Runnable() {
@@ -688,15 +664,12 @@
assertNotSame("", mAutoCompleteTextView.getText().toString());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#onWindowFocusChanged(boolean)}.",
- targets = {
- @TestTarget(
- methodName = "onWindowFocusChanged",
- methodArgs = {boolean.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#onWindowFocusChanged(boolean)}.",
+ method = "onWindowFocusChanged",
+ args = {boolean.class}
+ )
@UiThreadTest
public void testOnWindowFocusChanged() {
mAutoCompleteTextView.setText(STRING_TEST);
@@ -721,15 +694,12 @@
mAutoCompleteTextView.onWindowFocusChanged(hasWindowFocus);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#performValidation()}.",
- targets = {
- @TestTarget(
- methodName = "performValidation",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#performValidation()}.",
+ method = "performValidation",
+ args = {}
+ )
@UiThreadTest
public void testPerformValidation() {
final CharSequence text = "this";
@@ -743,15 +713,12 @@
mAutoCompleteTextView.setValidator(null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link AutoCompleteTextView#setCompletionHint(CharSequence)}.",
- targets = {
- @TestTarget(
- methodName = "setCompletionHint",
- methodArgs = {CharSequence.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link AutoCompleteTextView#setCompletionHint(CharSequence)}.",
+ method = "setCompletionHint",
+ args = {java.lang.CharSequence.class}
+ )
@ToBeFixed( bug = "1400249", explanation = "only setter no getter")
public void testSetCompletionHint() {
mAutoCompleteTextView.setCompletionHint("TEST HINT");
diff --git a/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java b/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java
index 6540be6..b72bc8c 100644
--- a/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java
@@ -21,9 +21,10 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseExpandableListAdapter;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -32,31 +33,29 @@
*/
@TestTargetClass(BaseExpandableListAdapter.class)
public class BaseExpandableListAdapterTest extends InstrumentationTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test areAllItemsEnabled(), this function always returns true.",
- targets = {
- @TestTarget(
- methodName = "areAllItemsEnabled",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test areAllItemsEnabled(), this function always returns true.",
+ method = "areAllItemsEnabled",
+ args = {}
+ )
public void testAreAllItemsEnabled() {
MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
assertTrue(adapter.areAllItemsEnabled());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getCombinedChildId(long, long) function.",
- targets = {
- @TestTarget(
- methodName = "getCombinedChildId",
- methodArgs = {long.class, long.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getCombinedChildId(long, long) function.",
+ method = "getCombinedChildId",
+ args = {long.class, long.class}
),
- @TestTarget(
- methodName = "getCombinedGroupId",
- methodArgs = {long.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getCombinedChildId(long, long) function.",
+ method = "getCombinedGroupId",
+ args = {long.class}
)
})
@ToBeFixed(bug = "1502158", explanation = "getCombinedChildId() always returns a group id, " +
@@ -76,15 +75,12 @@
assertTrue(childID != groupID);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test isEmpty() function.",
- targets = {
- @TestTarget(
- methodName = "isEmpty",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test isEmpty() function.",
+ method = "isEmpty",
+ args = {}
+ )
public void testIsEmpty() {
MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
assertTrue(adapter.isEmpty());
@@ -92,15 +88,12 @@
assertFalse(adapter.isEmpty());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test notifyDataSetChanged() function.",
- targets = {
- @TestTarget(
- methodName = "notifyDataSetChanged",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test notifyDataSetChanged() function.",
+ method = "notifyDataSetChanged",
+ args = {}
+ )
public void testNotifyDataSetChanged() {
MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
MockDataSetObserver dataSetObserver = new MockDataSetObserver();
@@ -111,15 +104,12 @@
assertTrue(dataSetObserver.hasCalledOnChanged());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test notifyDataSetInvalidated() function.",
- targets = {
- @TestTarget(
- methodName = "notifyDataSetInvalidated",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test notifyDataSetInvalidated() function.",
+ method = "notifyDataSetInvalidated",
+ args = {}
+ )
public void testNotifyDataSetInvalidated() {
MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
MockDataSetObserver dataSetObserver = new MockDataSetObserver();
@@ -130,48 +120,40 @@
assertTrue(dataSetObserver.hasCalledOnInvalidated());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onGroupCollapsed(int), this function is non-operation.",
- targets = {
- @TestTarget(
- methodName = "onGroupCollapsed",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onGroupCollapsed(int), this function is non-operation.",
+ method = "onGroupCollapsed",
+ args = {int.class}
+ )
public void testOnGroupCollapsed() {
MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
// this function is non-operation.
adapter.onGroupCollapsed(0);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onGroupExpanded(int), this function is non-operation.",
- targets = {
- @TestTarget(
- methodName = "onGroupExpanded",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onGroupExpanded(int), this function is non-operation.",
+ method = "onGroupExpanded",
+ args = {int.class}
+ )
public void testOnGroupExpanded() {
MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
// this function is non-operation.
adapter.onGroupExpanded(0);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test registerDataSetObserver(DataSetObserver) "
- + "and unregisterDataSetObserver(DataSetObserver) functions.",
- targets = {
- @TestTarget(
- methodName = "registerDataSetObserver",
- methodArgs = {DataSetObserver.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "registerDataSetObserver",
+ args = {android.database.DataSetObserver.class}
),
- @TestTarget(
- methodName = "unregisterDataSetObserver",
- methodArgs = {DataSetObserver.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "unregisterDataSetObserver",
+ args = {android.database.DataSetObserver.class}
)
})
public void testDataSetObserver() {
diff --git a/tests/tests/widget/src/android/widget/cts/ButtonTest.java b/tests/tests/widget/src/android/widget/cts/ButtonTest.java
index fe3dc88..b3dcabc 100644
--- a/tests/tests/widget/src/android/widget/cts/ButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ButtonTest.java
@@ -36,19 +36,19 @@
public class ButtonTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link Button}",
method = "Button",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link Button}",
method = "Button",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link Button}",
method = "Button",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
diff --git a/tests/tests/widget/src/android/widget/cts/ChronometerTest.java b/tests/tests/widget/src/android/widget/cts/ChronometerTest.java
index 7a572ef..0e9fbb7 100644
--- a/tests/tests/widget/src/android/widget/cts/ChronometerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ChronometerTest.java
@@ -49,19 +49,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Chronometer#Chronometer(Context)}.",
method = "Chronometer",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Chronometer#Chronometer(Context)}.",
method = "Chronometer",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link Chronometer#Chronometer(Context)}.",
method = "Chronometer",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -77,13 +77,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBase() and setBase(long)",
method = "getBase",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBase() and setBase(long)",
method = "setBase",
args = {long.class}
@@ -120,13 +120,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFormat() and setFormat(string)",
method = "getFormat",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getFormat() and setFormat(string)",
method = "setFormat",
args = {java.lang.String.class}
@@ -147,7 +147,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onDetachedFromWindow()",
method = "onDetachedFromWindow",
args = {}
@@ -175,7 +175,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onWindowVisibilityChanged(int)",
method = "onWindowVisibilityChanged",
args = {int.class}
@@ -202,13 +202,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test start() and stop()",
method = "start",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test start() and stop()",
method = "stop",
args = {}
diff --git a/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java b/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java
index 69cb41e..9b20386 100644
--- a/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java
@@ -57,19 +57,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link CompoundButton}",
method = "CompoundButton",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link CompoundButton}",
method = "CompoundButton",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link CompoundButton}",
method = "CompoundButton",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -109,14 +109,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CompoundButton#setChecked(boolean)} and Test {@link CompoundButton#isChecked()}",
+ level = TestLevel.COMPLETE,
method = "setChecked",
args = {boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CompoundButton#setChecked(boolean)} and Test {@link CompoundButton#isChecked()}",
+ level = TestLevel.COMPLETE,
method = "isChecked",
args = {}
)
@@ -147,7 +145,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#setOnCheckedChangeListener(OnCheckedChangeListener)}",
method = "setOnCheckedChangeListener",
args = {android.widget.CompoundButton.OnCheckedChangeListener.class}
@@ -170,7 +168,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#toggle()}",
method = "toggle",
args = {}
@@ -191,7 +189,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#performClick()}",
method = "performClick",
args = {}
@@ -220,7 +218,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#drawableStateChanged()}",
method = "drawableStateChanged",
args = {}
@@ -243,7 +241,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#setButtonDrawable(Drawable)}",
method = "setButtonDrawable",
args = {android.graphics.drawable.Drawable.class}
@@ -278,7 +276,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#setButtonDrawable(int)}",
method = "setButtonDrawable",
args = {int.class}
@@ -303,7 +301,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#onCreateDrawableState(int)}",
method = "onCreateDrawableState",
args = {int.class}
@@ -330,7 +328,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CompoundButton#onDraw(Canvas)}",
method = "onDraw",
args = {android.graphics.Canvas.class}
@@ -384,14 +382,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CompoundButton#onSaveInstanceState()} and Test {@link CompoundButton#onRestoreInstanceState(Parcelable)}",
+ level = TestLevel.COMPLETE,
method = "onSaveInstanceState",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CompoundButton#onSaveInstanceState()} and Test {@link CompoundButton#onRestoreInstanceState(Parcelable)}",
+ level = TestLevel.COMPLETE,
method = "onRestoreInstanceState",
args = {android.os.Parcelable.class}
)
diff --git a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
index 5b2e4bb..4c809dc 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
@@ -91,13 +91,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link CursorAdapter}",
method = "CursorAdapter",
args = {android.content.Context.class, android.database.Cursor.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link CursorAdapter}",
method = "CursorAdapter",
args = {android.content.Context.class, android.database.Cursor.class, boolean.class}
@@ -114,7 +114,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#init(Context, Cursor, boolean)}",
method = "init",
args = {android.content.Context.class, android.database.Cursor.class, boolean.class}
@@ -164,7 +164,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getCount()}",
method = "getCount",
args = {}
@@ -179,13 +179,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#changeCursor(Cursor)}",
method = "changeCursor",
args = {android.database.Cursor.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#changeCursor(Cursor)}",
method = "getCursor",
args = {}
@@ -203,7 +203,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#convertToString(Cursor)}",
method = "convertToString",
args = {android.database.Cursor.class}
@@ -216,7 +216,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#hasStableIds()}, this method always return true",
method = "hasStableIds",
args = {}
@@ -230,7 +230,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getView(int, View, ViewGroup)}",
method = "getView",
args = {int.class, android.view.View.class, android.view.ViewGroup.class}
@@ -267,10 +267,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#newDropDownView(Context, Cursor, ViewGroup)}",
method = "newDropDownView",
- args = {android.content.Context.class, android.database.Cursor.class, android.view.ViewGroup.class}
+ args = {android.content.Context.class, android.database.Cursor.class,
+ android.view.ViewGroup.class}
)
public void testNewDropDownView() {
CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, mCursor);
@@ -282,7 +283,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getDropDownView(int, View, ViewGroup)}",
method = "getDropDownView",
args = {int.class, android.view.View.class, android.view.ViewGroup.class}
@@ -309,7 +310,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getFilter()}",
method = "getFilter",
args = {}
@@ -321,7 +322,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getItem(int)}",
method = "getItem",
args = {int.class}
@@ -344,7 +345,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getItemId(int)}",
method = "getItemId",
args = {int.class}
@@ -365,14 +366,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CursorAdapter#getFilterQueryProvider()} and {@link CursorAdapter#setFilterQueryProvider(FilterQueryProvider)}",
+ level = TestLevel.COMPLETE,
method = "getFilterQueryProvider",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CursorAdapter#getFilterQueryProvider()} and {@link CursorAdapter#setFilterQueryProvider(FilterQueryProvider)}",
+ level = TestLevel.COMPLETE,
method = "setFilterQueryProvider",
args = {android.widget.FilterQueryProvider.class}
)
@@ -389,7 +388,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#runQueryOnBackgroundThread(CharSequence)}",
method = "runQueryOnBackgroundThread",
args = {java.lang.CharSequence.class}
diff --git a/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
index bb836d4..93b2e90 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
@@ -135,13 +135,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link CursorTreeAdapter}",
method = "CursorTreeAdapter",
args = {android.database.Cursor.class, android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link CursorTreeAdapter}",
method = "CursorTreeAdapter",
args = {android.database.Cursor.class, android.content.Context.class, boolean.class}
@@ -158,7 +158,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getCursor()}",
method = "getCursor",
args = {}
@@ -175,7 +175,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#setGroupCursor(Cursor)}",
method = "setGroupCursor",
args = {android.database.Cursor.class}
@@ -192,7 +192,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#setChildrenCursor(int, Cursor)}",
method = "setChildrenCursor",
args = {int.class, android.database.Cursor.class}
@@ -207,7 +207,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#changeCursor(Cursor)}",
method = "changeCursor",
args = {android.database.Cursor.class}
@@ -224,7 +224,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#notifyDataSetChanged(boolean)}",
method = "notifyDataSetChanged",
args = {boolean.class}
@@ -268,7 +268,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#notifyDataSetChanged()}",
method = "notifyDataSetChanged",
args = {}
@@ -299,7 +299,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#notifyDataSetInvalidated()}",
method = "notifyDataSetInvalidated",
args = {}
@@ -330,7 +330,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#onGroupCollapsed(int)}",
method = "onGroupCollapsed",
args = {int.class}
@@ -376,7 +376,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#hasStableIds()}, this method always return true",
method = "hasStableIds",
args = {}
@@ -390,7 +390,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#isChildSelectable(int, int)}",
method = "isChildSelectable",
args = {int.class, int.class}
@@ -405,7 +405,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#convertToString(Cursor)}",
method = "convertToString",
args = {android.database.Cursor.class}
@@ -418,7 +418,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getFilter()}",
method = "getFilter",
args = {}
@@ -436,14 +436,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CursorTreeAdapter#getFilterQueryProvider()} and {@link CursorTreeAdapter#setFilterQueryProvider(FilterQueryProvider)}",
+ level = TestLevel.COMPLETE,
method = "getFilterQueryProvider",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link CursorTreeAdapter#getFilterQueryProvider()} and {@link CursorTreeAdapter#setFilterQueryProvider(FilterQueryProvider)}",
+ level = TestLevel.COMPLETE,
method = "setFilterQueryProvider",
args = {android.widget.FilterQueryProvider.class}
)
@@ -460,7 +458,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#runQueryOnBackgroundThread(CharSequence)}",
method = "runQueryOnBackgroundThread",
args = {java.lang.CharSequence.class}
@@ -479,7 +477,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getGroup(int)}",
method = "getGroup",
args = {int.class}
@@ -504,7 +502,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getGroupCount()}",
method = "getGroupCount",
args = {}
@@ -518,7 +516,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getGroupId(int)}",
method = "getGroupId",
args = {int.class}
@@ -539,7 +537,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getGroupView(int, boolean, View, ViewGroup)}",
method = "getGroupView",
args = {int.class, boolean.class, android.view.View.class, android.view.ViewGroup.class}
@@ -580,7 +578,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getChild(int, int)}",
method = "getChild",
args = {int.class, int.class}
@@ -616,7 +614,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getChildId(int, int)}",
method = "getChildId",
args = {int.class, int.class}
@@ -653,7 +651,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorTreeAdapter#getChildrenCount(int)}",
method = "getChildrenCount",
args = {int.class}
@@ -677,10 +675,11 @@
" should check whether the return value from" +
" CursorTreeAdapter#getChildrenCursorHelper(int, boolean) is null")
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link CursorAdapter#getChildView(int, int, boolean, View, ViewGroup)}",
method = "getChildView",
- args = {int.class, int.class, boolean.class, android.view.View.class, android.view.ViewGroup.class}
+ args = {int.class, int.class, boolean.class, android.view.View.class,
+ android.view.ViewGroup.class}
)
public void testGetChildView() {
final String expectedStr = "getChildView test";
diff --git a/tests/tests/widget/src/android/widget/cts/DatePickerTest.java b/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
index 699137a..a8d8aad 100644
--- a/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
@@ -45,19 +45,19 @@
public class DatePickerTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of DatePicker.",
method = "DatePicker",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of DatePicker.",
method = "DatePicker",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors of DatePicker.",
method = "DatePicker",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -85,7 +85,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DatePicker#setEnabled(boolean)}.",
method = "setEnabled",
args = {boolean.class}
@@ -112,10 +112,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DatePicker#init()}.",
method = "init",
- args = {int.class, int.class, int.class, android.widget.DatePicker.OnDateChangedListener.class}
+ args = {int.class, int.class, int.class,
+ android.widget.DatePicker.OnDateChangedListener.class}
)
public void testInit() {
MockOnDateChangedListener onDateChangedListener = new MockOnDateChangedListener();
@@ -144,26 +145,22 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DatePicker#updateDate(int, int, int)} and {@link DatePicker#getYear()} and {@link DatePicker#getMonth()} and {@link DatePicker#getDayOfMonth()}.",
+ level = TestLevel.COMPLETE,
method = "updateDate",
args = {int.class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DatePicker#updateDate(int, int, int)} and {@link DatePicker#getYear()} and {@link DatePicker#getMonth()} and {@link DatePicker#getDayOfMonth()}.",
+ level = TestLevel.COMPLETE,
method = "getYear",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DatePicker#updateDate(int, int, int)} and {@link DatePicker#getYear()} and {@link DatePicker#getMonth()} and {@link DatePicker#getDayOfMonth()}.",
+ level = TestLevel.COMPLETE,
method = "getMonth",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DatePicker#updateDate(int, int, int)} and {@link DatePicker#getYear()} and {@link DatePicker#getMonth()} and {@link DatePicker#getDayOfMonth()}.",
+ level = TestLevel.COMPLETE,
method = "getDayOfMonth",
args = {}
)
@@ -193,7 +190,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DatePicker#updateDate(int, int, int)}.",
method = "updateDate",
args = {int.class, int.class, int.class}
@@ -224,20 +221,17 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DatePicker#onSaveInstanceState()} and {@link DatePicker#dispatchRestoreInstanceState(SparseArray)} and {@link DatePicker#onRestoreInstanceState(Parcelable)}.",
+ level = TestLevel.COMPLETE,
method = "onSaveInstanceState",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DatePicker#onSaveInstanceState()} and {@link DatePicker#dispatchRestoreInstanceState(SparseArray)} and {@link DatePicker#onRestoreInstanceState(Parcelable)}.",
+ level = TestLevel.COMPLETE,
method = "dispatchRestoreInstanceState",
args = {android.util.SparseArray.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link DatePicker#onSaveInstanceState()} and {@link DatePicker#dispatchRestoreInstanceState(SparseArray)} and {@link DatePicker#onRestoreInstanceState(Parcelable)}.",
+ level = TestLevel.COMPLETE,
method = "onRestoreInstanceState",
args = {android.os.Parcelable.class}
)
diff --git a/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java b/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
index 06500be..cf23382 100644
--- a/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
@@ -59,13 +59,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "DigitalClock",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "",
method = "DigitalClock",
args = {android.content.Context.class, android.util.AttributeSet.class}
@@ -81,7 +81,7 @@
// new the DigitalClock instance with real AttributeSet
new DigitalClock(mContext, getAttributeSet(R.layout.digitalclock_layout));
- // Test constructor with null Context, in fact, DigitalClock(mContext) function will
+ // Test constructor with null Context, in fact, DigitalClock(mContext) function will
//finally invoke this version.
try {
// Test with null Context
@@ -92,7 +92,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DigitalClock#onDetachedFromWindow()}.",
method = "onDetachedFromWindow",
args = {}
@@ -112,7 +112,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link DigitalClock#onAttachedToWindow()}.",
method = "onAttachedToWindow",
args = {}
diff --git a/tests/tests/widget/src/android/widget/cts/EditTextTest.java b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
index 6f67c23..1e4ba71 100644
--- a/tests/tests/widget/src/android/widget/cts/EditTextTest.java
+++ b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
@@ -52,19 +52,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link EditText}",
method = "EditText",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link EditText}",
method = "EditText",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link EditText}",
method = "EditText",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -106,14 +106,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link EditText#getText()} and {@link EditText#setText(CharSequence, BufferType)}, setText() ignores parameter BufferType, this function always use BufferType.EDITABLE",
+ level = TestLevel.COMPLETE,
method = "getText",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link EditText#getText()} and {@link EditText#setText(CharSequence, BufferType)}, setText() ignores parameter BufferType, this function always use BufferType.EDITABLE",
+ level = TestLevel.COMPLETE,
method = "setText",
args = {java.lang.CharSequence.class, android.widget.TextView.BufferType.class}
)
@@ -132,7 +130,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link EditText#setSelection(int)}",
method = "setSelection",
args = {int.class}
@@ -168,7 +166,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link EditText#setSelection(int, int)}",
method = "setSelection",
args = {int.class, int.class}
@@ -212,7 +210,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link EditText#selectAll()}",
method = "selectAll",
args = {}
@@ -238,7 +236,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link EditText#extendSelection(int)}",
method = "extendSelection",
args = {int.class}
@@ -275,7 +273,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link EditText#getDefaultEditable()}, this function always returns true",
method = "getDefaultEditable",
args = {}
@@ -287,7 +285,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "{@link EditText#getDefaultMovementMethod()}",
method = "getDefaultMovementMethod",
args = {}
@@ -304,7 +302,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test {@link EditText#setEllipsize(TextUtils.TruncateAt)}",
method = "setEllipsize",
args = {android.text.TextUtils.TruncateAt.class}
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
index de19d67..1e4353f 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
@@ -27,9 +27,10 @@
import android.widget.cts.util.ExpandableListScenario;
import android.widget.cts.util.ListUtil;
import android.widget.cts.util.ExpandableListScenario.MyGroup;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(ExpandableListView.class)
@@ -74,29 +75,23 @@
return groupPos;
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#expandGroup(int)}",
- targets = {
- @TestTarget(
- methodName = "expandGroup",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#expandGroup(int)}",
+ method = "expandGroup",
+ args = {int.class}
+ )
@MediumTest
public void testExpandGroup() {
expandGroup(-1, true);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#collapseGroup(int)}",
- targets = {
- @TestTarget(
- methodName = "collapseGroup",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#collapseGroup(int)}",
+ method = "collapseGroup",
+ args = {int.class}
+ )
@MediumTest
public void testCollapseGroup() {
final int groupPos = expandGroup(-1, true);
@@ -106,17 +101,18 @@
assertFalse("Group did not collapse", mListView.isGroupExpanded(groupPos));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#expandGroup(int)}",
- targets = {
- @TestTarget(
- methodName = "expandGroup",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#expandGroup(int)}",
+ method = "expandGroup",
+ args = {int.class}
),
- @TestTarget(
- methodName = "isGroupExpanded",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#expandGroup(int)}",
+ method = "isGroupExpanded",
+ args = {int.class}
)
})
@MediumTest
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
index 83c845e..2e11fca 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
@@ -41,29 +41,33 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@TestTargetClass(ExpandableListView.class)
public class ExpandableListViewTest extends AndroidTestCase {
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link ExpandableListView}",
- targets = {
- @TestTarget(
- methodName = "ExpandableListView",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link ExpandableListView}",
+ method = "ExpandableListView",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "ExpandableListView",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link ExpandableListView}",
+ method = "ExpandableListView",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
),
- @TestTarget(
- methodName = "ExpandableListView",
- methodArgs = {Context.class, AttributeSet.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link ExpandableListView}",
+ method = "ExpandableListView",
+ args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
)
})
@ToBeFixed(bug = "1417734", explanation = "ExpandableListView#ExpandableListView(Context), " +
@@ -102,15 +106,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setChildDivider(Drawable)}",
- targets = {
- @TestTarget(
- methodName = "setChildDivider",
- methodArgs = {Drawable.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setChildDivider(Drawable)}",
+ method = "setChildDivider",
+ args = {android.graphics.drawable.Drawable.class}
+ )
@ToBeFixed(bug = "1386429", explanation = "No getter and can't check indirectly")
public void testSetChildDivider() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
@@ -118,16 +119,11 @@
expandableListView.setChildDivider(drawable);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setAdapter(ListAdapter)}, " +
- "this function always throws a RuntimeException.",
- targets = {
- @TestTarget(
- methodName = "setAdapter",
- methodArgs = {ListAdapter.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setAdapter",
+ args = {android.widget.ListAdapter.class}
+ )
public void testSetAdapter() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
try {
@@ -137,15 +133,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getAdapter()}",
- targets = {
- @TestTarget(
- methodName = "getAdapter",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getAdapter()}",
+ method = "getAdapter",
+ args = {}
+ )
public void testGetAdapter() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
assertNull(expandableListView.getAdapter());
@@ -155,18 +148,16 @@
assertNotNull(expandableListView.getAdapter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setAdapter(ExpandableListAdapter)} " +
- "and {@link ExpandableListView#getExpandableListAdapter()}",
- targets = {
- @TestTarget(
- methodName = "setAdapter",
- methodArgs = {ExpandableListAdapter.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setAdapter",
+ args = {android.widget.ExpandableListAdapter.class}
),
- @TestTarget(
- methodName = "getExpandableListAdapter",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getExpandableListAdapter",
+ args = {}
)
})
public void testAccessExpandableListAdapter() {
@@ -178,15 +169,12 @@
assertSame(expandableAdapter, expandableListView.getExpandableListAdapter());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#performItemClick(View, int, long)}",
- targets = {
- @TestTarget(
- methodName = "performItemClick",
- methodArgs = {View.class, int.class, long.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#performItemClick(View, int, long)}",
+ method = "performItemClick",
+ args = {android.view.View.class, int.class, long.class}
+ )
public void testPerformItemClick() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
@@ -197,15 +185,12 @@
assertTrue(expandableListView.performItemClick(null, 100, 99));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setOnItemClickListener(OnItemClickListener)}",
- targets = {
- @TestTarget(
- methodName = "setOnItemClickListener",
- methodArgs = {OnItemClickListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setOnItemClickListener(OnItemClickListener)}",
+ method = "setOnItemClickListener",
+ args = {android.widget.AdapterView.OnItemClickListener.class}
+ )
@ToBeFixed(bug = "1486189", explanation = "It is a redundant override method")
public void testSetOnItemClickListener() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
@@ -216,18 +201,16 @@
assertSame(listener, expandableListView.getOnItemClickListener());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#expandGroup(int)} and " +
- "{@link ExpandableListView#setOnGroupExpandListener(OnGroupExpandListener)}",
- targets = {
- @TestTarget(
- methodName = "expandGroup",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "expandGroup",
+ args = {int.class}
),
- @TestTarget(
- methodName = "setOnGroupExpandListener",
- methodArgs = {OnGroupExpandListener.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnGroupExpandListener",
+ args = {android.widget.ExpandableListView.OnGroupExpandListener.class}
)
})
@ToBeFixed(bug = "1371108", explanation = "unexpected NullPointerException")
@@ -261,18 +244,16 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#collapseGroup(int)} and " +
- "{@link ExpandableListView#setOnGroupCollapseListener(OnGroupCollapseListener)}",
- targets = {
- @TestTarget(
- methodName = "collapseGroup",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "collapseGroup",
+ args = {int.class}
),
- @TestTarget(
- methodName = "setOnGroupCollapseListener",
- methodArgs = {OnGroupCollapseListener.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnGroupCollapseListener",
+ args = {android.widget.ExpandableListView.OnGroupCollapseListener.class}
)
})
@ToBeFixed(bug = "1371108", explanation = "unexpected NullPointerException")
@@ -306,15 +287,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setOnGroupClickListener(OnGroupClickListener)}",
- targets = {
- @TestTarget(
- methodName = "setOnGroupClickListener",
- methodArgs = {OnGroupClickListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setOnGroupClickListener(OnGroupClickListener)}",
+ method = "setOnGroupClickListener",
+ args = {android.widget.ExpandableListView.OnGroupClickListener.class}
+ )
public void testSetOnGroupClickListener() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setAdapter(new MockExpandableListAdapter());
@@ -326,15 +304,12 @@
assertTrue(listener.hasCalledOnGroupClick());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setOnChildClickListener(OnChildClickListener)}",
- targets = {
- @TestTarget(
- methodName = "setOnChildClickListener",
- methodArgs = {OnChildClickListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setOnChildClickListener(OnChildClickListener)}",
+ method = "setOnChildClickListener",
+ args = {android.widget.ExpandableListView.OnChildClickListener.class}
+ )
public void testSetOnChildClickListener() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setAdapter(new MockExpandableListAdapter());
@@ -349,15 +324,12 @@
assertTrue(listener.hasCalledOnChildClick());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getExpandableListPosition(int)}",
- targets = {
- @TestTarget(
- methodName = "getExpandableListPosition",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getExpandableListPosition(int)}",
+ method = "getExpandableListPosition",
+ args = {int.class}
+ )
public void testGetExpandableListPosition() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setAdapter(new MockExpandableListAdapter());
@@ -368,15 +340,12 @@
assertEquals(3L<<32, expandableListView.getExpandableListPosition(3));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getFlatListPosition(long)}",
- targets = {
- @TestTarget(
- methodName = "getFlatListPosition",
- methodArgs = {long.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getFlatListPosition(long)}",
+ method = "getFlatListPosition",
+ args = {long.class}
+ )
@ToBeFixed(bug = "1417734", explanation = "NullPointerException is not expected.")
public void testGetFlatListPosition() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
@@ -392,15 +361,12 @@
assertEquals(1, expandableListView.getFlatListPosition(0x8000000100000000L));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getSelectedPosition()}",
- targets = {
- @TestTarget(
- methodName = "getSelectedPosition",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getSelectedPosition()}",
+ method = "getSelectedPosition",
+ args = {}
+ )
public void testGetSelectedPosition() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
@@ -416,15 +382,12 @@
assertEquals(0, expandableListView.getSelectedPosition());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getSelectedId()}",
- targets = {
- @TestTarget(
- methodName = "getSelectedId",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getSelectedId()}",
+ method = "getSelectedId",
+ args = {}
+ )
public void testGetSelectedId() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
@@ -438,15 +401,12 @@
assertEquals(0, expandableListView.getSelectedId());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setSelectedGroup(int)}",
- targets = {
- @TestTarget(
- methodName = "setSelectedGroup",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setSelectedGroup(int)}",
+ method = "setSelectedGroup",
+ args = {int.class}
+ )
public void testSetSelectedGroup() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setAdapter(new MockExpandableListAdapter());
@@ -458,15 +418,12 @@
assertEquals(0, expandableListView.getSelectedPosition());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setSelectedChild(int, int, boolean)}",
- targets = {
- @TestTarget(
- methodName = "setSelectedChild",
- methodArgs = {int.class, int.class, boolean.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setSelectedChild(int, int, boolean)}",
+ method = "setSelectedChild",
+ args = {int.class, int.class, boolean.class}
+ )
public void testSetSelectedChild() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setAdapter(new MockExpandableListAdapter());
@@ -475,15 +432,12 @@
assertTrue(expandableListView.setSelectedChild(0, 1, true));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#isGroupExpanded(int)}",
- targets = {
- @TestTarget(
- methodName = "isGroupExpanded",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#isGroupExpanded(int)}",
+ method = "isGroupExpanded",
+ args = {int.class}
+ )
public void testIsGroupExpanded() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setAdapter(new MockExpandableListAdapter());
@@ -493,15 +447,12 @@
assertTrue(expandableListView.isGroupExpanded(1));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getPackedPositionType(long)}",
- targets = {
- @TestTarget(
- methodName = "getPackedPositionType",
- methodArgs = {long.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getPackedPositionType(long)}",
+ method = "getPackedPositionType",
+ args = {long.class}
+ )
public void testGetPackedPositionType() {
assertEquals(ExpandableListView.PACKED_POSITION_TYPE_NULL,
ExpandableListView.getPackedPositionType(
@@ -516,15 +467,12 @@
ExpandableListView.getPackedPositionType(0x8000000000000000L));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getPackedPositionGroup(long)}",
- targets = {
- @TestTarget(
- methodName = "getPackedPositionGroup",
- methodArgs = {long.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getPackedPositionGroup(long)}",
+ method = "getPackedPositionGroup",
+ args = {long.class}
+ )
public void testGetPackedPositionGroup() {
assertEquals(-1, ExpandableListView.getPackedPositionGroup(
ExpandableListView.PACKED_POSITION_VALUE_NULL));
@@ -538,15 +486,12 @@
assertEquals(0x7FFFFFFF, ExpandableListView.getPackedPositionGroup(0x7FFFFFFF00000000L));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getPackedPositionChild(long)}",
- targets = {
- @TestTarget(
- methodName = "getPackedPositionChild",
- methodArgs = {long.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getPackedPositionChild(long)}",
+ method = "getPackedPositionChild",
+ args = {long.class}
+ )
public void testGetPackedPositionChild() {
assertEquals(-1, ExpandableListView.getPackedPositionChild(
ExpandableListView.PACKED_POSITION_VALUE_NULL));
@@ -560,15 +505,12 @@
assertEquals(0xffffffff, ExpandableListView.getPackedPositionChild(0x80000000ffffffffL));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getPackedPositionForChild(int, int)}",
- targets = {
- @TestTarget(
- methodName = "getPackedPositionForChild",
- methodArgs = {int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getPackedPositionForChild(int, int)}",
+ method = "getPackedPositionForChild",
+ args = {int.class, int.class}
+ )
public void testGetPackedPositionForChild() {
assertEquals((long) 0x8000000000000000L,
ExpandableListView.getPackedPositionForChild(0, 0));
@@ -577,15 +519,12 @@
ExpandableListView.getPackedPositionForChild(Integer.MAX_VALUE, 0xffffffff));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#getPackedPositionForGroup(int)}",
- targets = {
- @TestTarget(
- methodName = "getPackedPositionForGroup",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#getPackedPositionForGroup(int)}",
+ method = "getPackedPositionForGroup",
+ args = {int.class}
+ )
public void testGetPackedPositionForGroup() {
assertEquals(0, ExpandableListView.getPackedPositionForGroup(0));
@@ -593,45 +532,36 @@
ExpandableListView.getPackedPositionForGroup(Integer.MAX_VALUE));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setChildIndicator(Drawable)}",
- targets = {
- @TestTarget(
- methodName = "setChildIndicator",
- methodArgs = {Drawable.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setChildIndicator(Drawable)}",
+ method = "setChildIndicator",
+ args = {android.graphics.drawable.Drawable.class}
+ )
@ToBeFixed(bug = "1386429", explanation = "No getter and can't check indirectly")
public void testSetChildIndicator() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setChildIndicator(null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setChildIndicatorBounds(int, int)}",
- targets = {
- @TestTarget(
- methodName = "setChildIndicatorBounds",
- methodArgs = {int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setChildIndicatorBounds(int, int)}",
+ method = "setChildIndicatorBounds",
+ args = {int.class, int.class}
+ )
@ToBeFixed(bug = "1386429", explanation = "No getter and can't check indirectly")
public void testSetChildIndicatorBounds() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setChildIndicatorBounds(10, 10);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setGroupIndicator(Drawable)}",
- targets = {
- @TestTarget(
- methodName = "setGroupIndicator",
- methodArgs = {Drawable.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setGroupIndicator(Drawable)}",
+ method = "setGroupIndicator",
+ args = {android.graphics.drawable.Drawable.class}
+ )
@ToBeFixed(bug = "1386429", explanation = "No getter and can't check indirectly")
public void testSetGroupIndicator() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
@@ -639,33 +569,28 @@
expandableListView.setGroupIndicator(drawable);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#setIndicatorBounds(int, int)}",
- targets = {
- @TestTarget(
- methodName = "setIndicatorBounds",
- methodArgs = {int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#setIndicatorBounds(int, int)}",
+ method = "setIndicatorBounds",
+ args = {int.class, int.class}
+ )
@ToBeFixed(bug = "1386429", explanation = "No getter and can't check indirectly")
public void testSetIndicatorBounds() {
ExpandableListView expandableListView = new ExpandableListView(mContext);
expandableListView.setIndicatorBounds(10,10);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#onSaveInstanceState()} and" +
- "{@link ExpandableListView#onRestoreInstanceState(Parcelable)}",
- targets = {
- @TestTarget(
- methodName = "onSaveInstanceState",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "onSaveInstanceState",
+ args = {}
),
- @TestTarget(
- methodName = "onRestoreInstanceState",
- methodArgs = {Parcelable.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "onRestoreInstanceState",
+ args = {android.os.Parcelable.class}
)
})
@ToBeFixed(bug = "", explanation = "can't use SaveState which is package protected")
@@ -681,15 +606,12 @@
assertNotNull(p2);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#dispatchDraw(Canvas)}",
- targets = {
- @TestTarget(
- methodName = "dispatchDraw",
- methodArgs = {Canvas.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#dispatchDraw(Canvas)}",
+ method = "dispatchDraw",
+ args = {android.graphics.Canvas.class}
+ )
public void testDispatchDraw() {
MockExpandableListView expandableListView = new MockExpandableListView(mContext);
expandableListView.dispatchDraw(null);
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
index 9962adb..99a8503 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
@@ -22,9 +22,10 @@
import android.view.KeyEvent;
import android.widget.ExpandableListView;
import android.widget.cts.util.ListUtil;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(ExpandableListView.class)
@@ -50,15 +51,12 @@
assertNotNull(mExpandableListView);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#expandGroup(int)}",
- targets = {
- @TestTarget(
- methodName = "expandGroup",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#expandGroup(int)}",
+ method = "expandGroup",
+ args = {int.class}
+ )
@MediumTest
public void testExpandOnFirstPosition() {
// Should be a header, and hence the first group should NOT have expanded
@@ -68,15 +66,12 @@
assertFalse(mExpandableListView.isGroupExpanded(0));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ExpandableListView#expandGroup(int)}",
- targets = {
- @TestTarget(
- methodName = "expandGroup",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ExpandableListView#expandGroup(int)}",
+ method = "expandGroup",
+ args = {int.class}
+ )
@LargeTest
public void testExpandOnFirstGroup() {
mListUtil.arrowScrollToSelectedPosition(getActivity().getNumOfHeadersAndFooters());
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java
index 7f6060a..6d8413b 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java
@@ -33,7 +33,7 @@
@TestTargetClass(ExpandableListContextMenuInfo.class)
public class ExpandableListView_ExpandableListContextMenuInfoTest extends AndroidTestCase {
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ExpandableListContextMenuInfo}",
method = "ExpandableListView.ExpandableListContextMenuInfo",
args = {android.view.View.class, long.class, long.class}
diff --git a/tests/tests/widget/src/android/widget/cts/GridViewTest.java b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
index ffd2e92..ee90f48 100644
--- a/tests/tests/widget/src/android/widget/cts/GridViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
@@ -80,19 +80,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link GridView}",
method = "GridView",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link GridView}",
method = "GridView",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link GridView}",
method = "GridView",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -135,14 +135,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link GridView#getAdapter()} and {@link GridView#setAdapter(ListAdapter)}",
+ level = TestLevel.COMPLETE,
method = "setAdapter",
args = {android.widget.ListAdapter.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link GridView#getAdapter()} and {@link GridView#setAdapter(ListAdapter)}",
+ level = TestLevel.COMPLETE,
method = "getAdapter",
args = {}
)
@@ -159,7 +157,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#setSelection(int)}",
method = "setSelection",
args = {int.class}
@@ -178,19 +176,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#onKeyDown(int, KeyEvent)}",
method = "onKeyDown",
args = {int.class, android.view.KeyEvent.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#onKeyDown(int, KeyEvent)}",
method = "onKeyUp",
args = {int.class, android.view.KeyEvent.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#onKeyDown(int, KeyEvent)}",
method = "onKeyMultiple",
args = {int.class, int.class, android.view.KeyEvent.class}
@@ -246,7 +244,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#setGravity(int)}",
method = "setGravity",
args = {int.class}
@@ -305,7 +303,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#setHorizontalSpacing(int)}",
method = "setHorizontalSpacing",
args = {int.class}
@@ -342,7 +340,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#setVerticalSpacing(int)}",
method = "setVerticalSpacing",
args = {int.class}
@@ -377,14 +375,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link GridView#setStretchMode(int)} and {@link GridView#getStretchMode()}",
+ level = TestLevel.COMPLETE,
method = "setStretchMode",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link GridView#setStretchMode(int)} and {@link GridView#getStretchMode()}",
+ level = TestLevel.COMPLETE,
method = "getStretchMode",
args = {}
)
@@ -488,7 +484,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#setNumColumns(int)}",
method = "setNumColumns",
args = {int.class}
@@ -537,10 +533,10 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link GridView#attachLayoutAnimationParameters(View, ViewGroup.LayoutParams, int, int)}",
+ level = TestLevel.COMPLETE,
method = "attachLayoutAnimationParameters",
- args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class, int.class, int.class}
+ args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class, int.class,
+ int.class}
)
public void testAttachLayoutAnimationParameters() {
MockGridView mockGridView = new MockGridView(mActivity);
@@ -552,7 +548,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#layoutChildren()}",
method = "layoutChildren",
args = {}
@@ -564,7 +560,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#onFocusChanged(boolean, int, Rect)}",
method = "onFocusChanged",
args = {boolean.class, int.class, android.graphics.Rect.class}
@@ -588,7 +584,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#onMeasure(int, int)}",
method = "onMeasure",
args = {int.class, int.class}
@@ -607,7 +603,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#setColumnWidth(int)}",
method = "setColumnWidth",
args = {int.class}
@@ -650,19 +646,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#computeVerticalScrollExtent()}",
method = "computeVerticalScrollExtent",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#computeVerticalScrollExtent()}",
method = "computeVerticalScrollOffset",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link GridView#computeVerticalScrollExtent()}",
method = "computeVerticalScrollRange",
args = {}
@@ -981,4 +977,3 @@
}
}
}
-
diff --git a/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java b/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
index 3ca809c..85ed82f 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
@@ -46,13 +46,13 @@
public class ImageSwitcherTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "ImageSwitcher",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "ImageSwitcher",
args = {android.content.Context.class, android.util.AttributeSet.class}
@@ -80,7 +80,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setImageResource(int)",
method = "setImageResource",
args = {int.class}
@@ -116,7 +116,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setImageURI(Uri)",
method = "setImageURI",
args = {android.net.Uri.class}
@@ -129,7 +129,7 @@
ImageView iv1 = new ImageView(getContext());
imageSwitcher.addView(iv1);
- // because I can not write file in /data/data/com.android.cts.stub, it will throw IOException.
+ // because I can not write file in /data/data/com.android, it will throw IOException.
// I just write the image file into database test path.
File imagefile = new File("/sqlite_stmt_journals", "tempimage.jpg");
if (imagefile.exists()) {
@@ -164,7 +164,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setImageDrawable(Drawable)",
method = "setImageDrawable",
args = {android.graphics.drawable.Drawable.class}
diff --git a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
index ca1f3a6..6086590 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
@@ -111,19 +111,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ImageView}",
method = "ImageView",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ImageView}",
method = "ImageView",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ImageView}",
method = "ImageView",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -158,7 +158,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#invalidateDrawable(Drawable)}",
method = "invalidateDrawable",
args = {android.graphics.drawable.Drawable.class}
@@ -170,7 +170,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setAdjustViewBounds(boolean)}",
method = "setAdjustViewBounds",
args = {boolean.class}
@@ -187,7 +187,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setMaxWidth(int)}",
method = "setMaxWidth",
args = {int.class}
@@ -200,7 +200,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setMaxHeight(int)}",
method = "setMaxHeight",
args = {int.class}
@@ -213,7 +213,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#getDrawable()}",
method = "getDrawable",
args = {}
@@ -231,7 +231,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setImageResource(int)}",
method = "setImageResource",
args = {int.class}
@@ -253,7 +253,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setImageURI(Uri)}",
method = "setImageURI",
args = {android.net.Uri.class}
@@ -264,7 +264,7 @@
mImageView.setImageURI(null);
assertNull(mImageView.getDrawable());
- // because I can not write file in /data/data/com.android.cts.stub, it will throw IOException.
+ // because I can not write file in /data/data/com.android, it will throw IOException.
// I just write the image file into database test path.
File imagefile = new File("/sqlite_stmt_journals", "tempimage.jpg");
if (imagefile.exists()) {
@@ -283,7 +283,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setImageDrawable(Drawable)}",
method = "setImageDrawable",
args = {android.graphics.drawable.Drawable.class}
@@ -306,7 +306,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setImageBitmap(Bitmap)}",
method = "setImageBitmap",
args = {android.graphics.Bitmap.class}
@@ -330,7 +330,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setImageState(int[], boolean)}",
method = "setImageState",
args = {int[].class, boolean.class}
@@ -343,7 +343,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setSelected(boolean)}",
method = "setSelected",
args = {boolean.class}
@@ -360,7 +360,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setImageLevel(int)}",
method = "setImageLevel",
args = {int.class}
@@ -377,14 +377,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ImageView#setScaleType(ScaleType)} and {@link ImageView#getScaleType()}",
+ level = TestLevel.COMPLETE,
method = "setScaleType",
args = {android.widget.ImageView.ScaleType.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ImageView#setScaleType(ScaleType)} and {@link ImageView#getScaleType()}",
+ level = TestLevel.COMPLETE,
method = "getScaleType",
args = {}
)
@@ -420,14 +418,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ImageView#setImageMatrix(Matrix)} and {@link ImageView#getImageMatrix()}",
+ level = TestLevel.COMPLETE,
method = "setImageMatrix",
args = {android.graphics.Matrix.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ImageView#setImageMatrix(Matrix)} and {@link ImageView#getImageMatrix()}",
+ level = TestLevel.COMPLETE,
method = "getImageMatrix",
args = {}
)
@@ -444,7 +440,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#getBaseline()}",
method = "getBaseline",
args = {}
@@ -455,7 +451,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setColorFilter(int, Mode)}",
method = "setColorFilter",
args = {int.class, android.graphics.PorterDuff.Mode.class}
@@ -473,7 +469,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#clearColorFilter()}",
method = "clearColorFilter",
args = {}
@@ -491,7 +487,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setColorFilter(ColorFilter)}",
method = "setColorFilter",
args = {android.graphics.ColorFilter.class}
@@ -510,7 +506,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setAlpha(int)}",
method = "setAlpha",
args = {int.class}
@@ -528,7 +524,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#drawableStateChanged()}",
method = "drawableStateChanged",
args = {}
@@ -544,7 +540,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#onCreateDrawableState(int)}",
method = "onCreateDrawableState",
args = {int.class}
@@ -568,7 +564,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#onDraw(Canvas)}",
method = "onDraw",
args = {android.graphics.Canvas.class}
@@ -582,7 +578,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#onMeasure(int, int)}",
method = "onMeasure",
args = {int.class, int.class}
@@ -595,7 +591,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#onSetAlpha(int)}",
method = "onSetAlpha",
args = {int.class}
@@ -609,7 +605,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#setFrame(int, int, int, int)}",
method = "setFrame",
args = {int.class, int.class, int.class, int.class}
@@ -630,7 +626,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ImageView#verifyDrawable(Drawable)}",
method = "verifyDrawable",
args = {android.graphics.drawable.Drawable.class}
diff --git a/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java b/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
index 88c9646..3eac05c 100644
--- a/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
@@ -59,13 +59,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link LinearLayout}",
method = "LinearLayout",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link LinearLayout}",
method = "LinearLayout",
args = {android.content.Context.class, android.util.AttributeSet.class}
@@ -91,14 +91,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#isBaselineAligned()} and {@link LinearLayout#setBaselineAligned(boolean)}",
+ level = TestLevel.COMPLETE,
method = "isBaselineAligned",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#isBaselineAligned()} and {@link LinearLayout#setBaselineAligned(boolean)}",
+ level = TestLevel.COMPLETE,
method = "setBaselineAligned",
args = {boolean.class}
)
@@ -126,7 +124,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link LinearLayout#getBaseline()}",
method = "getBaseline",
args = {}
@@ -159,14 +157,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#getBaselineAlignedChildIndex()} and {@link LinearLayout#setBaselineAlignedChildIndex(int)}",
+ level = TestLevel.COMPLETE,
method = "getBaselineAlignedChildIndex",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#getBaselineAlignedChildIndex()} and {@link LinearLayout#setBaselineAlignedChildIndex(int)}",
+ level = TestLevel.COMPLETE,
method = "setBaselineAlignedChildIndex",
args = {int.class}
)
@@ -203,14 +199,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#setWeightSum(float)} and {@link LinearLayout#getWeightSum()}",
+ level = TestLevel.COMPLETE,
method = "setWeightSum",
args = {float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#setWeightSum(float)} and {@link LinearLayout#getWeightSum()}",
+ level = TestLevel.COMPLETE,
method = "getWeightSum",
args = {}
)
@@ -247,14 +241,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#generateLayoutParams(AttributeSet)} and {@link LinearLayout#generateLayoutParams(ViewGroup.LayoutParams)}",
+ level = TestLevel.COMPLETE,
method = "generateLayoutParams",
args = {android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LinearLayout#generateLayoutParams(AttributeSet)} and {@link LinearLayout#generateLayoutParams(ViewGroup.LayoutParams)}",
+ level = TestLevel.COMPLETE,
method = "generateLayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
)
@@ -280,7 +272,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link LinearLayout#checkLayoutParams(ViewGroup.LayoutParams)}",
method = "checkLayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
@@ -296,7 +288,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link LinearLayout#generateDefaultLayoutParams()}",
method = "generateDefaultLayoutParams",
args = {}
@@ -324,37 +316,37 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three horizontal children",
method = "setGravity",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three horizontal children",
method = "setVerticalGravity",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three horizontal children",
method = "setOrientation",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three horizontal children",
method = "getOrientation",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three horizontal children",
method = "onMeasure",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three horizontal children",
method = "onLayout",
args = {boolean.class, int.class, int.class, int.class, int.class}
@@ -414,37 +406,37 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three vertical children",
method = "setGravity",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three vertical children",
method = "setHorizontalGravity",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three vertical children",
method = "setOrientation",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three vertical children",
method = "getOrientation",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three vertical children",
method = "onMeasure",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test layout three vertical children",
method = "onLayout",
args = {boolean.class, int.class, int.class, int.class, int.class}
diff --git a/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
index 5803188..24f84aa 100644
--- a/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
@@ -41,31 +41,31 @@
public class LinearLayout_LayoutParamsTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "LinearLayout.LayoutParams",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "LinearLayout.LayoutParams",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "LinearLayout.LayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "LinearLayout.LayoutParams",
args = {int.class, int.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "LinearLayout.LayoutParams",
args = {android.view.ViewGroup.MarginLayoutParams.class}
diff --git a/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java b/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java
index 71e1f17..7ed3c9b 100644
--- a/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java
@@ -40,9 +40,10 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -73,40 +74,54 @@
mActivity = getActivity();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link PopupWindow}",
- targets = {
- @TestTarget(
- methodName = "PopupWindow",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {}
),
- @TestTarget(
- methodName = "PopupWindow",
- methodArgs = {Context.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "PopupWindow",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
),
- @TestTarget(
- methodName = "PopupWindow",
- methodArgs = {Context.class, AttributeSet.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
),
- @TestTarget(
- methodName = "PopupWindow",
- methodArgs = {int.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {int.class, int.class}
),
- @TestTarget(
- methodName = "PopupWindow",
- methodArgs = {View.class}
- ),@TestTarget(
- methodName = "PopupWindow",
- methodArgs = {View.class, int.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {android.view.View.class}
),
- @TestTarget(
- methodName = "PopupWindow",
- methodArgs = {View.class, int.class, int.class, boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {android.view.View.class, int.class, int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link PopupWindow}",
+ method = "PopupWindow",
+ args = {android.view.View.class, int.class, int.class, boolean.class}
)
})
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
@@ -179,18 +194,16 @@
assertTrue(mPopupWindow.isFocusable());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#getBackground()} and " +
- "{@link PopupWindow#setBackgroundDrawable(Drawable)}",
- targets = {
- @TestTarget(
- methodName = "getBackground",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getBackground",
+ args = {}
),
- @TestTarget(
- methodName = "setBackgroundDrawable",
- methodArgs = {Drawable.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setBackgroundDrawable",
+ args = {android.graphics.drawable.Drawable.class}
)
})
public void testAccessBackground() {
@@ -204,18 +217,16 @@
assertNull(mPopupWindow.getBackground());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#getAnimationStyle()} and " +
- "{@link PopupWindow#setAnimationStyle(int)}",
- targets = {
- @TestTarget(
- methodName = "getAnimationStyle",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getAnimationStyle",
+ args = {}
),
- @TestTarget(
- methodName = "setAnimationStyle",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setAnimationStyle",
+ args = {int.class}
)
})
public void testAccessAnimationStyle() {
@@ -236,18 +247,16 @@
assertEquals(-100, mPopupWindow.getAnimationStyle());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#getContentView()} and " +
- "{@link PopupWindow#setContentView(View)}",
- targets = {
- @TestTarget(
- methodName = "setContentView",
- methodArgs = {View.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setContentView",
+ args = {android.view.View.class}
),
- @TestTarget(
- methodName = "getContentView",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getContentView",
+ args = {}
)
})
public void testAccessContentView() {
@@ -272,18 +281,16 @@
dismissPopup();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#setFocusable(boolean)} and " +
- "{@link PopupWindow#isFocusable()}",
- targets = {
- @TestTarget(
- methodName = "setFocusable",
- methodArgs = {boolean.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setFocusable",
+ args = {boolean.class}
),
- @TestTarget(
- methodName = "isFocusable",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isFocusable",
+ args = {}
)
})
public void testAccessFocusable() {
@@ -297,18 +304,18 @@
assertFalse(mPopupWindow.isFocusable());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#getHeight()} and " +
- "{@link PopupWindow#setHeight(int)}",
- targets = {
- @TestTarget(
- methodName = "setHeight",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#getHeight()} and {@link PopupWindow#setHeight(int)}",
+ method = "setHeight",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getHeight",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#getHeight()} and {@link PopupWindow#setHeight(int)}",
+ method = "getHeight",
+ args = {}
)
})
public void testAccessHeight() {
@@ -346,17 +353,18 @@
return wm.getDefaultDisplay();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#setWidth(int)} and {@link PopupWindow#getWidth()}",
- targets = {
- @TestTarget(
- methodName = "setWidth",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#setWidth(int)} and {@link PopupWindow#getWidth()}",
+ method = "setWidth",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getWidth",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#setWidth(int)} and {@link PopupWindow#getWidth()}",
+ method = "getWidth",
+ args = {}
)
})
public void testAccessWidth() {
@@ -383,15 +391,12 @@
assertEquals(width, mPopupWindow.getWidth());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#showAsDropDown(View)}",
- targets = {
- @TestTarget(
- methodName = "showAsDropDown",
- methodArgs = {View.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#showAsDropDown(View)}",
+ method = "showAsDropDown",
+ args = {android.view.View.class}
+ )
public void testShowAsDropDown() {
int[] anchorXY = new int[2];
int[] viewOnScreenXY = new int[2];
@@ -418,15 +423,12 @@
dismissPopup();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#showAtLocation(View, int, int, int)}",
- targets = {
- @TestTarget(
- methodName = "showAtLocation",
- methodArgs = {View.class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#showAtLocation(View, int, int, int)}",
+ method = "showAtLocation",
+ args = {android.view.View.class, int.class, int.class, int.class}
+ )
public void testShowAtLocation() {
int[] viewInWindowXY = new int[2];
int[] viewOnScreenXY = new int[2];
@@ -459,15 +461,12 @@
dismissPopup();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#showAsDropDown(View, int, int)}",
- targets = {
- @TestTarget(
- methodName = "showAsDropDown",
- methodArgs = {View.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#showAsDropDown(View, int, int)}",
+ method = "showAsDropDown",
+ args = {android.view.View.class, int.class, int.class}
+ )
public void testShowAsDropDownWithOffsets() {
int[] anchorXY = new int[2];
int[] viewOnScreenXY = new int[2];
@@ -496,15 +495,12 @@
dismissPopup();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#getMaxAvailableHeight(View)}",
- targets = {
- @TestTarget(
- methodName = "getMaxAvailableHeight",
- methodArgs = {View.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#getMaxAvailableHeight(View)}",
+ method = "getMaxAvailableHeight",
+ args = {android.view.View.class}
+ )
public void testGetMaxAvailableHeight() {
mPopupWindow = createPopupWindow(createPopupContent());
@@ -528,15 +524,12 @@
assertTrue(maxAvailableHeight <= avaliable);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#dismiss()}",
- targets = {
- @TestTarget(
- methodName = "dismiss",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#dismiss()}",
+ method = "dismiss",
+ args = {}
+ )
public void testDismiss() {
mPopupWindow = createPopupWindow(createPopupContent());
assertFalse(mPopupWindow.isShowing());
@@ -550,15 +543,12 @@
assertFalse(mPopupWindow.isShowing());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#setOnDismissListener(OnDismissListener)}",
- targets = {
- @TestTarget(
- methodName = "setOnDismissListener",
- methodArgs = {OnDismissListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#setOnDismissListener(OnDismissListener)}",
+ method = "setOnDismissListener",
+ args = {android.widget.PopupWindow.OnDismissListener.class}
+ )
public void testSetOnDismissListener() {
mPopupWindow = new PopupWindow(new TextView(mActivity));
mPopupWindow.setOnDismissListener(null);
@@ -579,23 +569,21 @@
assertEquals(2, onDismissListener.getOnDismissCalledCount());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#update()} and " +
- "{@link PopupWindow#setClippingEnabled(boolean)} and" +
- "{@link PopupWindow#setIgnoreCheekPress()}",
- targets = {
- @TestTarget(
- methodName = "update",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "update",
+ args = {}
),
- @TestTarget(
- methodName = "setClippingEnabled",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setClippingEnabled",
+ args = {boolean.class}
),
- @TestTarget(
- methodName = "setIgnoreCheekPress",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setIgnoreCheekPress",
+ args = {}
)
})
public void testUpdate() {
@@ -640,18 +628,16 @@
WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM & p.flags);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#update(int, int, int, int)} and " +
- "PopupWindow#isShowing()}",
- targets = {
- @TestTarget(
- methodName = "update",
- methodArgs = {int.class, int.class, int.class, int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "update",
+ args = {int.class, int.class, int.class, int.class}
),
- @TestTarget(
- methodName = "isShowing",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isShowing",
+ args = {}
)
})
public void testUpdatePositionAndDimension() {
@@ -703,18 +689,18 @@
dismissPopup();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#update(View, int, int)} and " +
- "PopupWindow#isShowing()}",
- targets = {
- @TestTarget(
- methodName = "update",
- methodArgs = {View.class, int.class, int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#update(View, int, int)} and PopupWindow#isShowing()}",
+ method = "update",
+ args = {android.view.View.class, int.class, int.class}
),
- @TestTarget(
- methodName = "isShowing",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#update(View, int, int)} and PopupWindow#isShowing()}",
+ method = "isShowing",
+ args = {}
)
})
public void testUpdateDimentionAndAlignAnchorView() {
@@ -744,18 +730,16 @@
mPopupWindow.dismiss();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#update(View, int, int, int, int)} and " +
- "PopupWindow#isShowing()}",
- targets = {
- @TestTarget(
- methodName = "update",
- methodArgs = {View.class, int.class, int.class, int.class, int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "update",
+ args = {android.view.View.class, int.class, int.class, int.class, int.class}
),
- @TestTarget(
- methodName = "isShowing",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isShowing",
+ args = {}
)
})
@ToBeFixed(bug="", explanation="can not update the position of popup window" +
@@ -833,18 +817,16 @@
dismissPopup();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#getInputMethodMode()} and " +
- "{@link PopupWindow#setInputMethodMode(boolean)} ",
- targets = {
- @TestTarget(
- methodName = "getInputMethodMode",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getInputMethodMode",
+ args = {}
),
- @TestTarget(
- methodName = "setInputMethodMode",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setInputMethodMode",
+ args = {int.class}
)
})
public void testAccessInputMethodMode() {
@@ -864,18 +846,16 @@
assertEquals(-1, mPopupWindow.getInputMethodMode());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#isClippingEnabled()} and " +
- "{@link PopupWindow#setClippingEnabled(boolean)} ",
- targets = {
- @TestTarget(
- methodName = "isClippingEnabled",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isClippingEnabled",
+ args = {}
),
- @TestTarget(
- methodName = "setClippingEnabled",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setClippingEnabled",
+ args = {boolean.class}
)
})
public void testAccessClippingEnabled() {
@@ -886,18 +866,16 @@
assertFalse(mPopupWindow.isClippingEnabled());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#isOutsideTouchable()} and " +
- "{@link PopupWindow#setOutsideTouchable(boolean)} ",
- targets = {
- @TestTarget(
- methodName = "isOutsideTouchable",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isOutsideTouchable",
+ args = {}
),
- @TestTarget(
- methodName = "setOutsideTouchable",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOutsideTouchable",
+ args = {boolean.class}
)
})
public void testAccessOutsideTouchable() {
@@ -908,18 +886,16 @@
assertTrue(mPopupWindow.isOutsideTouchable());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#isTouchable()} and " +
- "{@link PopupWindow#setTouchable(boolean)} ",
- targets = {
- @TestTarget(
- methodName = "isTouchable",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isTouchable",
+ args = {}
),
- @TestTarget(
- methodName = "setTouchable",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setTouchable",
+ args = {boolean.class}
)
})
public void testAccessTouchable() {
@@ -930,15 +906,12 @@
assertFalse(mPopupWindow.isTouchable());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#isAboveAnchor()}",
- targets = {
- @TestTarget(
- methodName = "isAboveAnchor",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#isAboveAnchor()}",
+ method = "isAboveAnchor",
+ args = {}
+ )
public void testIsAboveAnchor() {
mPopupWindow = createPopupWindow(createPopupContent());
final View upperAnchor = mActivity.findViewById(R.id.anchor_upper);
@@ -965,15 +938,12 @@
dismissPopup();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#setTouchInterceptor(OnTouchListener)}",
- targets = {
- @TestTarget(
- methodName = "setTouchInterceptor",
- methodArgs = {OnTouchListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#setTouchInterceptor(OnTouchListener)}",
+ method = "setTouchInterceptor",
+ args = {android.view.View.OnTouchListener.class}
+ )
public void testSetTouchInterceptor() {
mPopupWindow = new PopupWindow(new TextView(mActivity));
@@ -997,15 +967,12 @@
assertEquals(2, onTouchListener.getOnTouchCalledCount());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link PopupWindow#setWindowLayoutMode(int, int)}",
- targets = {
- @TestTarget(
- methodName = "setWindowLayoutMode",
- methodArgs = {int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link PopupWindow#setWindowLayoutMode(int, int)}",
+ method = "setWindowLayoutMode",
+ args = {int.class, int.class}
+ )
public void testSetWindowLayoutMode() {
mPopupWindow = new PopupWindow(new TextView(mActivity));
showPopup();
diff --git a/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java b/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
index c03890b..8f7cbb6 100644
--- a/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
@@ -44,19 +44,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioButton",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioButton",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioButton",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -98,7 +98,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioButton#toggle()}",
method = "toggle",
args = {}
diff --git a/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java b/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java
index 9ea9464..648c1d6 100644
--- a/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java
@@ -73,13 +73,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors.",
method = "RadioGroup",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors.",
method = "RadioGroup",
args = {android.content.Context.class, android.util.AttributeSet.class}
@@ -102,7 +102,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#setOnHierarchyChangeListener(OnHierarchyChangeListener)",
method = "setOnHierarchyChangeListener",
args = {android.view.ViewGroup.OnHierarchyChangeListener.class}
@@ -130,7 +130,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test PassThroughHierarchyChangeListener which is initialized in constructor",
method = "RadioGroup",
args = {android.content.Context.class}
@@ -148,7 +148,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test call back of OnCheckedChangeListener",
method = "setOnCheckedChangeListener",
args = {android.widget.RadioGroup.OnCheckedChangeListener.class}
@@ -185,7 +185,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#getCheckedRadioButtonId()}",
method = "getCheckedRadioButtonId",
args = {}
@@ -211,7 +211,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#clearCheck()}",
method = "clearCheck",
args = {}
@@ -255,7 +255,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#check(int)}",
method = "check",
args = {int.class}
@@ -307,7 +307,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#setOnCheckedChangeListener(OnCheckedChangeListener)}",
method = "setOnCheckedChangeListener",
args = {android.widget.RadioGroup.OnCheckedChangeListener.class}
@@ -352,7 +352,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#generateLayoutParams(AttributeSet)}",
method = "generateLayoutParams",
args = {android.util.AttributeSet.class}
@@ -387,7 +387,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#checkLayoutParams(android.view.ViewGroup.LayoutParams)}",
method = "checkLayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
@@ -411,7 +411,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#generateDefaultLayoutParams()}",
method = "generateDefaultLayoutParams",
args = {}
@@ -426,7 +426,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link RadioGroup#onFinishInflate()}",
method = "onFinishInflate",
args = {}
diff --git a/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java
index 4670674..a08dd16 100644
--- a/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java
@@ -55,31 +55,31 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioGroup.LayoutParams",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioGroup.LayoutParams",
args = {int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioGroup.LayoutParams",
args = {int.class, int.class, float.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioGroup.LayoutParams",
args = {android.view.ViewGroup.LayoutParams.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "RadioGroup.LayoutParams",
args = {android.view.ViewGroup.MarginLayoutParams.class}
@@ -158,7 +158,8 @@
} catch (NullPointerException e) {
}
- mLayoutParams = new LayoutParams(getContext(), getAttributeSet(com.android.cts.stub.R.layout.radiogroup_1));
+ mLayoutParams = new LayoutParams(getContext(),
+ getAttributeSet(com.android.cts.stub.R.layout.radiogroup_1));
assertNotNull(mLayoutParams);
assertEquals(0.5, mLayoutParams.weight, 0);
assertEquals(Gravity.BOTTOM, mLayoutParams.gravity);
@@ -174,15 +175,15 @@
assertEquals(RadioGroup.LayoutParams.WRAP_CONTENT, mLayoutParams.height);
try {
- new RadioGroup.LayoutParams(null, getAttributeSet(com.android.cts.stub.R.layout.radiogroup_1));
+ new RadioGroup.LayoutParams(null,
+ getAttributeSet(com.android.cts.stub.R.layout.radiogroup_1));
fail("The constructor should throw NullPointerException when param Context is null.");
} catch (NullPointerException e) {
}
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link LayoutParams#setBaseAttributes(android.content.res.TypedArray, int, int)}",
+ level = TestLevel.COMPLETE,
method = "setBaseAttributes",
args = {android.content.res.TypedArray.class, int.class, int.class}
)
diff --git a/tests/tests/widget/src/android/widget/cts/RatingBarTest.java b/tests/tests/widget/src/android/widget/cts/RatingBarTest.java
index 004a462..54d2ea6 100644
--- a/tests/tests/widget/src/android/widget/cts/RatingBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RatingBarTest.java
@@ -55,19 +55,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link RatingBar}",
method = "RatingBar",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link RatingBar}",
method = "RatingBar",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link RatingBar}",
method = "RatingBar",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -90,13 +90,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access OnRatingBarChangeListener",
method = "getOnRatingBarChangeListener",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access OnRatingBarChangeListener",
method = "setOnRatingBarChangeListener",
args = {android.widget.RatingBar.OnRatingBarChangeListener.class}
@@ -125,13 +125,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access isIndicator",
method = "isIndicator",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access isIndicator",
method = "setIsIndicator",
args = {boolean.class}
@@ -149,13 +149,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access NumStars",
method = "setNumStars",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access NumStars",
method = "getNumStars",
args = {}
@@ -185,13 +185,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access Rating",
method = "getRating",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access Rating",
method = "setRating",
args = {float.class}
@@ -214,7 +214,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setMax(int max)",
method = "setMax",
args = {int.class}
@@ -239,13 +239,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access StepSize",
method = "getStepSize",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test methods which access StepSize",
method = "setStepSize",
args = {float.class}
@@ -289,7 +289,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test onMeasure(int widthMeasureSpec, int heightMeasureSpec)",
method = "onMeasure",
args = {int.class, int.class}
@@ -382,4 +382,3 @@
}
}
}
-
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
index 13c669c..e9f716b 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
@@ -59,7 +59,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "ResourceCursorAdapter",
args = {android.content.Context.class, int.class, android.database.Cursor.class}
@@ -78,7 +78,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ResourceCursorAdapter#setDropDownViewResource(int)}",
method = "setDropDownViewResource",
args = {int.class}
@@ -107,11 +107,12 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ResourceCursorAdapter#newDropDownView(Context, Cursor, android.view.ViewGroup)}.The parameters Context and Cursor are never readin the method",
+ level = TestLevel.COMPLETE,
method = "newDropDownView",
- args = {android.content.Context.class, android.database.Cursor.class, android.view.ViewGroup.class}
+ args = {android.content.Context.class, android.database.Cursor.class,
+ android.view.ViewGroup.class}
)
+ // parameters Context and Cursor are never readin the method
public void testNewDropDownView() {
mResourceCursorAdapter = new MockResourceCursorAdapter(mContext,
R.layout.cursoradapter_item0, mCursor);
@@ -127,11 +128,12 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ResourceCursorAdapter#newView(Context, Cursor, android.view.ViewGroup)}The parameters Context and Cursor are never read in the method",
+ level = TestLevel.COMPLETE,
method = "newView",
- args = {android.content.Context.class, android.database.Cursor.class, android.view.ViewGroup.class}
+ args = {android.content.Context.class, android.database.Cursor.class,
+ android.view.ViewGroup.class}
)
+ // The parameters Context and Cursor are never read in the method
public void testNewView() {
mResourceCursorAdapter = new MockResourceCursorAdapter(mContext,
R.layout.cursoradapter_item0, mCursor);
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
index 1b67c41..7788437 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
@@ -80,22 +80,24 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "ResourceCursorTreeAdapter",
- args = {android.content.Context.class, android.database.Cursor.class, int.class, int.class}
+ args = {android.content.Context.class, android.database.Cursor.class, int.class,
+ int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "ResourceCursorTreeAdapter",
- args = {android.content.Context.class, android.database.Cursor.class, int.class, int.class, int.class}
+ args = {android.content.Context.class, android.database.Cursor.class, int.class,
+ int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test constructors",
+ level = TestLevel.COMPLETE,
method = "ResourceCursorTreeAdapter",
- args = {android.content.Context.class, android.database.Cursor.class, int.class, int.class, int.class, int.class}
+ args = {android.content.Context.class, android.database.Cursor.class, int.class,
+ int.class, int.class, int.class}
)
})
public void testConstructor() {
@@ -122,11 +124,12 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ResourceCursorTreeAdapter#newChildView(Context, Cursor, boolean, ViewGroup)}. The parameters Context and Cursor are never readin the method",
+ level = TestLevel.COMPLETE,
method = "newChildView",
- args = {android.content.Context.class, android.database.Cursor.class, boolean.class, android.view.ViewGroup.class}
+ args = {android.content.Context.class, android.database.Cursor.class, boolean.class,
+ android.view.ViewGroup.class}
)
+ // The parameters Context and Cursor are never readin the method
public void testNewChildView() {
mResourceCursorTreeAdapter = new MockResourceCursorTreeAdapter(mContext, null,
mGroupLayout, mChildLayout);
@@ -148,11 +151,12 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ResourceCursorTreeAdapter#newGroupView(Context, Cursor, boolean, ViewGroup)}. The parameters Context and Cursor are never readin the method",
+ level = TestLevel.COMPLETE,
method = "newGroupView",
- args = {android.content.Context.class, android.database.Cursor.class, boolean.class, android.view.ViewGroup.class}
+ args = {android.content.Context.class, android.database.Cursor.class, boolean.class,
+ android.view.ViewGroup.class}
)
+ // The parameters Context and Cursor are never readin the method
public void testNewGroupView() {
mResourceCursorTreeAdapter = new MockResourceCursorTreeAdapter(mContext, null,
mGroupLayout, mChildLayout);
@@ -218,11 +222,13 @@
}
@Override
- protected void bindChildView(View view, Context context, Cursor cursor, boolean isLastChild) {
+ protected void bindChildView(View view, Context context, Cursor cursor,
+ boolean isLastChild) {
}
@Override
- protected void bindGroupView(View view, Context context, Cursor cursor, boolean isExpanded) {
+ protected void bindGroupView(View view, Context context, Cursor cursor,
+ boolean isExpanded) {
}
@Override
diff --git a/tests/tests/widget/src/android/widget/cts/ScrollerTest.java b/tests/tests/widget/src/android/widget/cts/ScrollerTest.java
index d531eaa..4d4a990 100644
--- a/tests/tests/widget/src/android/widget/cts/ScrollerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ScrollerTest.java
@@ -16,9 +16,10 @@
package android.widget.cts;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import android.content.Context;
@@ -43,17 +44,18 @@
mScroller = new Scroller(mTargetContext);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructors",
- targets = {
- @TestTarget(
- methodName = "Scroller",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructors",
+ method = "Scroller",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "Scroller",
- methodArgs = {Context.class, Interpolator.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructors",
+ method = "Scroller",
+ args = {android.content.Context.class, android.view.animation.Interpolator.class}
)
})
public void testConstructor() {
@@ -62,17 +64,16 @@
new Scroller(mTargetContext, new LinearInterpolator());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#forceFinished(boolean)} and {@link Scroller#isFinished()}",
- targets = {
- @TestTarget(
- methodName = "forceFinished",
- methodArgs = {boolean.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "forceFinished",
+ args = {boolean.class}
),
- @TestTarget(
- methodName = "isFinished",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isFinished",
+ args = {}
)
})
public void testIsFinished() {
@@ -83,15 +84,12 @@
assertFalse(mScroller.isFinished());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#getDuration()}",
- targets = {
- @TestTarget(
- methodName = "getDuration",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link Scroller#getDuration()}",
+ method = "getDuration",
+ args = {}
+ )
public void testGetDuration() {
assertEquals(0, mScroller.getDuration());
@@ -111,17 +109,18 @@
assertTrue(mScroller.getDuration() > 0);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#getFinalX()} and {@link Scroller#setFinalX(int)}",
- targets = {
- @TestTarget(
- methodName = "setFinalX",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link Scroller#getFinalX()} and {@link Scroller#setFinalX(int)}",
+ method = "setFinalX",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getFinalX",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link Scroller#getFinalX()} and {@link Scroller#setFinalX(int)}",
+ method = "getFinalX",
+ args = {}
)
})
public void testAccessFinalX() {
@@ -138,17 +137,18 @@
assertFalse(mScroller.isFinished());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#setFinalY(int)} and {@link Scroller#getFinalY()}",
- targets = {
- @TestTarget(
- methodName = "setFinalY",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link Scroller#setFinalY(int)} and {@link Scroller#getFinalY()}",
+ method = "setFinalY",
+ args = {int.class}
),
- @TestTarget(
- methodName = "getFinalY",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link Scroller#setFinalY(int)} and {@link Scroller#getFinalY()}",
+ method = "getFinalY",
+ args = {}
)
})
public void testAccessFinalY() {
@@ -165,30 +165,29 @@
assertFalse(mScroller.isFinished());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#startScroll(int, int, int, int, int)}, "
- + "{@link Scroller#computeScrollOffset()}, "
- + "{@link Scroller#getCurrX()} and {@link Scroller#getCurrY()}"
- + "We can not get the precise currX and currY when scrolling",
- targets = {
- @TestTarget(
- methodName = "startScroll",
- methodArgs = {int.class, int.class, int.class, int.class, int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "startScroll",
+ args = {int.class, int.class, int.class, int.class, int.class}
),
- @TestTarget(
- methodName = "computeScrollOffset",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "computeScrollOffset",
+ args = {}
),
- @TestTarget(
- methodName = "getCurrX",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getCurrX",
+ args = {}
),
- @TestTarget(
- methodName = "getCurrY",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getCurrY",
+ args = {}
)
})
+ // We can not get the precise currX and currY when scrolling
public void testScrollMode() {
assertEquals(0, mScroller.getFinalX());
assertEquals(0, mScroller.getFinalY());
@@ -251,30 +250,29 @@
assertFalse(mScroller.computeScrollOffset());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#startScroll(int, int, int, int)}, "
- + "{@link Scroller#computeScrollOffset()}, "
- + "{@link Scroller#getCurrX()} and {@link Scroller#getCurrY()}"
- + "We can not get the precise currX and currY when scrolling",
- targets = {
- @TestTarget(
- methodName = "startScroll",
- methodArgs = {int.class, int.class, int.class, int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "startScroll",
+ args = {int.class, int.class, int.class, int.class}
),
- @TestTarget(
- methodName = "computeScrollOffset",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "computeScrollOffset",
+ args = {}
),
- @TestTarget(
- methodName = "getCurrX",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getCurrX",
+ args = {}
),
- @TestTarget(
- methodName = "getCurrY",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getCurrY",
+ args = {}
)
})
+ // We can not get the precise currX and currY when scrolling
public void testScrollModeWithDefaultDuration() {
assertEquals(0, mScroller.getFinalX());
assertEquals(0, mScroller.getFinalY());
@@ -307,31 +305,30 @@
assertFalse(mScroller.computeScrollOffset());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#fling(int, int, int, int, int, int, int, int)}, "
- + "{@link Scroller#computeScrollOffset()}, "
- + "{@link Scroller#getCurrX()} and {@link Scroller#getCurrY()}"
- + "We can not get the precise currX and currY when scrolling",
- targets = {
- @TestTarget(
- methodName = "fling",
- methodArgs = {int.class, int.class, int.class, int.class, int.class, int.class,
- int.class, int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "fling",
+ args = {int.class, int.class, int.class, int.class, int.class, int.class, int.class,
+ int.class}
),
- @TestTarget(
- methodName = "computeScrollOffset",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "computeScrollOffset",
+ args = {}
),
- @TestTarget(
- methodName = "getCurrX",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getCurrX",
+ args = {}
),
- @TestTarget(
- methodName = "getCurrY",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getCurrY",
+ args = {}
)
})
+ // We can not get the precise currX and currY when scrolling
public void testFlingMode() {
assertEquals(0, mScroller.getFinalX());
assertEquals(0, mScroller.getFinalY());
@@ -403,15 +400,12 @@
assertFalse(mScroller.computeScrollOffset());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#abortAnimation()}",
- targets = {
- @TestTarget(
- methodName = "abortAnimation",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link Scroller#abortAnimation()}",
+ method = "abortAnimation",
+ args = {}
+ )
public void testAbortAnimation() {
mScroller.startScroll(0, 0, 2000, -2000, 5000);
mScroller.computeScrollOffset();
@@ -435,16 +429,12 @@
assertTrue(mScroller.isFinished());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#extendDuration(int)}" +
- "We can not get the precise duration after it is extended",
- targets = {
- @TestTarget(
- methodName = "extendDuration",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "extendDuration",
+ args = {int.class}
+ )
+ // We can not get the precise duration after it is extended
public void testExtendDuration() {
mScroller.startScroll(0, 0, 0, 0, 5000);
assertEquals(5000, mScroller.getDuration());
@@ -490,16 +480,12 @@
assertTrue(mScroller.getCurrY() - curY < curY - 0);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link Scroller#timePassed()}"
- + "We can not get the precise time passed.",
- targets = {
- @TestTarget(
- methodName = "timePassed",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link Scroller#timePassed()}We can not get the precise time passed.",
+ method = "timePassed",
+ args = {}
+ )
public void testTimePassed() {
try {
Thread.sleep(1000);
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
index 60283ef..a26a75b 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
@@ -95,8 +95,8 @@
super.setUp();
mContext = getInstrumentation().getTargetContext();
mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- mAdapterHost = (LinearLayout) mInflater.inflate(com.android.cts.stub.R.layout.cursoradapter_host,
- null);
+ mAdapterHost = (LinearLayout) mInflater.inflate(
+ com.android.cts.stub.R.layout.cursoradapter_host, null);
// new the SimpleAdapter instance
mSimpleAdapter = new SimpleAdapter(mContext,
@@ -105,10 +105,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "SimpleAdapter",
- args = {android.content.Context.class, java.util.List.class, int.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, java.util.List.class, int.class,
+ java.lang.String[].class, int[].class}
)
public void testConstructor() {
new SimpleAdapter(mContext, createTestList(DEFAULT_COLUMN_COUNT, DEFAULT_ROW_COUNT),
@@ -116,7 +117,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#getCount()}",
method = "getCount",
args = {}
@@ -133,7 +134,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#getItem(int)}",
method = "getItem",
args = {int.class}
@@ -158,7 +159,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#getItemId(int)}",
method = "getItemId",
args = {int.class}
@@ -177,7 +178,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#getView(int, View, ViewGroup)}",
method = "getView",
args = {int.class, android.view.View.class, android.view.ViewGroup.class}
@@ -235,7 +236,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#setDropDownViewResource(int)}",
method = "setDropDownViewResource",
args = {int.class}
@@ -261,7 +262,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#getDropDownView(int, View, ViewGroup)}",
method = "getDropDownView",
args = {int.class, android.view.View.class, android.view.ViewGroup.class}
@@ -320,14 +321,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleAdapter#getViewBinder()} and {@link SimpleAdapter#setViewBinder(ViewBinder)}",
+ level = TestLevel.COMPLETE,
method = "setViewBinder",
args = {android.widget.SimpleAdapter.ViewBinder.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleAdapter#getViewBinder()} and {@link SimpleAdapter#setViewBinder(ViewBinder)}",
+ level = TestLevel.COMPLETE,
method = "getViewBinder",
args = {}
)
@@ -352,13 +351,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#setViewImage(ImageView, String)",
method = "setViewImage",
args = {android.widget.ImageView.class, java.lang.String.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#setViewImage(ImageView, String)",
method = "setViewImage",
args = {android.widget.ImageView.class, int.class}
@@ -396,7 +395,8 @@
view = new ImageView(mContext);
assertNull(view.getDrawable());
mSimpleAdapter.setViewImage(view, com.android.cts.stub.R.drawable.scenery);
- d = (BitmapDrawable) mContext.getResources().getDrawable(com.android.cts.stub.R.drawable.scenery);
+ d = (BitmapDrawable) mContext.getResources()
+ .getDrawable(com.android.cts.stub.R.drawable.scenery);
WidgetTestUtils.assertEquals(d.getBitmap(),
((BitmapDrawable) view.getDrawable()).getBitmap());
@@ -413,7 +413,8 @@
mSimpleAdapter.setViewImage(view, SimpleCursorAdapterTest.createTestImage(mContext,
"testimage", com.android.cts.stub.R.raw.testimage));
assertNotNull(view.getDrawable());
- d = (BitmapDrawable) mContext.getResources().getDrawable(com.android.cts.stub.R.raw.testimage);
+ d = (BitmapDrawable) mContext.getResources()
+ .getDrawable(com.android.cts.stub.R.raw.testimage);
WidgetTestUtils.assertEquals(d.getBitmap(),
((BitmapDrawable) view.getDrawable()).getBitmap());
} finally {
@@ -422,7 +423,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#setViewText(TextView, String)}",
method = "setViewText",
args = {android.widget.TextView.class, java.lang.String.class}
@@ -437,7 +438,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleAdapter#getFilter()}",
method = "getFilter",
args = {}
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
index b6a4d6d..e8f04de 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
@@ -109,10 +109,11 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor",
method = "SimpleCursorAdapter",
- args = {android.content.Context.class, int.class, android.database.Cursor.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, int.class, android.database.Cursor.class,
+ java.lang.String[].class, int[].class}
)
public void testConstructor() {
new SimpleCursorAdapter(mContext, R.layout.simple_list_item_1,
@@ -121,10 +122,10 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorAdapter#bindView(View, Context, Cursor)}. The paramcontext is never readed in the method.",
+ level = TestLevel.COMPLETE,
method = "bindView",
- args = {android.view.View.class, android.content.Context.class, android.database.Cursor.class}
+ args = {android.view.View.class, android.content.Context.class,
+ android.database.Cursor.class}
)
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc of "
+ "SimpleCursorAdapter#bindView(View, Context, Cursor) if the param view is "
@@ -171,14 +172,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorAdapter#getViewBinder()} and {@link SimpleCursorAdapter#setViewBinder(ViewBinder)} ",
+ level = TestLevel.COMPLETE,
method = "getViewBinder",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorAdapter#getViewBinder()} and {@link SimpleCursorAdapter#setViewBinder(ViewBinder)} ",
+ level = TestLevel.COMPLETE,
method = "setViewBinder",
args = {android.widget.SimpleCursorAdapter.ViewBinder.class}
)
@@ -199,7 +198,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleCursorAdapter#setViewText(TextView, String)}",
method = "setViewText",
args = {android.widget.TextView.class, java.lang.String.class}
@@ -214,7 +213,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleCursorAdapter#setViewImage(ImageView, String)}",
method = "setViewImage",
args = {android.widget.ImageView.class, java.lang.String.class}
@@ -225,7 +224,8 @@
// resId
ImageView view = new ImageView(mContext);
assertNull(view.getDrawable());
- mSimpleCursorAdapter.setViewImage(view, String.valueOf(com.android.cts.stub.R.drawable.scenery));
+ mSimpleCursorAdapter.setViewImage(view,
+ String.valueOf(com.android.cts.stub.R.drawable.scenery));
assertNotNull(view.getDrawable());
BitmapDrawable d = (BitmapDrawable) mContext.getResources().getDrawable(
com.android.cts.stub.R.drawable.scenery);
@@ -252,10 +252,11 @@
view = new ImageView(mContext);
assertNull(view.getDrawable());
try {
- mSimpleCursorAdapter.setViewImage(view,
- createTestImage(mContext, SAMPLE_IMAGE_NAME, com.android.cts.stub.R.raw.testimage));
+ mSimpleCursorAdapter.setViewImage(view, createTestImage(mContext, SAMPLE_IMAGE_NAME,
+ com.android.cts.stub.R.raw.testimage));
assertNotNull(view.getDrawable());
- d = (BitmapDrawable) mContext.getResources().getDrawable(com.android.cts.stub.R.raw.testimage);
+ d = (BitmapDrawable) mContext.getResources()
+ .getDrawable(com.android.cts.stub.R.raw.testimage);
WidgetTestUtils.assertEquals(d.getBitmap(),
((BitmapDrawable) view.getDrawable()).getBitmap());
} finally {
@@ -265,14 +266,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorAdapter#getStringConversionColumn()} and {@link SimpleCursorAdapter#setStringConversionColumn(int)}",
+ level = TestLevel.COMPLETE,
method = "getStringConversionColumn",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorAdapter#getStringConversionColumn()} and {@link SimpleCursorAdapter#setStringConversionColumn(int)}",
+ level = TestLevel.COMPLETE,
method = "setStringConversionColumn",
args = {int.class}
)
@@ -297,14 +296,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorAdapter#setCursorToStringConverter(CursorToStringConverter)} and {@link SimpleCursorAdapter#getCursorToStringConverter()}",
+ level = TestLevel.COMPLETE,
method = "getCursorToStringConverter",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorAdapter#setCursorToStringConverter(CursorToStringConverter)} and {@link SimpleCursorAdapter#getCursorToStringConverter()}",
+ level = TestLevel.COMPLETE,
method = "setCursorToStringConverter",
args = {android.widget.SimpleCursorAdapter.CursorToStringConverter.class}
)
@@ -322,7 +319,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleCursorAdapter#changeCursor(Cursor)}",
method = "changeCursor",
args = {android.database.Cursor.class}
@@ -347,7 +344,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleCursorAdapter#convertToString(Cursor)}",
method = "convertToString",
args = {android.database.Cursor.class}
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
index 55c948b..6cceae4 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
@@ -79,22 +79,28 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "SimpleCursorTreeAdapter",
- args = {android.content.Context.class, android.database.Cursor.class, int.class, int.class, java.lang.String[].class, int[].class, int.class, int.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, android.database.Cursor.class, int.class,
+ int.class, java.lang.String[].class, int[].class, int.class, int.class,
+ java.lang.String[].class, int[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "SimpleCursorTreeAdapter",
- args = {android.content.Context.class, android.database.Cursor.class, int.class, int.class, java.lang.String[].class, int[].class, int.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, android.database.Cursor.class, int.class,
+ int.class, java.lang.String[].class, int[].class, int.class,
+ java.lang.String[].class, int[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "SimpleCursorTreeAdapter",
- args = {android.content.Context.class, android.database.Cursor.class, int.class, java.lang.String[].class, int[].class, int.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, android.database.Cursor.class, int.class,
+ java.lang.String[].class, int[].class, int.class, java.lang.String[].class,
+ int[].class}
)
})
public void testConstructor() {
@@ -113,10 +119,10 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorTreeAdapter#bindChildView(View, Context, Cursor, boolean)}The param context and islastChild is never readed.",
+ level = TestLevel.COMPLETE,
method = "bindChildView",
- args = {android.view.View.class, android.content.Context.class, android.database.Cursor.class, boolean.class}
+ args = {android.view.View.class, android.content.Context.class,
+ android.database.Cursor.class, boolean.class}
)
public void testBindChildView() {
mGroupCursor = createTestCursor(2, 20, "group");
@@ -137,11 +143,12 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleCursorTreeAdapter#bindGroupView(View, Context, Cursor, boolean)}The param context and isExpanded is never readed.",
+ level = TestLevel.COMPLETE,
method = "bindGroupView",
- args = {android.view.View.class, android.content.Context.class, android.database.Cursor.class, boolean.class}
+ args = {android.view.View.class, android.content.Context.class,
+ android.database.Cursor.class, boolean.class}
)
+ // The param context and isExpanded is never readed.
public void testBindGroupView() {
mGroupCursor = createTestCursor(2, 20, "group");
mGroupCursor.moveToFirst();
@@ -159,7 +166,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleCursorTreeAdapter#setViewImage(ImageView, String)}",
method = "setViewImage",
args = {android.widget.ImageView.class, java.lang.String.class}
@@ -175,7 +182,8 @@
// color drawable
ImageView view = new ImageView(mContext);
assertNull(view.getDrawable());
- mSimpleCursorTreeAdapter.setViewImage(view, String.valueOf(com.android.cts.stub.R.drawable.scenery));
+ mSimpleCursorTreeAdapter.setViewImage(view,
+ String.valueOf(com.android.cts.stub.R.drawable.scenery));
BitmapDrawable d = (BitmapDrawable) mContext.getResources().getDrawable(
com.android.cts.stub.R.drawable.scenery);
WidgetTestUtils.assertEquals(d.getBitmap(),
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java
index f1d3a67..090821e 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java
@@ -109,22 +109,28 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "SimpleExpandableListAdapter",
- args = {android.content.Context.class, java.util.List.class, int.class, int.class, java.lang.String[].class, int[].class, java.util.List.class, int.class, int.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, java.util.List.class, int.class, int.class,
+ java.lang.String[].class, int[].class, java.util.List.class, int.class,
+ int.class, java.lang.String[].class, int[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "SimpleExpandableListAdapter",
- args = {android.content.Context.class, java.util.List.class, int.class, int.class, java.lang.String[].class, int[].class, java.util.List.class, int.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, java.util.List.class, int.class, int.class,
+ java.lang.String[].class, int[].class, java.util.List.class, int.class,
+ java.lang.String[].class, int[].class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors",
method = "SimpleExpandableListAdapter",
- args = {android.content.Context.class, java.util.List.class, int.class, java.lang.String[].class, int[].class, java.util.List.class, int.class, java.lang.String[].class, int[].class}
+ args = {android.content.Context.class, java.util.List.class, int.class,
+ java.lang.String[].class, int[].class, java.util.List.class, int.class,
+ java.lang.String[].class, int[].class}
)
})
public void testConstructor() {
@@ -145,7 +151,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#getChild(int, int)}",
method = "getChild",
args = {int.class, int.class}
@@ -188,7 +194,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#getChildId(int, int)}",
method = "getChildId",
args = {int.class, int.class}
@@ -207,10 +213,10 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleExpandableListAdapter#getChildView(int, int, boolean, View, ViewGroup)}",
+ level = TestLevel.COMPLETE,
method = "getChildView",
- args = {int.class, int.class, boolean.class, android.view.View.class, android.view.ViewGroup.class}
+ args = {int.class, int.class, boolean.class, android.view.View.class,
+ android.view.ViewGroup.class}
)
@ToBeFixed(bug = "1417734", explanation = "should add @throws clause into javadoc of "
+ "SimpleExpandableListAdapter#getChildView(int, int, boolean, View, ViewGroup if "
@@ -280,7 +286,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#newChildView(boolean, ViewGroup)}",
method = "newChildView",
args = {boolean.class, android.view.ViewGroup.class}
@@ -312,7 +318,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#getChildrenCount(int)}",
method = "getChildrenCount",
args = {int.class}
@@ -340,7 +346,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#getGroup(int)}",
method = "getGroup",
args = {int.class}
@@ -371,7 +377,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#getGroupCount()}",
method = "getGroupCount",
args = {}
@@ -386,7 +392,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#getGroupId(int)}",
method = "getGroupId",
args = {int.class}
@@ -403,8 +409,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleExpandableListAdapter#getGroupView(int, boolean, View, ViewGroup)}",
+ level = TestLevel.COMPLETE,
method = "getGroupView",
args = {int.class, boolean.class, android.view.View.class, android.view.ViewGroup.class}
)
@@ -464,7 +469,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link SimpleExpandableListAdapter#newGroupView(boolean, ViewGroup)}",
method = "newGroupView",
args = {boolean.class, android.view.ViewGroup.class}
@@ -496,8 +501,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleExpandableListAdapter#isChildSelectable(int, int)}This method always return true",
+ level = TestLevel.COMPLETE,
method = "isChildSelectable",
args = {int.class, int.class}
)
@@ -515,8 +519,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link SimpleExpandableListAdapter#hasStableIds()}This method always returns true",
+ level = TestLevel.COMPLETE,
method = "hasStableIds",
args = {}
)
diff --git a/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java b/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java
index f1a56ee..4d1312b 100644
--- a/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java
@@ -35,9 +35,10 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -58,17 +59,18 @@
mContext = getInstrumentation().getContext();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link TableLayout}",
- targets = {
- @TestTarget(
- methodName = "TableLayout",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout}",
+ method = "TableLayout",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "TableLayout",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout}",
+ method = "TableLayout",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
)
})
@UiThreadTest
@@ -79,7 +81,8 @@
TableStubActivity activity = getActivity();
activity.setContentView(com.android.cts.stub.R.layout.table_layout_1);
- TableLayout tableLayout = (TableLayout) activity.findViewById(com.android.cts.stub.R.id.table1);
+ TableLayout tableLayout = (TableLayout) activity
+ .findViewById(com.android.cts.stub.R.id.table1);
assertTrue(tableLayout.isColumnCollapsed(0));
assertTrue(tableLayout.isColumnStretchable(2));
@@ -88,15 +91,12 @@
assertTrue(tableLayout.isColumnShrinkable(1));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setOnHierarchyChangeListener(OnHierarchyChangeListener listener)",
- targets = {
- @TestTarget(
- methodName = "setOnHierarchyChangeListener",
- methodArgs = {OnHierarchyChangeListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setOnHierarchyChangeListener(OnHierarchyChangeListener listener)",
+ method = "setOnHierarchyChangeListener",
+ args = {android.view.ViewGroup.OnHierarchyChangeListener.class}
+ )
public void testSetOnHierarchyChangeListener() {
TableLayout tableLayout = new TableLayout(mContext);
@@ -117,15 +117,12 @@
assertFalse(listener.hasCalledOnChildViewRemoved());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test requestLayout()",
- targets = {
- @TestTarget(
- methodName = "requestLayout",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test requestLayout()",
+ method = "requestLayout",
+ args = {}
+ )
public void testRequestLayout() {
TableLayout tableLayout = new TableLayout(mContext);
tableLayout.addView(new TextView(mContext));
@@ -141,17 +138,18 @@
assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which access ShrinkAllColumns",
- targets = {
- @TestTarget(
- methodName = "isShrinkAllColumns",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ShrinkAllColumns",
+ method = "isShrinkAllColumns",
+ args = {}
),
- @TestTarget(
- methodName = "setShrinkAllColumns",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ShrinkAllColumns",
+ method = "setShrinkAllColumns",
+ args = {boolean.class}
)
})
public void testAccessShrinkAllColumns() {
@@ -164,17 +162,18 @@
assertFalse(tableLayout.isShrinkAllColumns());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which access StretchAllColumns",
- targets = {
- @TestTarget(
- methodName = "isStretchAllColumns",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access StretchAllColumns",
+ method = "isStretchAllColumns",
+ args = {}
),
- @TestTarget(
- methodName = "setStretchAllColumns",
- methodArgs = {boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access StretchAllColumns",
+ method = "setStretchAllColumns",
+ args = {boolean.class}
)
})
public void testAccessStretchAllColumns() {
@@ -187,17 +186,18 @@
assertFalse(tableLayout.isStretchAllColumns());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which access ColumnCollapsed",
- targets = {
- @TestTarget(
- methodName = "isColumnCollapsed",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ColumnCollapsed",
+ method = "isColumnCollapsed",
+ args = {int.class}
),
- @TestTarget(
- methodName = "setColumnCollapsed",
- methodArgs = {int.class, boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ColumnCollapsed",
+ method = "setColumnCollapsed",
+ args = {int.class, boolean.class}
)
})
public void testAccessColumnCollapsed() {
@@ -238,17 +238,18 @@
assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which access ColumnStretchable",
- targets = {
- @TestTarget(
- methodName = "isColumnStretchable",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ColumnStretchable",
+ method = "isColumnStretchable",
+ args = {int.class}
),
- @TestTarget(
- methodName = "setColumnStretchable",
- methodArgs = {int.class, boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ColumnStretchable",
+ method = "setColumnStretchable",
+ args = {int.class, boolean.class}
)
})
public void testAccessColumnStretchable() {
@@ -290,17 +291,18 @@
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test whether columns are actually stretched",
- targets = {
- @TestTarget(
- methodName = "setColumnStretchable",
- methodArgs = {Integer.class, Boolean.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test whether columns are actually stretched",
+ method = "setColumnStretchable",
+ args = {java.lang.Integer.class, java.lang.Boolean.class}
),
- @TestTarget(
- methodName = "setStretchAllColumns",
- methodArgs = {Boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test whether columns are actually stretched",
+ method = "setStretchAllColumns",
+ args = {java.lang.Boolean.class}
)
})
@ToBeFixed( bug = "", explanation = "After set a column unable to be stretched," +
@@ -438,17 +440,18 @@
assertEquals(orignalWidth2, column2.getWidth());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test methods which access ColumnShrinkable",
- targets = {
- @TestTarget(
- methodName = "isColumnShrinkable",
- methodArgs = {int.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ColumnShrinkable",
+ method = "isColumnShrinkable",
+ args = {int.class}
),
- @TestTarget(
- methodName = "setColumnShrinkable",
- methodArgs = {int.class, boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test methods which access ColumnShrinkable",
+ method = "setColumnShrinkable",
+ args = {int.class, boolean.class}
)
})
public void testAccessColumnShrinkable() {
@@ -489,17 +492,18 @@
assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "test whether columns are actually shrunk",
- targets = {
- @TestTarget(
- methodName = "setColumnShrinkable",
- methodArgs = {Integer.class, Boolean.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test whether columns are actually shrunk",
+ method = "setColumnShrinkable",
+ args = {java.lang.Integer.class, java.lang.Boolean.class}
),
- @TestTarget(
- methodName = "setShrinkAllColumns",
- methodArgs = {Boolean.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "test whether columns are actually shrunk",
+ method = "setShrinkAllColumns",
+ args = {java.lang.Boolean.class}
)
})
@ToBeFixed( bug = "", explanation = "After set a column unable to be shrunk," +
@@ -650,15 +654,12 @@
assertEquals(orignalWidth2 + extraSpace, child2.getWidth());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test addView(View child)",
- targets = {
- @TestTarget(
- methodName = "addView",
- methodArgs = {View.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test addView(View child)",
+ method = "addView",
+ args = {android.view.View.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
public void testAddView1() {
TableLayout tableLayout = new TableLayout(mContext);
@@ -696,15 +697,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test addView(View child, int index)",
- targets = {
- @TestTarget(
- methodName = "addView",
- methodArgs = {View.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test addView(View child, int index)",
+ method = "addView",
+ args = {android.view.View.class, int.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "IndexOutOfBoundsException and " +
"NullPointerException issue")
public void testAddView2() {
@@ -748,15 +746,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test addView(View child, ViewGroup.LayoutParams params)",
- targets = {
- @TestTarget(
- methodName = "addView",
- methodArgs = {View.class, ViewGroup.LayoutParams.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test addView(View child, ViewGroup.LayoutParams params)",
+ method = "addView",
+ args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
public void testAddView3() {
TableLayout tableLayout = new TableLayout(mContext);
@@ -796,15 +791,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test addView(View child, int index, ViewGroup.LayoutParams params)",
- targets = {
- @TestTarget(
- methodName = "addView",
- methodArgs = {View.class, int.class, ViewGroup.LayoutParams.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test addView(View child, int index, ViewGroup.LayoutParams params)",
+ method = "addView",
+ args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "IndexOutOfBoundsException and " +
"NullPointerException issue")
public void testAddView4() {
@@ -870,15 +862,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test generateLayoutParams(AttributeSet attrs)",
- targets = {
- @TestTarget(
- methodName = "generateLayoutParams",
- methodArgs = {AttributeSet.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test generateLayoutParams(AttributeSet attrs)",
+ method = "generateLayoutParams",
+ args = {android.util.AttributeSet.class}
+ )
public void testGenerateLayoutParams1() {
TableLayout tableLayout = new TableLayout(mContext);
@@ -891,15 +880,12 @@
assertNotNull(tableLayout.generateLayoutParams((AttributeSet) null));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test checkLayoutParams(ViewGroup.LayoutParams p)",
- targets = {
- @TestTarget(
- methodName = "checkLayoutParams",
- methodArgs = {ViewGroup.LayoutParams.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test checkLayoutParams(ViewGroup.LayoutParams p)",
+ method = "checkLayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
+ )
public void testCheckLayoutParams() {
MockTableLayout mockTableLayout = new MockTableLayout(mContext);
@@ -912,15 +898,12 @@
assertFalse(mockTableLayout.checkLayoutParams(null));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test generateDefaultLayoutParams()",
- targets = {
- @TestTarget(
- methodName = "generateDefaultLayoutParams",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test generateDefaultLayoutParams()",
+ method = "generateDefaultLayoutParams",
+ args = {}
+ )
public void testGenerateDefaultLayoutParams() {
MockTableLayout mockTableLayout = new MockTableLayout(mContext);
@@ -929,15 +912,12 @@
assertTrue(layoutParams instanceof TableLayout.LayoutParams);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test generateLayoutParams(ViewGroup.LayoutParams p)",
- targets = {
- @TestTarget(
- methodName = "generateLayoutParams",
- methodArgs = {ViewGroup.LayoutParams.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test generateLayoutParams(ViewGroup.LayoutParams p)",
+ method = "generateLayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
public void testGenerateLayoutParams2() {
MockTableLayout mockTableLayout = new MockTableLayout(mContext);
@@ -956,15 +936,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onLayout(boolean changed, int l, int t, int r, int b)",
- targets = {
- @TestTarget(
- methodName = "onLayout",
- methodArgs = {boolean.class, int.class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onLayout(boolean changed, int l, int t, int r, int b)",
+ method = "onLayout",
+ args = {boolean.class, int.class, int.class, int.class, int.class}
+ )
@ToBeFixed( bug = "1400249", explanation = "hard to do unit test," +
" will be tested by functional test.")
public void testOnLayout() {
@@ -973,15 +950,12 @@
mockTableLayout.onLayout(false, 0, 0, 20, 20);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onMeasure(int widthMeasureSpec, int heightMeasureSpec)",
- targets = {
- @TestTarget(
- methodName = "onMeasure",
- methodArgs = {int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onMeasure(int widthMeasureSpec, int heightMeasureSpec)",
+ method = "onMeasure",
+ args = {int.class, int.class}
+ )
@ToBeFixed( bug = "1400249", explanation = "hard to do unit test," +
" will be tested by functional test.")
public void testOnMeasure() {
diff --git a/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
index 2873b12..fecee47 100644
--- a/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
@@ -29,9 +29,10 @@
import com.android.internal.R;
import com.android.internal.util.XmlUtils;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -50,33 +51,42 @@
mTargetContext = getInstrumentation().getTargetContext();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link TableLayout.LayoutParams}.",
- targets = {
- @TestTarget(
- methodName = "TableLayout.LayoutParams",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout.LayoutParams}.",
+ method = "TableLayout.LayoutParams",
+ args = {}
),
- @TestTarget(
- methodName = "TableLayout.LayoutParams",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout.LayoutParams}.",
+ method = "TableLayout.LayoutParams",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
),
- @TestTarget(
- methodName = "TableLayout.LayoutParams",
- methodArgs = {int.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout.LayoutParams}.",
+ method = "TableLayout.LayoutParams",
+ args = {int.class, int.class}
),
- @TestTarget(
- methodName = "TableLayout.LayoutParams",
- methodArgs = {int.class, int.class, float.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout.LayoutParams}.",
+ method = "TableLayout.LayoutParams",
+ args = {int.class, int.class, float.class}
),
- @TestTarget(
- methodName = "TableLayout.LayoutParams",
- methodArgs = {ViewGroup.LayoutParams.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout.LayoutParams}.",
+ method = "TableLayout.LayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
),
- @TestTarget(
- methodName = "TableLayout.LayoutParams",
- methodArgs = {MarginLayoutParams.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableLayout.LayoutParams}.",
+ method = "TableLayout.LayoutParams",
+ args = {android.view.ViewGroup.MarginLayoutParams.class}
)
})
public void testConstructor() {
@@ -104,15 +114,12 @@
assertEquals(300, layoutParams.height);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)",
- targets = {
- @TestTarget(
- methodName = "setBaseAttributes",
- methodArgs = {TypedArray.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)",
+ method = "setBaseAttributes",
+ args = {android.content.res.TypedArray.class, int.class, int.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
public void testSetBaseAttributes() {
MockTableLayout_LayoutParams mockLayoutParams = new MockTableLayout_LayoutParams(200, 300);
@@ -185,7 +192,8 @@
XmlResourceParser parser = null;
AttributeSet attrs = null;
try {
- parser = mTargetContext.getResources().getXml(com.android.cts.stub.R.xml.base_attributes);
+ parser = mTargetContext.getResources()
+ .getXml(com.android.cts.stub.R.xml.base_attributes);
int type;
while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
diff --git a/tests/tests/widget/src/android/widget/cts/TableRowTest.java b/tests/tests/widget/src/android/widget/cts/TableRowTest.java
index ebf0e73..42ec40b 100644
--- a/tests/tests/widget/src/android/widget/cts/TableRowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableRowTest.java
@@ -35,9 +35,10 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -60,17 +61,18 @@
mTargetContext = getInstrumentation().getTargetContext();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link TableRow}.",
- targets = {
- @TestTarget(
- methodName = "TableRow",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow}.",
+ method = "TableRow",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "TableRow",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow}.",
+ method = "TableRow",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
)
})
public void testConstructor() {
@@ -79,15 +81,12 @@
new TableRow(mContext, null);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setOnHierarchyChangeListener(OnHierarchyChangeListener listener)",
- targets = {
- @TestTarget(
- methodName = "setOnHierarchyChangeListener",
- methodArgs = {OnHierarchyChangeListener.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setOnHierarchyChangeListener(OnHierarchyChangeListener listener)",
+ method = "setOnHierarchyChangeListener",
+ args = {android.view.ViewGroup.OnHierarchyChangeListener.class}
+ )
public void testSetOnHierarchyChangeListener() {
TableRow tableRow = new TableRow(mContext);
@@ -108,20 +107,18 @@
assertFalse(listener.hasCalledOnChildViewRemoved());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getVirtualChildAt(int i)",
- targets = {
- @TestTarget(
- methodName = "getVirtualChildAt",
- methodArgs = {int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getVirtualChildAt(int i)",
+ method = "getVirtualChildAt",
+ args = {int.class}
+ )
@UiThreadTest
public void testGetVirtualChildAt() {
TableStubActivity activity = getActivity();
activity.setContentView(com.android.cts.stub.R.layout.table_layout_1);
- TableLayout tableLayout = (TableLayout) activity.findViewById(com.android.cts.stub.R.id.table1);
+ TableLayout tableLayout = (TableLayout) activity
+ .findViewById(com.android.cts.stub.R.id.table1);
TableRow tableRow = (TableRow) tableLayout.getChildAt(0);
Resources resources = activity.getResources();
@@ -147,20 +144,18 @@
((TextView) tableRow.getVirtualChildAt(4)).getText().toString());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getVirtualChildCount()",
- targets = {
- @TestTarget(
- methodName = "getVirtualChildCount",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getVirtualChildCount()",
+ method = "getVirtualChildCount",
+ args = {}
+ )
@UiThreadTest
public void testGetVirtualChildCount() {
TableStubActivity activity = getActivity();
activity.setContentView(com.android.cts.stub.R.layout.table_layout_1);
- TableLayout tableLayout = (TableLayout) activity.findViewById(com.android.cts.stub.R.id.table1);
+ TableLayout tableLayout = (TableLayout) activity
+ .findViewById(com.android.cts.stub.R.id.table1);
TableRow tableRow = (TableRow) tableLayout.getChildAt(0);
assertEquals(3, tableRow.getVirtualChildCount());
@@ -172,15 +167,12 @@
assertEquals(5, tableRow.getVirtualChildCount());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test generateLayoutParams(AttributeSet attrs)",
- targets = {
- @TestTarget(
- methodName = "generateLayoutParams",
- methodArgs = {AttributeSet.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test generateLayoutParams(AttributeSet attrs)",
+ method = "generateLayoutParams",
+ args = {android.util.AttributeSet.class}
+ )
public void testGenerateLayoutParams() {
TableRow tableRow = new TableRow(mContext);
@@ -193,15 +185,12 @@
assertNotNull(tableRow.generateLayoutParams((AttributeSet) null));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test checkLayoutParams(ViewGroup.LayoutParams p)",
- targets = {
- @TestTarget(
- methodName = "checkLayoutParams",
- methodArgs = {ViewGroup.LayoutParams.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test checkLayoutParams(ViewGroup.LayoutParams p)",
+ method = "checkLayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
+ )
public void testCheckLayoutParams() {
MockTableRow mockTableRow = new MockTableRow(mContext);
@@ -214,15 +203,12 @@
assertFalse(mockTableRow.checkLayoutParams(null));
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test generateDefaultLayoutParams()",
- targets = {
- @TestTarget(
- methodName = "generateDefaultLayoutParams",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test generateDefaultLayoutParams()",
+ method = "generateDefaultLayoutParams",
+ args = {}
+ )
public void testGenerateDefaultLayoutParams() {
MockTableRow mockTableRow = new MockTableRow(mContext);
@@ -231,15 +217,12 @@
assertTrue(layoutParams instanceof TableRow.LayoutParams);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test generateLayoutParams(ViewGroup.LayoutParams p)",
- targets = {
- @TestTarget(
- methodName = "generateLayoutParams",
- methodArgs = {ViewGroup.LayoutParams.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test generateLayoutParams(ViewGroup.LayoutParams p)",
+ method = "generateLayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "NullPointerException issue")
public void testGenerateLayoutParams2() {
MockTableRow mockTableRow = new MockTableRow(mContext);
@@ -258,15 +241,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onLayout(boolean changed, int l, int t, int r, int b)",
- targets = {
- @TestTarget(
- methodName = "onLayout",
- methodArgs = {boolean.class, int.class, int.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onLayout(boolean changed, int l, int t, int r, int b)",
+ method = "onLayout",
+ args = {boolean.class, int.class, int.class, int.class, int.class}
+ )
@ToBeFixed( bug = "1400249", explanation = "hard to do unit test," +
" will be tested by functional test.")
public void testOnLayout() {
@@ -275,15 +255,12 @@
mockTableRow.onLayout(false, 0, 0, 200, 300);
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test onMeasure(int widthMeasureSpec, int heightMeasureSpec)",
- targets = {
- @TestTarget(
- methodName = "onMeasure",
- methodArgs = {int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onMeasure(int widthMeasureSpec, int heightMeasureSpec)",
+ method = "onMeasure",
+ args = {int.class, int.class}
+ )
@ToBeFixed( bug = "1400249", explanation = "hard to do unit test," +
" will be tested by functional test.")
public void testOnMeasure() {
diff --git a/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
index 6956c1e..54b6b24 100644
--- a/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
@@ -32,9 +32,10 @@
import com.android.internal.R;
import com.android.internal.util.XmlUtils;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -58,37 +59,48 @@
mTargetContext = getInstrumentation().getTargetContext();
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
- targets = {
- @TestTarget(
- methodName = "TableRow.LayoutParams",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
+ method = "TableRow.LayoutParams",
+ args = {}
),
- @TestTarget(
- methodName = "TableRow.LayoutParams",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
+ method = "TableRow.LayoutParams",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
),
- @TestTarget(
- methodName = "TableRow.LayoutParams",
- methodArgs = {int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
+ method = "TableRow.LayoutParams",
+ args = {int.class}
),
- @TestTarget(
- methodName = "TableRow.LayoutParams",
- methodArgs = {int.class, int.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
+ method = "TableRow.LayoutParams",
+ args = {int.class, int.class}
),
- @TestTarget(
- methodName = "TableRow.LayoutParams",
- methodArgs = {int.class, int.class, float.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
+ method = "TableRow.LayoutParams",
+ args = {int.class, int.class, float.class}
),
- @TestTarget(
- methodName = "TableRow.LayoutParams",
- methodArgs = {ViewGroup.LayoutParams.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
+ method = "TableRow.LayoutParams",
+ args = {android.view.ViewGroup.LayoutParams.class}
),
- @TestTarget(
- methodName = "TableRow.LayoutParams",
- methodArgs = {MarginLayoutParams.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link TableRow.LayoutParams}",
+ method = "TableRow.LayoutParams",
+ args = {android.view.ViewGroup.MarginLayoutParams.class}
)
})
@UiThreadTest
@@ -149,15 +161,12 @@
* setBaseAttributes(android.content.res.TypedArray, int, int)}
* .
*/
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)",
- targets = {
- @TestTarget(
- methodName = "setBaseAttributes",
- methodArgs = {TypedArray.class, int.class, int.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test setBaseAttributes(TypedArray a, int widthAttr, int heightAttr)",
+ method = "setBaseAttributes",
+ args = {android.content.res.TypedArray.class, int.class, int.class}
+ )
@ToBeFixed( bug = "1417734", explanation = "NullPointerException and " +
"ArrayIndexOutOfBoundsException issue")
public void testSetBaseAttributes() {
@@ -235,7 +244,8 @@
XmlResourceParser parser = null;
AttributeSet attrs = null;
try {
- parser = mTargetContext.getResources().getXml(com.android.cts.stub.R.xml.base_attributes);
+ parser = mTargetContext.getResources()
+ .getXml(com.android.cts.stub.R.xml.base_attributes);
int type;
while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
diff --git a/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java b/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java
index 7405b4f..211b3e3 100644
--- a/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java
@@ -57,19 +57,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test constructors",
method = "ToggleButton",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test constructors",
method = "ToggleButton",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test constructors",
method = "ToggleButton",
args = {android.content.Context.class}
@@ -106,13 +106,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test setTextOff and getTextOff",
method = "setTextOff",
args = {java.lang.CharSequence.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test setTextOff and getTextOff",
method = "getTextOff",
args = {}
@@ -131,7 +131,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test drawableStateChanged",
method = "drawableStateChanged",
args = {}
@@ -155,7 +155,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test onFinishInflate",
method = "onFinishInflate",
args = {}
@@ -168,7 +168,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test setChecked",
method = "setChecked",
args = {boolean.class}
@@ -185,19 +185,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Check the text of button when change button status",
method = "setChecked",
args = {boolean.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Check the text of button when change button status",
method = "setTextOff",
args = {java.lang.CharSequence.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Check the text of button when change button status",
method = "setTextOn",
args = {java.lang.CharSequence.class}
@@ -231,7 +231,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test setBackgroundDrawable",
method = "setBackgroundDrawable",
args = {android.graphics.drawable.Drawable.class}
@@ -249,13 +249,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test setTextOn and getTextOn",
method = "setTextOn",
args = {java.lang.CharSequence.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "test setTextOn and getTextOn",
method = "getTextOn",
args = {}
diff --git a/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java b/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java
index 8232335..ad5dff6 100644
--- a/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java
@@ -53,19 +53,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors.",
method = "TwoLineListItem",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors.",
method = "TwoLineListItem",
args = {android.content.Context.class, android.util.AttributeSet.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructors.",
method = "TwoLineListItem",
args = {android.content.Context.class, android.util.AttributeSet.class, int.class}
@@ -108,14 +108,12 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link TwoLineListItem#getText1()} and {@link TwoLineListItem#getText2()}",
+ level = TestLevel.COMPLETE,
method = "getText1",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link TwoLineListItem#getText1()} and {@link TwoLineListItem#getText2()}",
+ level = TestLevel.COMPLETE,
method = "getText2",
args = {}
)
@@ -134,8 +132,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link TwoLineListItem#onFinishInflate()}. This test checks the function of the method only. This test does not check where this method is called.",
+ level = TestLevel.COMPLETE,
method = "onFinishInflate",
args = {}
)
diff --git a/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java b/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java
index 1568baf..3b5988d 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java
@@ -71,13 +71,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of ViewAnimator.",
method = "ViewAnimator",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of ViewAnimator.",
method = "ViewAnimator",
args = {android.content.Context.class, android.util.AttributeSet.class}
@@ -99,19 +99,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setInAnimation(Animation inAnimation) and getInAnimation().",
method = "setInAnimation",
args = {android.view.animation.Animation.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setInAnimation(Animation inAnimation) and getInAnimation().",
method = "setInAnimation",
args = {android.content.Context.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setInAnimation(Animation inAnimation) and getInAnimation().",
method = "getInAnimation",
args = {}
@@ -135,7 +135,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test showNext().",
method = "showNext",
args = {}
@@ -179,7 +179,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setAnimateFirstView(boolean animate).",
method = "setAnimateFirstView",
args = {boolean.class}
@@ -192,13 +192,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDisplayedChild(int whichChild) and getDisplayedChild().",
method = "setDisplayedChild",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDisplayedChild(int whichChild) and getDisplayedChild().",
method = "getDisplayedChild",
args = {}
@@ -240,13 +240,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDisplayedChild(int whichChild) and getDisplayedChild().",
method = "setDisplayedChild",
args = {int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setDisplayedChild(int whichChild) and getDisplayedChild().",
method = "getDisplayedChild",
args = {}
@@ -281,7 +281,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getBaseline().",
method = "getBaseline",
args = {}
@@ -313,7 +313,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test showPrevious().",
method = "showPrevious",
args = {}
@@ -358,7 +358,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test getCurrentView().",
method = "getCurrentView",
args = {}
@@ -383,7 +383,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test addView(View child, int index, LayoutParams params).",
method = "addView",
args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class}
@@ -414,19 +414,19 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setOutAnimation(Animation outAnimation) and getOutAnimation().",
method = "setOutAnimation",
args = {android.view.animation.Animation.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setOutAnimation(Animation outAnimation) and getOutAnimation().",
method = "setOutAnimation",
args = {android.content.Context.class, int.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test setOutAnimation(Animation outAnimation) and getOutAnimation().",
method = "getOutAnimation",
args = {}
@@ -448,4 +448,3 @@
assertEquals(500, animation.getDuration());
}
}
-
diff --git a/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java b/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
index 5185cc8..c8c03fd 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
@@ -53,13 +53,13 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ViewFlipper}",
method = "ViewFlipper",
args = {android.content.Context.class}
),
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test constructor(s) of {@link ViewFlipper}",
method = "ViewFlipper",
args = {android.content.Context.class, android.util.AttributeSet.class}
@@ -84,7 +84,7 @@
}
@TestTargetNew(
- level = TestLevel.TODO,
+ level = TestLevel.COMPLETE,
notes = "Test {@link ViewFlipper#setFlipInterval(int)}",
method = "setFlipInterval",
args = {int.class}
@@ -98,20 +98,17 @@
@TestTargets({
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ViewFlipper#stopFlipping()}, {@link ViewFlipper#startFlipping()} and {@link ViewFlipper#isFlipping()}",
+ level = TestLevel.COMPLETE,
method = "startFlipping",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ViewFlipper#stopFlipping()}, {@link ViewFlipper#startFlipping()} and {@link ViewFlipper#isFlipping()}",
+ level = TestLevel.COMPLETE,
method = "stopFlipping",
args = {}
),
@TestTargetNew(
- level = TestLevel.TODO,
- notes = "Test {@link ViewFlipper#stopFlipping()}, {@link ViewFlipper#startFlipping()} and {@link ViewFlipper#isFlipping()}",
+ level = TestLevel.COMPLETE,
method = "isFlipping",
args = {}
)
diff --git a/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java b/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java
index a6da82b..95d6caa 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java
@@ -30,9 +30,10 @@
import com.android.cts.stub.R;
-import dalvik.annotation.TestInfo;
+import dalvik.annotation.TestTargets;
import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.ToBeFixed;
@@ -49,17 +50,18 @@
mViewSwitcher = null;
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of {@link ViewSwitcher}",
- targets = {
- @TestTarget(
- methodName = "ViewSwitcher",
- methodArgs = {Context.class}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link ViewSwitcher}",
+ method = "ViewSwitcher",
+ args = {android.content.Context.class}
),
- @TestTarget(
- methodName = "ViewSwitcher",
- methodArgs = {Context.class, AttributeSet.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor(s) of {@link ViewSwitcher}",
+ method = "ViewSwitcher",
+ args = {android.content.Context.class, android.util.AttributeSet.class}
)
})
@ToBeFixed(bug = "1417734", explanation = "ViewSwitcher#ViewSwitcher(Context, AttributeSet)" +
@@ -82,15 +84,12 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ViewSwitcher#setFactory(ViewFactory)}",
- targets = {
- @TestTarget(
- methodName = "setFactory",
- methodArgs = {ViewFactory.class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ViewSwitcher#setFactory(ViewFactory)}",
+ method = "setFactory",
+ args = {android.widget.ViewSwitcher.ViewFactory.class}
+ )
public void testSetFactory() {
mViewSwitcher = new ViewSwitcher(getContext());
@@ -99,15 +98,12 @@
assertTrue(factory.hasMakeViewCalled());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ViewSwitcher#reset()}",
- targets = {
- @TestTarget(
- methodName = "reset",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ViewSwitcher#reset()}",
+ method = "reset",
+ args = {}
+ )
public void testReset() {
mViewSwitcher = new ViewSwitcher(getContext());
@@ -123,17 +119,18 @@
assertEquals(View.GONE, lv2.getVisibility());
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test {@link ViewSwitcher#getNextView()}",
- targets = {
- @TestTarget(
- methodName = "getNextView",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ViewSwitcher#getNextView()}",
+ method = "getNextView",
+ args = {}
),
- @TestTarget(
- methodName = "addView",
- methodArgs = {View.class, int.class, ViewGroup.LayoutParams.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test {@link ViewSwitcher#getNextView()}",
+ method = "addView",
+ args = {android.view.View.class, int.class, android.view.ViewGroup.LayoutParams.class}
)
})
public void testGetNextView() {