auto import from //branches/cupcake/...@130745

24 files changed, 180 insertions, 101 deletions

diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
index eceb1a0..a354d65 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
@@ -31,8 +31,8 @@ public class ASCCharsetTest extends AbstractCharsetTestCase {
      * Constructor.
      * 
      */
-    public ASCCharsetTest(String arg0) {
-        super(arg0, "US-ASCII", new String[] { "ISO646-US", "ASCII", "cp367",
+    public ASCCharsetTest() {
+        super("US-ASCII", new String[] { "ISO646-US", "ASCII", "cp367",
                 "ascii7", "ANSI_X3.4-1986", "iso-ir-6", "us", "646",
                 "iso_646.irv:1983", "csASCII", "ANSI_X3.4-1968",
                 "ISO_646.irv:1991" }, true, true); // "ibm-367"
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java b/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
index 4c69759..88cbbdb 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
@@ -1,15 +1,13 @@
 package tests.api.java.nio.charset;
 
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestLevel;
-
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 
 import junit.framework.TestCase;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 @TestTargetClass(Charset.class)
 
@@ -54,9 +52,8 @@ public abstract class AbstractCharsetTestCase extends TestCase {
      * Constructor for ConcreteCharsetTest.
      * 
      */
-    public AbstractCharsetTestCase(String arg0, String canonicalName,
+    public AbstractCharsetTestCase(String canonicalName,
             String[] aliases, boolean canEncode, boolean isRegistered) {
-        super(arg0);
         this.canonicalName = canonicalName;
         this.canEncode = canEncode;
         this.isRegistered = isRegistered;
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
index a0db954..535f068 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
@@ -15,11 +15,11 @@
  */
 package tests.api.java.nio.charset;
 
-import dalvik.annotation.KnownFailure;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 import dalvik.annotation.TestTargets;
+import dalvik.annotation.AndroidOnly;
 
 import junit.framework.TestCase;
 
@@ -131,7 +131,8 @@ public class CharsetProviderTest extends TestCase {
         method = "charsetForName",
         args = {String.class}
     )
-    @KnownFailure("Fixed in ToT")
+    @AndroidOnly("Looks like RI doesn't use current thread's context class "+
+    "loader to lookup charset providers")
     public void testIsSupported_And_ForName_NormalProvider() throws Exception {
         try {
             assertFalse(Charset.isSupported("mockCharset10"));
@@ -231,7 +232,8 @@ public class CharsetProviderTest extends TestCase {
         method = "charsetForName",
         args = {String.class}
     )
-    @KnownFailure("Fixed in ToT")
+    @AndroidOnly("Looks like RI doesn't use current thread's context class "+
+    "loader to lookup charset providers")
     public void testIsSupported_NotCharsetProviderClass() throws Exception {
         try {
             StringBuffer sb = new StringBuffer();
@@ -359,7 +361,8 @@ public class CharsetProviderTest extends TestCase {
         method = "charsetForName",
         args = {String.class}
     )
-    @KnownFailure("Fixed in ToT")
+    @AndroidOnly("Looks like RI doesn't use current thread's context class "+
+    "loader to lookup charset providers")    
     public void testForName_NonExistingClass() throws Exception {
         try {
             StringBuffer sb = new StringBuffer();
@@ -385,7 +388,8 @@ public class CharsetProviderTest extends TestCase {
         method = "charsetForName",
         args = {String.class}
     )
-    @KnownFailure("Fixed in ToT")
+    @AndroidOnly("Looks like RI doesn't use current thread's context class "+
+    "loader to lookup charset providers")    
     public void testForName_NotCharsetProviderClass() throws Exception {
         try {
             StringBuffer sb = new StringBuffer();
@@ -411,7 +415,8 @@ public class CharsetProviderTest extends TestCase {
         method = "charsets",
         args = {}
     )
-    @KnownFailure("Fixed in ToT")
+    @AndroidOnly("Looks like RI doesn't use current thread's context class "+
+    "loader to lookup charset providers")    
     public void testAvailableCharsets_NormalProvider() throws Exception {
         try {
             assertFalse(Charset.availableCharsets()
@@ -506,7 +511,8 @@ public class CharsetProviderTest extends TestCase {
         method = "charsets",
         args = {}
     )
-    @KnownFailure("Fixed in ToT")
+    @AndroidOnly("Looks like RI doesn't use current thread's context class "+
+    "loader to lookup charset providers")    
     public void testAvailableCharsets_NotCharsetProviderClass()
             throws Exception {
         try {
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
index d4447a6..10d6caf 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
@@ -91,6 +91,7 @@ public class Charset_AbstractTest extends TestCase {
         args = {}
     )
     public void test_dumpEncodableChars () {
+        if (testChars == null) return;
         if (testChars.length > 0) return;
         System.out.format("\ntest_dumpEncodableChars() for name %s => %s (class = %s)\n",
                 charsetName, charset.name(), getClass().getName());
@@ -121,6 +122,7 @@ public class Charset_AbstractTest extends TestCase {
         args = {}
     )
     public void test_dumpEncoded () throws CharacterCodingException {
+        if (testChars == null) return;
         if (testChars.length == 0) return;
         if (testBytes.length > 0) return;
         System.out.format("\ntest_dumpEncoded() for name %s => %s (class = %s)\n",
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
index 10be214..24a6acb 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
@@ -16,7 +16,9 @@
 package tests.api.java.nio.charset;
 
 import dalvik.annotation.AndroidOnly;
+import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 import java.nio.charset.CharacterCodingException;
 
@@ -54,6 +56,12 @@ public class Charset_GSM0338 extends Charset_AbstractTest {
         super.setUp();
     }
 
+    @TestTargetNew(
+        level = TestLevel.SUFFICIENT,
+        notes = "Not applicable to this charset.",
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @Override
     public void test_CodecDynamic () throws CharacterCodingException {
     }
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
index e409a71..59bfcbc 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
@@ -29,8 +29,10 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
 
-// SEE correspondig_Android test class:
-//@TestTargetClass(targets.Charsets.Big5.class)
+@TestTargetClass(targets.Charsets.Big5.class)
+/** @hide
+ * SEE correspondig_Android test class:
+ */
 
 public class Charset_MultiByte_Big5 extends Charset_AbstractTest {
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
index 9619154..1416d2a 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
@@ -15,21 +15,11 @@
  */
 package tests.api.java.nio.charset;
 
-import dalvik.annotation.TestLevel;
+import dalvik.annotation.AndroidOnly;
 import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
-import junit.framework.TestCase;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
 
 @TestTargetClass(targets.Charsets.Big5.class)
+@AndroidOnly("icu different from RI")
 
 public class Charset_MultiByte_Big5_Android extends Charset_AbstractTest {
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
index 995f757..69a9663 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
@@ -29,8 +29,10 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
 
-// SEE correspondig_Android test class:
-//@TestTargetClass(targets.Charsets.EUC_JP.class)
+@TestTargetClass(targets.Charsets.EUC_JP.class)
+/** @hide
+ * SEE correspondig_Android test class:
+ */
 
 public class Charset_MultiByte_EUC_JP extends Charset_AbstractTest {
 
@@ -509,6 +511,12 @@ public class Charset_MultiByte_EUC_JP extends Charset_AbstractTest {
         super.setUp();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        notes = "Duplicate Characters.",
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @Override
     public void test_CodecDynamic () throws CharacterCodingException {
         encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
index a3701e9..2ebff21 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
@@ -15,21 +15,18 @@
  */
 package tests.api.java.nio.charset;
 
+import dalvik.annotation.AndroidOnly;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 
-import junit.framework.TestCase;
-
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
 
 @TestTargetClass(targets.Charsets.EUC_JP.class)
+@AndroidOnly("icu different from RI")
 
 public class Charset_MultiByte_EUC_JP_Android extends Charset_AbstractTest {
 
@@ -508,6 +505,12 @@ public class Charset_MultiByte_EUC_JP_Android extends Charset_AbstractTest {
         super.setUp();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        notes = "Duplicate Characters.",
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @Override
     public void test_CodecDynamic () throws CharacterCodingException {
         encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
index c4cd724..6faa772 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
@@ -16,7 +16,9 @@
 package tests.api.java.nio.charset;
 
 import dalvik.annotation.KnownFailure;
+import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 import java.nio.charset.CharacterCodingException;
 
@@ -175,24 +177,44 @@ public class Charset_MultiByte_GB2312 extends Charset_AbstractTest {
         super.setUp();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_CodecDynamic() throws CharacterCodingException {
         super.test_CodecDynamic();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_Decode() throws CharacterCodingException {
         super.test_Decode();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_Encode() throws CharacterCodingException {
         super.test_Encode();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is mapped to GBK Android!")
     @Override
     public void test_nameMatch() {
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
index 6b919ef..2546e58 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
@@ -29,8 +29,10 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
 
-// SEE correspondig_Android test class:
-//@TestTargetClass(targets.Charsets.GBK.class)
+@TestTargetClass(targets.Charsets.GBK.class)
+/** @hide
+ * SEE correspondig_Android test class:
+ */
 
 public class Charset_MultiByte_GBK extends Charset_AbstractTest {
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
index 0e80bd0..e036607 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
@@ -15,21 +15,11 @@
  */
 package tests.api.java.nio.charset;
 
-import dalvik.annotation.TestLevel;
+import dalvik.annotation.AndroidOnly;
 import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
-import junit.framework.TestCase;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
 
 @TestTargetClass(targets.Charsets.GBK.class)
+@AndroidOnly("icu different from RI")
 
 public class Charset_MultiByte_GBK_Android extends Charset_AbstractTest {
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
index 54fd399..3c386b7 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
@@ -16,7 +16,9 @@
 package tests.api.java.nio.charset;
 
 import dalvik.annotation.KnownFailure;
+import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 import java.nio.charset.CharacterCodingException;
 
@@ -368,18 +370,33 @@ public class Charset_MultiByte_ISO_2022_JP extends Charset_AbstractTest {
         super.setUp();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_CodecDynamic() throws CharacterCodingException {
         super.test_CodecDynamic();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_Decode() throws CharacterCodingException {
         super.test_Decode();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_Encode() throws CharacterCodingException {
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
index 1d93f54..6b71385 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
@@ -29,8 +29,10 @@ import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
 
-// SEE correspondig_Android test class:
-//@TestTargetClass(targets.Charsets.UTF_16.class)
+@TestTargetClass(targets.Charsets.UTF_16.class)
+/** @hide
+ * SEE correspondig_Android test class:
+ */
 
 public class Charset_MultiByte_UTF_16 extends Charset_AbstractTest {
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
index ac351d1..787deca 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
@@ -15,21 +15,11 @@
  */
 package tests.api.java.nio.charset;
 
-import dalvik.annotation.TestLevel;
+import dalvik.annotation.AndroidOnly;
 import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
-import junit.framework.TestCase;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
 
 @TestTargetClass(targets.Charsets.UTF_16.class)
+@AndroidOnly("icu different from RI")
 
 public class Charset_MultiByte_UTF_16_Android extends Charset_AbstractTest {
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
index ea8fd6b..013d90f 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
@@ -16,7 +16,9 @@
 package tests.api.java.nio.charset;
 
 import dalvik.annotation.KnownFailure;
+import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
 
 import java.nio.charset.CharacterCodingException;
 
@@ -224,24 +226,44 @@ public class Charset_MultiByte_x_windows_950 extends Charset_AbstractTest {
         super.setUp();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_CodecDynamic() throws CharacterCodingException {
         super.test_CodecDynamic();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_Decode() throws CharacterCodingException {
         super.test_Decode();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is not properly supported in Android!")
     @Override
     public void test_Encode() throws CharacterCodingException {
         super.test_Encode();
     }
 
+    @TestTargetNew(
+        level = TestLevel.PARTIAL_COMPLETE,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     @KnownFailure("This Characterset is mapped to Big5 Android!")
     @Override
     public void test_nameMatch() {
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
index 45a3a39..02b6a3b 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
@@ -15,21 +15,15 @@
  */
 package tests.api.java.nio.charset;
 
+import dalvik.annotation.AndroidOnly;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 
-import junit.framework.TestCase;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
 
 @TestTargetClass(targets.Charsets.IBM864.class)
+@AndroidOnly("icu different from RI")
 
 public class Charset_SingleByte_IBM864 extends Charset_SingleByteAbstractTest {
 
@@ -75,12 +69,17 @@ public class Charset_SingleByte_IBM864 extends Charset_SingleByteAbstractTest {
         super.setUp();
     }
 
-    public static void _test_Bytes_DifferentOnes_RI() throws CharacterCodingException {
-        decodeReplace(
-                theseBytes(new int[]{26, 28, 37, 127, 159, 215, 216, 241}),
-                new char[] {26, 28, 1642, 127, 65533, 65217, 65221, 1617} );
-    }
+//    public static void _test_Bytes_DifferentOnes_RI() throws CharacterCodingException {
+//        decodeReplace(
+//                theseBytes(new int[]{26, 28, 37, 127, 159, 215, 216, 241}),
+//                new char[] {26, 28, 1642, 127, 65533, 65217, 65221, 1617} );
+//    }
 
+    @TestTargetNew(
+        level = TestLevel.ADDITIONAL,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     public static void test_Bytes_DifferentOnes_Android() throws CharacterCodingException {
         // Android:
         decodeReplace(
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
index 272e517..8da07d5 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
@@ -55,6 +55,11 @@ public class Charset_SingleByte_ISO_8859_3 extends Charset_SingleByteAbstractTes
         super.setUp();
     }
 
+    @TestTargetNew(
+        level = TestLevel.ADDITIONAL,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     public static void test_Bytes_166() throws CharacterCodingException {
         decodeReplace(
                 new byte[] {(byte)166},
@@ -70,18 +75,33 @@ public class Charset_SingleByte_ISO_8859_3 extends Charset_SingleByteAbstractTes
 //                outputCB.array());
     }
 
+    @TestTargetNew(
+        level = TestLevel.ADDITIONAL,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     public static void test_Bytes_195() throws CharacterCodingException {
         decodeReplace(
                 new byte[] {(byte)195},
                 new char[] {65533} );
     }
 
+    @TestTargetNew(
+        level = TestLevel.ADDITIONAL,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     public static void test_Bytes_165() throws CharacterCodingException {
         decodeReplace(
                 new byte[] {(byte)165},
                 new char[] {65533} );
     }
 
+    @TestTargetNew(
+        level = TestLevel.ADDITIONAL,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     public static void test_Bytes_165_any() throws CharacterCodingException {
         decodeReplace(
                 new byte[] {(byte)165, 32},
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
index 12ffff2..e538206 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
@@ -15,21 +15,15 @@
  */
 package tests.api.java.nio.charset;
 
+import dalvik.annotation.AndroidOnly;
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 
-import junit.framework.TestCase;
-
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
 
 @TestTargetClass(targets.Charsets.x_IBM874.class)
+@AndroidOnly("icu different from RI")
 
 public class Charset_SingleByte_x_IBM874 extends Charset_SingleByteAbstractTest {
 
@@ -58,12 +52,17 @@ public class Charset_SingleByte_x_IBM874 extends Charset_SingleByteAbstractTest
         super.setUp();
     }
 
-    public static void _test_Bytes_DifferentOnes_RI() throws CharacterCodingException {
-        decodeReplace(
-                theseBytes(new int[]{26, 28, 127, 128}),
-                new char[] {26, 28, 127, 8364} );
-    }
+//    public static void _test_Bytes_DifferentOnes_RI() throws CharacterCodingException {
+//        decodeReplace(
+//                theseBytes(new int[]{26, 28, 127, 128}),
+//                new char[] {26, 28, 127, 8364} );
+//    }
 
+    @TestTargetNew(
+        level = TestLevel.ADDITIONAL,
+        method = "functionalCoDec_REPR",
+        args = {}
+    )
     public static void test_Bytes_DifferentOnes_Android() throws CharacterCodingException {
         // Android:
         decodeReplace(
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
index e001292..41e2d3b 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
@@ -31,8 +31,8 @@ public class ISOCharsetTest extends AbstractCharsetTestCase {
     /**
      * Constructor.
      */
-    public ISOCharsetTest(String arg0) {
-        super(arg0, "ISO-8859-1", new String[] { "iso-ir-100", "8859_1",
+    public ISOCharsetTest() {
+        super("ISO-8859-1", new String[] { "iso-ir-100", "8859_1",
                 "ISO_8859-1", "ISO8859_1", "819", "csISOLatin1", "IBM-819",
                 "ISO_8859-1:1987", "latin1", "cp819", "ISO8859-1", "IBM819",
                 "ISO_8859_1", "l1" }, true, true);
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
index d7f4866..0ca8bd3 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
@@ -31,8 +31,8 @@ public class UTF16BECharsetTest extends AbstractCharsetTestCase {
     /**
      * Constructor.
      */
-    public UTF16BECharsetTest(String arg0) {
-        super(arg0, "UTF-16BE", new String[] { "X-UTF-16BE", "UTF_16BE" },
+    public UTF16BECharsetTest() {
+        super("UTF-16BE", new String[] { "X-UTF-16BE", "UTF_16BE" },
                 true, true); // "ISO-10646-UCS-2"
     }
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
index 4972abe..a0026a1 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
@@ -31,8 +31,8 @@ public class UTF16CharsetTest extends AbstractCharsetTestCase {
     /**
      * Constructor.
      */
-    public UTF16CharsetTest(String arg0) {
-        super(arg0, "UTF-16", new String[] { "UTF_16" }, true, true);
+    public UTF16CharsetTest() {
+        super("UTF-16", new String[] { "UTF_16" }, true, true);
     }
 
     /*
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
index 3189a15..3df7536 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
@@ -31,8 +31,8 @@ public class UTF16LECharsetTest extends AbstractCharsetTestCase {
     /**
      * Constructor.
      */
-    public UTF16LECharsetTest(String arg0) {
-        super(arg0, "UTF-16LE", new String[] { "UTF_16LE", "X-UTF-16LE" },
+    public UTF16LECharsetTest() {
+        super("UTF-16LE", new String[] { "UTF_16LE", "X-UTF-16LE" },
                 true, true);
     }
 
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java b/nio_char/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
index 1df2def..b9ebbb8 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
+++ b/nio_char/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
@@ -32,8 +32,8 @@ public class UTF8CharsetTest extends AbstractCharsetTestCase {
      * Constructor for UTF8CharsetTest.
      * 
      */
-    public UTF8CharsetTest(String arg0) {
-        super(arg0, "UTF-8", new String[] { "UTF8" }, true, true);
+    public UTF8CharsetTest() {
+        super("UTF-8", new String[] { "UTF8" }, true, true);
     }
 
     /*