summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2010-05-13 14:26:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-13 14:26:03 -0700
commit18d0e3f43f0afd38693baaf74807c37ac9ef5ebe (patch)
treed235a5d32c03071bbee39a7814f15ba78acc82f7
parentc137c91b2ff110aec9aa1ecb0e9df9abb7c94bfa (diff)
parentc58a6bc6a5e78728f0b8297c245422dd949bd7f3 (diff)
downloadandroid_dalvik-18d0e3f43f0afd38693baaf74807c37ac9ef5ebe.tar.gz
android_dalvik-18d0e3f43f0afd38693baaf74807c37ac9ef5ebe.tar.bz2
android_dalvik-18d0e3f43f0afd38693baaf74807c37ac9ef5ebe.zip
Merge "Added a quick test." into dalvik-dev
-rw-r--r--tests/004-annotations/expected.txt2
-rw-r--r--tests/004-annotations/src/android/test/anno/TestAnnotations.java7
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/004-annotations/expected.txt b/tests/004-annotations/expected.txt
index 6caef043b..063b3ed12 100644
--- a/tests/004-annotations/expected.txt
+++ b/tests/004-annotations/expected.txt
@@ -4,6 +4,8 @@ java.lang.String android.test.anno.TestAnnotations.thing2: @android.test.anno.An
mapping is class [Landroid.test.anno.IntToString;
0='@android.test.anno.IntToString(from=0, to=NORMAL_FOCUS)'
1='@android.test.anno.IntToString(from=2, to=WEAK_FOCUS)'
+present(getFocusType, ExportedProperty): true
+present(getFocusType, AnnoSimpleType): false
AnnoSimpleField true, SimplyNoted false
annotations on TYPE class android.test.anno.SimplyNoted(2):
diff --git a/tests/004-annotations/src/android/test/anno/TestAnnotations.java b/tests/004-annotations/src/android/test/anno/TestAnnotations.java
index d7b0b14d3..98fb0ef56 100644
--- a/tests/004-annotations/src/android/test/anno/TestAnnotations.java
+++ b/tests/004-annotations/src/android/test/anno/TestAnnotations.java
@@ -132,6 +132,13 @@ public class TestAnnotations {
System.out.println("mapping is " + mapping.getClass() +
"\n 0='" + mapping[0] + "'\n 1='" + mapping[1] + "'");
+
+ /* while we're here, check isAnnotationPresent on Method */
+ System.out.println("present(getFocusType, ExportedProperty): " +
+ meth.isAnnotationPresent(ExportedProperty.class));
+ System.out.println("present(getFocusType, AnnoSimpleType): " +
+ meth.isAnnotationPresent(AnnoSimpleType.class));
+
System.out.println("");
}