Author: [email protected]
Date: Wed May 13 16:35:30 2009
New Revision: 5367

Modified:
    trunk/user/super/com/google/gwt/emul/java/util/TreeMap.java
     
trunk/user/test/com/google/gwt/emultest/java/util/TreeMapStringStringTest.java

Log:
Simple fix and accompanying testcase for toString() method in  
TreeMap.Entry: issue 3422

Patch by: amitmanjhi
Review by: scottb


Modified: trunk/user/super/com/google/gwt/emul/java/util/TreeMap.java
==============================================================================
--- trunk/user/super/com/google/gwt/emul/java/util/TreeMap.java (original)
+++ trunk/user/super/com/google/gwt/emul/java/util/TreeMap.java Wed May 13  
16:35:30 2009
@@ -234,7 +234,8 @@

      @Override
      public String toString() {
-      return (isRed ? "R: " : "B: ") + key + "=" + value;
+      // for compatibility with the real Jre: issue 3422
+      return key + "=" + value;
      }
    }


Modified:  
trunk/user/test/com/google/gwt/emultest/java/util/TreeMapStringStringTest.java
==============================================================================
---  
trunk/user/test/com/google/gwt/emultest/java/util/TreeMapStringStringTest.java  
 
(original)
+++  
trunk/user/test/com/google/gwt/emultest/java/util/TreeMapStringStringTest.java  
 
Wed May 13 16:35:30 2009
@@ -16,9 +16,11 @@
  package com.google.gwt.emultest.java.util;

  import java.util.Iterator;
+import java.util.Map;
  import java.util.NoSuchElementException;
  import java.util.Set;
  import java.util.SortedMap;
+import java.util.TreeMap;

  /**
   * Tests <code>TreeMap</code> with Strings and the natural comparator.
@@ -118,6 +120,15 @@
      assertEquals("lastKey", "dd", subMap.lastKey());
    }

+  // checks for compatibility with real Jre's Entry.toString(): issue 3422
+  public void testTreeMapEntryToString() {
+    Map<String, String> treeMap = new TreeMap<String, String>();
+    treeMap.put("bar", "barValue");
+
+    assertEquals("bar=barValue",
+        treeMap.entrySet().iterator().next().toString());
+  }
+
    @Override
    protected Object getConflictingKey() {
      return new Integer(1);

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---

Reply via email to