Use features from GWT 2.6.0:

- Use Class.getSimpleName() instead of our custom implementations.
- Mark test that uses StringBuilder.appendCodePoint() as working under GWT.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=79579791

Author: cpovirk

guava-gwt/test-super/com/google/common/base/super/com/google/common/base/Utf8Test.java

@@ -20,6 +20,9 @@
 
 import junit.framework.TestCase;
 
+import java.util.HashMap;
+import java.util.Random;
+
 /**
  * Unit tests for {@link Utf8}.
  *
@@ -44,6 +47,38 @@ public void testEncodedLength_validStrings() {
         newString(Character.MIN_HIGH_SURROGATE, Character.MIN_LOW_SURROGATE)));
   }
 
+  public void testEncodedLength_validStrings2() {
+    HashMap<Integer, Integer> utf8Lengths = new HashMap<Integer, Integer>();
+    utf8Lengths.put(0x00, 1);
+    utf8Lengths.put(0x7f, 1);
+    utf8Lengths.put(0x80, 2);
+    utf8Lengths.put(0x7ff, 2);
+    utf8Lengths.put(0x800, 3);
+    utf8Lengths.put(Character.MIN_SUPPLEMENTARY_CODE_POINT - 1, 3);
+    utf8Lengths.put(Character.MIN_SUPPLEMENTARY_CODE_POINT, 4);
+    utf8Lengths.put(Character.MAX_CODE_POINT, 4);
+
+    Integer[] codePoints = utf8Lengths.keySet().toArray(new Integer[]{});
+    StringBuilder sb = new StringBuilder();
+    Random rnd = new Random();
+    for (int trial = 0; trial < 100; trial++) {
+      sb.setLength(0);
+      int utf8Length = 0;
+      for (int i = 0; i < 6; i++) {
+        Integer randomCodePoint = codePoints[rnd.nextInt(codePoints.length)];
+        sb.appendCodePoint(randomCodePoint);
+        utf8Length += utf8Lengths.get(randomCodePoint);
+        if (utf8Length != Utf8.encodedLength(sb)) {
+          StringBuilder repro = new StringBuilder();
+          for (int j = 0; j < sb.length(); j++) {
+            repro.append(" " + (int) sb.charAt(j));  // GWT compatible
+          }
+          assertEquals(repro.toString(), utf8Length, Utf8.encodedLength(sb));
+        }
+      }
+    }
+  }
+
   public void testEncodedLength_invalidStrings() {
     testEncodedLengthFails(newString(Character.MIN_HIGH_SURROGATE), 0);
     testEncodedLengthFails("foobar" + newString(Character.MIN_HIGH_SURROGATE), 6);

guava-gwt/test/com/google/common/base/Utf8Test_gwt.java

@@ -28,6 +28,11 @@ public void testEncodedLength_validStrings() throws Exception {
   testCase.testEncodedLength_validStrings();
 }
 
+public void testEncodedLength_validStrings2() throws Exception {
+  com.google.common.base.Utf8Test testCase = new com.google.common.base.Utf8Test();
+  testCase.testEncodedLength_validStrings2();
+}
+
 public void testIsWellFormed_4BytesSamples() throws Exception {
   com.google.common.base.Utf8Test testCase = new com.google.common.base.Utf8Test();
   testCase.testIsWellFormed_4BytesSamples();

guava-tests/test/com/google/common/base/Utf8Test.java

@@ -49,7 +49,6 @@ public void testEncodedLength_validStrings() {
         newString(Character.MIN_HIGH_SURROGATE, Character.MIN_LOW_SURROGATE)));
   }
 
-  @GwtIncompatible("StringBuilder.appendCodePoint()")
   public void testEncodedLength_validStrings2() {
     HashMap<Integer, Integer> utf8Lengths = new HashMap<Integer, Integer>();
     utf8Lengths.put(0x00, 1);

guava/src/com/google/common/base/MoreObjects.java

@@ -92,7 +92,7 @@ public static <T> T firstNonNull(@Nullable T first, @Nullable T second) {
    * @since 18.0 (since 2.0 as {@code Objects.toStringHelper()}).
    */
   public static ToStringHelper toStringHelper(Object self) {
-    return new ToStringHelper(simpleName(self.getClass()));
+    return new ToStringHelper(self.getClass().getSimpleName());
   }
 
   /**
@@ -106,7 +106,7 @@ public static ToStringHelper toStringHelper(Object self) {
    * @since 18.0 (since 7.0 as {@code Objects.toStringHelper()}).
    */
   public static ToStringHelper toStringHelper(Class<?> clazz) {
-    return new ToStringHelper(simpleName(clazz));
+    return new ToStringHelper(clazz.getSimpleName());
   }
 
   /**
@@ -121,29 +121,6 @@ public static ToStringHelper toStringHelper(String className) {
     return new ToStringHelper(className);
   }
 
-  /**
-   * {@link Class#getSimpleName()} is not GWT compatible yet, so we
-   * provide our own implementation.
-   */
-  // Package-private so Objects can call it.
-  static String simpleName(Class<?> clazz) {
-    String name = clazz.getName();
-
-    // the nth anonymous class has a class name ending in "Outer$n"
-    // and local inner classes have names ending in "Outer.$1Inner"
-    name = name.replaceAll("\\$[0-9]+", "\\$");
-
-    // we want the name of the inner class all by its lonesome
-    int start = name.lastIndexOf('$');
-
-    // if this isn't an inner class, just find the start of the
-    // top level class name.
-    if (start == -1) {
-      start = name.lastIndexOf('.');
-    }
-    return name.substring(start + 1);
-  }
-
   /**
    * Support class for {@link MoreObjects#toStringHelper}.
    *

guava/src/com/google/common/base/Objects.java

@@ -127,7 +127,7 @@ public static int hashCode(@Nullable Object... objects) {
    */
   @Deprecated
   public static ToStringHelper toStringHelper(Object self) {
-    return new ToStringHelper(MoreObjects.simpleName(self.getClass()));
+    return new ToStringHelper(self.getClass().getSimpleName());
   }
 
   /**
@@ -144,7 +144,7 @@ public static ToStringHelper toStringHelper(Object self) {
    */
   @Deprecated
   public static ToStringHelper toStringHelper(Class<?> clazz) {
-    return new ToStringHelper(MoreObjects.simpleName(clazz));
+    return new ToStringHelper(clazz.getSimpleName());
   }
 
   /**