AI 146072: am: CL 146071 CTS: Clean up test annotations
Original author: sus
Merged from: //branches/cupcake/...
Automated import of CL 146072
diff --git a/tests/cts/net/src/android/net/cts/LocalServerSocketTest.java b/tests/cts/net/src/android/net/cts/LocalServerSocketTest.java
index a6511e8..07f29c6 100644
--- a/tests/cts/net/src/android/net/cts/LocalServerSocketTest.java
+++ b/tests/cts/net/src/android/net/cts/LocalServerSocketTest.java
@@ -26,7 +26,6 @@
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestStatus;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/cts/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java b/tests/cts/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
index 002adfe..0e05b28 100644
--- a/tests/cts/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
@@ -19,7 +19,6 @@
import android.net.NetworkInfo.DetailedState;
import android.test.AndroidTestCase;
import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestStatus;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/cts/net/src/android/net/cts/NetworkInfo_StateTest.java b/tests/cts/net/src/android/net/cts/NetworkInfo_StateTest.java
index 2f58784..249df4b 100644
--- a/tests/cts/net/src/android/net/cts/NetworkInfo_StateTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkInfo_StateTest.java
@@ -18,7 +18,6 @@
import android.test.AndroidTestCase;
import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestStatus;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
diff --git a/tests/cts/net/src/android/net/cts/ProxyTest.java b/tests/cts/net/src/android/net/cts/ProxyTest.java
index d9f7c1a..9345ac2 100644
--- a/tests/cts/net/src/android/net/cts/ProxyTest.java
+++ b/tests/cts/net/src/android/net/cts/ProxyTest.java
@@ -20,9 +20,9 @@
import android.net.Proxy;
import android.provider.Settings;
import android.test.AndroidTestCase;
-import dalvik.annotation.TestInfo;
-import dalvik.annotation.TestStatus;
-import dalvik.annotation.TestTarget;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargetClass;
@TestTargetClass(Proxy.class)
@@ -33,15 +33,11 @@
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test constructor(s) of Proxy.",
- targets = {
- @TestTarget(
- methodName = "Proxy",
- methodArgs = {}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "Proxy",
+ args = {}
+ )
public void testConstructor() {
try {
@@ -51,29 +47,26 @@
}
}
- @TestInfo(
- status = TestStatus.TBR,
- notes = "Test getDefaultPort().",
- targets = {
- @TestTarget(
- methodName = "getDefaultPort",
- methodArgs = {}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getDefaultPort",
+ args = {}
),
- @TestTarget(
- methodName = "getDefaultHost",
- methodArgs = {}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getDefaultHost",
+ args = {}
),
- @TestTarget(
- methodName = "getHost",
- methodArgs = {Context.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getHost",
+ args = {Context.class}
),
- @TestTarget(
- methodName = "getHost",
- methodArgs = {Context.class}
- ),
- @TestTarget(
- methodName = "getPort",
- methodArgs = {Context.class}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getPort",
+ args = {Context.class}
)
})
public void testAccessProperties() {