From f5597e626ecf7949d249dea08c1a2964d890ec11 Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jessewilson@google.com>
Date: Fri, 24 Jul 2009 15:17:03 -0700
Subject: Integrate luni module (but not tests) to Harmony r772995.

Notable changes
     - Stripped "@since Android 1.0" from many files. Most files
       are now 100% the same in Dalvik and Harmony.
     - AbstractStringBuilder.reverse() supports surrogates
     - AbstractStringBuilder shares less to waste less memory
     - Bitset optimized
     - BufferedInputStream changed to support unsynchronized close()
     - BufferedOutputStream does flushInternal
     - BufferedReader supports EBCDIC NEL
     - Collections.synchronizedList().indexOf() does a copy for more concurrency
     - Classes in nio module changed: DatagramChannelImpl, SocketChannelImpl
       and ServerSocketChannelImpl (these depend on internal APIs changed in
       this update)
     - DataInputStream/DataOutputStream now use a small buffer to limit the
       number of times the underlying stream is accessed
     - Date now has a minutes offset, more efficient toString()
     - ExposedByteArrayInputStream: new internal class
     - DeleteOnExit moved to top-level class
     - FileDescriptor.isValid() now non-native
     - Float, Double lessThan optimized (fix for compare(-0.0F, 0.0F) still pending)
     - FileURLConnection now guesses content types from streams
     - HashMap iterator changes
     - Hashtable iterator changes
     - INetworkSystem
       - removes bind2(), createMulticastSocket, sendStream(),
       - renames createSocket to createStreamSocket
     - JarURLConnection rewritten
     - LinkedHashMap: new iterator
     - Locale, Currency, TimeZone: now use ICU in Harmony, plain Java in Dalvik
     - ObjectInputStream: Accessor objects in Harmony, direct native in Dalvik
     - ProxyClassFile - many changes
     - String - optimized ascii for toLowerCase, toUpperCase, compare
     - Timer - rewritten
     - TreeMap - rewritten
     - URLClassLoader - new
     - URLConnection - new guessContentTypeFromStream(), uses org.apache.harmony.awt.www.content
       to lookup content type handlers
---
 .../harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java       | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'crypto/src')

diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java b/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
index eb2920e..d93c156 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
+++ b/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
@@ -21,6 +21,7 @@ import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargets;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.SideEffect;
 
 import java.math.BigInteger;
 import java.security.AlgorithmParameters;
@@ -221,6 +222,7 @@ public class ExemptionMechanismTest extends TestCase {
         method = "finalize",
         args = {}
     )
+    @SideEffect("Causes OutOfMemoryError to test finalization")
     public void test_finalize () {
         Mock_ExemptionMechanism mem = new Mock_ExemptionMechanism(null, null, "Name");
         assertNotNull(mem);
-- 
cgit v1.1