Removing use of @tests and @Test.* annotations

Change-Id: I89243efdeebe22543c45a2166b634f40c3e78cf8

9 files changed, 1 insertions, 101 deletions

diff --git a/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java b/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java
index 80065f3..7bd52f0 100644
--- a/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java
+++ b/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java
@@ -15,9 +15,6 @@
  */
 package tests.security;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
 import java.security.AlgorithmParameterGenerator;
 import java.security.AlgorithmParameters;
 import java.security.NoSuchAlgorithmException;
@@ -33,23 +30,6 @@ public abstract class AlgorithmParameterGeneratorTest extends TestCase {
         this.helper = helper;
     }
 
-    @TestTargets({
-        @TestTargetNew(
-                level=TestLevel.ADDITIONAL,
-                method="getInstance",
-                args={String.class}
-        ),
-        @TestTargetNew(
-                level=TestLevel.ADDITIONAL,
-                method="init",
-                args={int.class}
-        ),
-        @TestTargetNew(
-                level=TestLevel.COMPLETE,
-                method="method",
-                args={}
-        )
-    })
     public void testAlgorithmParameterGenerator() {
         AlgorithmParameterGenerator generator = null;
         try {
diff --git a/support/src/test/java/tests/security/AlgorithmParametersTest.java b/support/src/test/java/tests/security/AlgorithmParametersTest.java
index d5c1910..67255fc 100644
--- a/support/src/test/java/tests/security/AlgorithmParametersTest.java
+++ b/support/src/test/java/tests/security/AlgorithmParametersTest.java
@@ -15,9 +15,6 @@
  */
 package tests.security;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
 import java.security.AlgorithmParameters;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
@@ -37,23 +34,6 @@ public class AlgorithmParametersTest extends TestCase {
         this.parameterData = parameterData;
     }
 
-    @TestTargets({
-        @TestTargetNew(
-                level=TestLevel.ADDITIONAL,
-                method="getInstance",
-                args={String.class}
-        ),
-        @TestTargetNew(
-                level=TestLevel.ADDITIONAL,
-                method="init",
-                args={byte[].class}
-        ),
-        @TestTargetNew(
-                level=TestLevel.COMPLETE,
-                method="method",
-                args={}
-        )
-    })
     public void testAlgorithmParameters() {
         AlgorithmParameters algorithmParameters = null;
         try {
diff --git a/support/src/test/java/tests/security/KeyFactoryTest.java b/support/src/test/java/tests/security/KeyFactoryTest.java
index 179254a..e2f687d 100644
--- a/support/src/test/java/tests/security/KeyFactoryTest.java
+++ b/support/src/test/java/tests/security/KeyFactoryTest.java
@@ -15,9 +15,6 @@
  */
 package tests.security;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
 import java.security.Key;
 import java.security.KeyFactory;
 import java.security.KeyPair;
@@ -58,28 +55,6 @@ public abstract class KeyFactoryTest<PublicKeySpec extends KeySpec, PrivateKeySp
         return null;
     }
 
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.ADDITIONAL,
-            method = "getKeySpec",
-            args = {Key.class, Class.class}
-        ),
-        @TestTargetNew(
-            level = TestLevel.ADDITIONAL,
-            method = "generatePrivate",
-            args = {KeySpec.class}
-        ),
-        @TestTargetNew(
-            level = TestLevel.ADDITIONAL,
-            method = "generatePublic",
-            args = {KeySpec.class}
-        ),
-        @TestTargetNew(
-            level=TestLevel.COMPLETE,
-            method="method",
-            args={}
-        )
-    })
     public void testKeyFactory() {
         PrivateKeySpec privateKeySpec = null;
         try {
diff --git a/support/src/test/java/tests/security/KeyPairGeneratorTest.java b/support/src/test/java/tests/security/KeyPairGeneratorTest.java
index adf8d4d..4ade0af 100644
--- a/support/src/test/java/tests/security/KeyPairGeneratorTest.java
+++ b/support/src/test/java/tests/security/KeyPairGeneratorTest.java
@@ -16,9 +16,6 @@
 
 package tests.security;
 
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
@@ -50,23 +47,6 @@ public abstract class KeyPairGeneratorTest extends TestCase {
         }
     }
 
-    @TestTargets({
-        @TestTargetNew(
-                level = TestLevel.ADDITIONAL,
-                method = "initialize",
-                args = {int.class}
-            ),
-            @TestTargetNew(
-                level = TestLevel.ADDITIONAL,
-                method = "generateKeyPair",
-                args = {}
-            ),
-            @TestTargetNew(
-                level=TestLevel.COMPLETE,
-                method="method",
-                args={}
-            )
-    })
     public void testKeyPairGenerator() throws NoSuchAlgorithmException {
         generator.initialize(1024);
 
diff --git a/support/src/test/java/tests/support/Support_CollectionTest.java b/support/src/test/java/tests/support/Support_CollectionTest.java
index 6ff1868..190c6b9 100644
--- a/support/src/test/java/tests/support/Support_CollectionTest.java
+++ b/support/src/test/java/tests/support/Support_CollectionTest.java
@@ -17,15 +17,12 @@
 
 package tests.support;
 
-import dalvik.annotation.TestTargetClass;
-
 import java.util.Collection;
 import java.util.TreeSet;
 
 /**
- * @tests java.util.Collection
+ * java.util.Collection
  */
-@TestTargetClass(java.util.Collection.class)
 public class Support_CollectionTest extends junit.framework.TestCase {
     Collection<Integer> col; // must contain the Integers 0 to 99
 
diff --git a/support/src/test/java/tests/support/Support_ListTest.java b/support/src/test/java/tests/support/Support_ListTest.java
index f9b7a21..8aeeeaf 100644
--- a/support/src/test/java/tests/support/Support_ListTest.java
+++ b/support/src/test/java/tests/support/Support_ListTest.java
@@ -17,14 +17,11 @@
 
 package tests.support;
 
-import dalvik.annotation.TestTargetClass;
-
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-@TestTargetClass(List.class)
 public class Support_ListTest extends junit.framework.TestCase {
 
     List<Integer> list; // must contain the Integers 0 to 99 in order
diff --git a/support/src/test/java/tests/support/Support_SetTest.java b/support/src/test/java/tests/support/Support_SetTest.java
index cbea1d8..a4a1432 100644
--- a/support/src/test/java/tests/support/Support_SetTest.java
+++ b/support/src/test/java/tests/support/Support_SetTest.java
@@ -17,11 +17,8 @@
 
 package tests.support;
 
-import dalvik.annotation.TestTargetClass;
-
 import java.util.Set;
 
-@TestTargetClass(Set.class)
 public class Support_SetTest extends junit.framework.TestCase {
 
     Set<Integer> set; // must contain only the Integers 0 to 99
diff --git a/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java b/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java
index a07b9b4..ee266c6 100644
--- a/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java
+++ b/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java
@@ -17,8 +17,6 @@
 
 package tests.support;
 
-import dalvik.annotation.TestTargetClass;
-
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -26,7 +24,6 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import junit.framework.TestCase;
 
-@TestTargetClass(Collection.class)
 public class Support_UnmodifiableCollectionTest extends TestCase {
 
     Collection<Integer> col;
diff --git a/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java b/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java
index 464ee93..e7a1620 100644
--- a/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java
+++ b/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java
@@ -17,15 +17,12 @@
 
 package tests.support;
 
-import dalvik.annotation.TestTargetClass;
-
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import junit.framework.TestCase;
 
-@TestTargetClass(Map.class)
 public class Support_UnmodifiableMapTest extends TestCase {
 
     Map<String, Integer> map;