summaryrefslogtreecommitdiffstats
path: root/dalvik/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'dalvik/src/main')
-rw-r--r--dalvik/src/main/java/dalvik/annotation/HostController.java37
-rw-r--r--dalvik/src/main/java/dalvik/annotation/TestInfo.java63
-rw-r--r--dalvik/src/main/java/dalvik/annotation/TestStatus.java44
-rw-r--r--dalvik/src/main/java/dalvik/annotation/TestTarget.java3
-rw-r--r--dalvik/src/main/java/dalvik/annotation/TestTargetClass.java3
-rw-r--r--dalvik/src/main/java/dalvik/annotation/Timeout.java40
-rw-r--r--dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java57
7 files changed, 6 insertions, 241 deletions
diff --git a/dalvik/src/main/java/dalvik/annotation/HostController.java b/dalvik/src/main/java/dalvik/annotation/HostController.java
deleted file mode 100644
index 749dc62..0000000
--- a/dalvik/src/main/java/dalvik/annotation/HostController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dalvik.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Record the host side controller information for a test method,
- * so that the CTS host can locate correspond host side unit while running it.
- * {@hide pending API Council approval}
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD })
-public @interface HostController {
-
- /**
- * The host controller method name.
- */
- String name() default "";
-}
diff --git a/dalvik/src/main/java/dalvik/annotation/TestInfo.java b/dalvik/src/main/java/dalvik/annotation/TestInfo.java
deleted file mode 100644
index 4126fcc..0000000
--- a/dalvik/src/main/java/dalvik/annotation/TestInfo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dalvik.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Defines an annotation for test methods that allow, among other things, to
- * link the test to the method that is being tested.
- *
- * {@hide}
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD })
-public @interface TestInfo {
-
- /**
- * Specifies the current status of the test, as determined by a reviewer.
- */
- TestStatus status() default TestStatus.TBR;
-
- /**
- * Specifies noteworthy plain-text information about the test, like whether
- * it is testing a specific parameter combination or something.
- */
- String notes() default "";
-
- /**
- * Specifies the current level of coverage the test has.
- */
- TestLevel level() default TestLevel.PARTIAL;
-
- /**
- * Specifies the purpose (either if it is noteworth to mention such as if
- * it is testing a specific parameter combination) or the covered test
- * aspects (exceptions, normal cases, border edge cases, etc.) in
- * case the level is Level.PARTIAL
- */
- String purpose() default "";
-
- /**
- * Specifies an array of target methods.
- */
- TestTarget[] targets();
-
-}
diff --git a/dalvik/src/main/java/dalvik/annotation/TestStatus.java b/dalvik/src/main/java/dalvik/annotation/TestStatus.java
deleted file mode 100644
index fc7a920..0000000
--- a/dalvik/src/main/java/dalvik/annotation/TestStatus.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dalvik.annotation;
-
-/**
- * Defines an enumeration of possible states a test case can be in.
- *
- * {@hide}
- *
- */
-public enum TestStatus {
-
- /**
- * Status is "to be reviewed", which is the initial state when a test method
- * has been annotated.
- */
- TBR,
-
- /**
- * Status is "to do", meaning a reviewer has determined that additional work
- * is needed.
- */
- TODO,
-
- /**
- * Status is "looks good to me", meaning the test is okay.
- */
- LGTM
-
-}
diff --git a/dalvik/src/main/java/dalvik/annotation/TestTarget.java b/dalvik/src/main/java/dalvik/annotation/TestTarget.java
index 158698d..dcfd20c 100644
--- a/dalvik/src/main/java/dalvik/annotation/TestTarget.java
+++ b/dalvik/src/main/java/dalvik/annotation/TestTarget.java
@@ -25,9 +25,12 @@ import java.lang.annotation.Target;
* Defines an annotation used be used within the TestInfo annotation. It
* specifies a single method target for the test (but can be used multiple
* times).
+ *
+ * @deprecated Obsolete
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.ANNOTATION_TYPE })
+@Deprecated
public @interface TestTarget {
/**
diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
index 9144a41..e88040e 100644
--- a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
+++ b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
@@ -26,9 +26,12 @@ import java.lang.annotation.Target;
* that is being tested. The current assumption is that the test are somewhat
* organized according to the API classes they test. Might be too strict for
* some cases.
+ *
+ * @deprecated Obsolete
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE })
+@Deprecated
public @interface TestTargetClass {
/**
diff --git a/dalvik/src/main/java/dalvik/annotation/Timeout.java b/dalvik/src/main/java/dalvik/annotation/Timeout.java
deleted file mode 100644
index 1a779ac..0000000
--- a/dalvik/src/main/java/dalvik/annotation/Timeout.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dalvik.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Defines an annotation to be used for specifying a test timeout. A test
- * harness that supports timeouts should allow a test to be run for at least
- * this time before killing it. Time is measured in seconds.
- *
- * @hide
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD })
-public @interface Timeout {
-
- /**
- * Specifies the test timeout in seconds.
- */
- int value();
-
-}
diff --git a/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java b/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java
deleted file mode 100644
index 5e57f1c..0000000
--- a/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dalvik.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for "virtual" implementation classes. These are classes that have
- * the following attributes:
- * <ul>
- * <li>they implement a public interface or are a concrete implementation of a
- * public abstract class,</li>
- * <li>they are not public,</li>
- * <li>instances can only be retrieved through some kind of factory method.</li>
- * </ul>
- * <p>
- * Example: {@code MessageDigest} is an abstract class. Concrete implementations
- * of message digest algorithms such as MD5 and SHA-1 can only be retrieved
- * through one of the static {@code getInstance} methods of
- * {@code MessageDigest}, which accept the desired algorithm as a string
- * parameter and return an implementation accordingly.
- * </p>
- * <p>
- * Even though the concrete implementation class for a message digest algorithm
- * is not known, we need to be able to indicate that such a class exists and
- * that it must be tested. This is done by defining corresponding classes and
- * annotating them with {@code @VirtualTestTarget}. This class can then be
- * used in the {@code @TestTargetClass} annotation with which we annotate
- * {@code TestCase} subclasses.
- * @hide
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
-public @interface VirtualTestTarget {
-
- /**
- * Field for comments.
- */
- String value() default "";
-}