From 229e34b182b98e1dba15d3dc6341954986ae2b7a Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Wed, 2 Mar 2011 23:34:29 -0800
Subject: Removing use of @tests and @Test.* annotations

Change-Id: I89243efdeebe22543c45a2166b634f40c3e78cf8
---
 .../security/AlgorithmParameterGeneratorTest.java  | 20 -----------------
 .../tests/security/AlgorithmParametersTest.java    | 20 -----------------
 .../test/java/tests/security/KeyFactoryTest.java   | 25 ----------------------
 .../java/tests/security/KeyPairGeneratorTest.java  | 20 -----------------
 4 files changed, 85 deletions(-)

(limited to 'support/src/test/java/tests/security')

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);
 
-- 
cgit v1.1