diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-10-05 11:05:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 11:05:37 -0700 |
| commit | 111a4135d84485eff85bbca6a96cd91886deb7ba (patch) | |
| tree | ea7da00aeb86d9b9d14773213e037e114a84356a /core/tests/coretests | |
| parent | 41170a1a05830e6c9ec631d73043ccf1878dc0f9 (diff) | |
| parent | b9a40068b590b86904b40bf466571b140d0f94b4 (diff) | |
| download | frameworks_base-111a4135d84485eff85bbca6a96cd91886deb7ba.zip frameworks_base-111a4135d84485eff85bbca6a96cd91886deb7ba.tar.gz frameworks_base-111a4135d84485eff85bbca6a96cd91886deb7ba.tar.bz2 | |
am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp
* commit 'b9a40068b590b86904b40bf466571b140d0f94b4':
Failing test cleanup.
Diffstat (limited to 'core/tests/coretests')
| -rw-r--r-- | core/tests/coretests/src/android/content/SyncStorageEngineTest.java | 3 | ||||
| -rw-r--r-- | core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/content/SyncStorageEngineTest.java b/core/tests/coretests/src/android/content/SyncStorageEngineTest.java index 0b494a7..ae41409 100644 --- a/core/tests/coretests/src/android/content/SyncStorageEngineTest.java +++ b/core/tests/coretests/src/android/content/SyncStorageEngineTest.java @@ -39,7 +39,8 @@ public class SyncStorageEngineTest extends AndroidTestCase { * correcponding sync is finished. This can happen if the clock changes while we are syncing. * */ - @SmallTest + // TODO: this test causes AidlTest to fail. Omit for now + // @SmallTest public void testPurgeActiveSync() throws Exception { final Account account = new Account("a@example.com", "example.type"); final String authority = "testprovider"; diff --git a/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java b/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java index 4d016d1..fe62764 100644 --- a/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java +++ b/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java @@ -16,7 +16,7 @@ package com.android.internal.os; -import junit.framework.TestCase; +import android.test.suitebuilder.annotation.Suppress; import java.io.PrintWriter; import java.io.StringWriter; @@ -25,6 +25,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import junit.framework.TestCase; + +// this test causes a IllegalAccessError: superclass not accessible +@Suppress public class LoggingPrintStreamTest extends TestCase { TestPrintStream out = new TestPrintStream(); |