summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-06 12:27:15 -0700
committerElliott Hughes <enh@google.com>2013-06-06 12:27:15 -0700
commit48bd9fd589daaa11705dce8480c5b51f5b4a9e0f (patch)
treea841f5d0aad75a1c61f0a448aabc58f2b8a62688
parent4c54273b5fcc7012024858387dc36033d6d37d50 (diff)
downloadandroid_external_doclava-48bd9fd589daaa11705dce8480c5b51f5b4a9e0f.tar.gz
android_external_doclava-48bd9fd589daaa11705dce8480c5b51f5b4a9e0f.tar.bz2
android_external_doclava-48bd9fd589daaa11705dce8480c5b51f5b4a9e0f.zip
Fix a failing test.
We fixed the behavior with 'synchronized' a long time ago, but didn't update the test. Also add a reminder of how to run the tests, in lieu of adding an easy way to run the tests. Change-Id: I628ca5b054f777b1b19823cede05e196f8e6a685
-rw-r--r--Android.mk4
-rw-r--r--test/doclava/ApiCheckTest.java3
2 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 7d8953f..6e4ff82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,3 +33,7 @@ LOCAL_MODULE := doclava
LOCAL_JAVA_RESOURCE_DIRS := res
include $(BUILD_HOST_JAVA_LIBRARY)
+
+# TODO: add a test target.
+# For now, you can run the unit tests thus:
+# vogar --classpath /usr/lib/jvm/java-6-sun/lib/tools.jar --classpath ../../out/host/common/obj/JAVA_LIBRARIES/antlr_intermediates/javalib.jar --sourcepath src/ --sourcepath ../jsilver/src/ --mode jvm test/doclava/ApiCheckTest.java
diff --git a/test/doclava/ApiCheckTest.java b/test/doclava/ApiCheckTest.java
index 76ab864..b58a831 100644
--- a/test/doclava/ApiCheckTest.java
+++ b/test/doclava/ApiCheckTest.java
@@ -282,8 +282,7 @@ public class ApiCheckTest extends TestCase {
String[] args = { "test/api/constants.xml", "test/api/changed-synchronized.xml" };
ApiCheck apiCheck = new ApiCheck();
Report report = apiCheck.checkApi(args);
- assertEquals(1, report.errors().size());
- assertEquals(Errors.CHANGED_SYNCHRONIZED, report.errors().iterator().next().error());
+ assertEquals(0, report.errors().size());
}
public void testChangedVolatile() {