svn commit: r757277 - in /incubator/shindig/branches/1.0.x-incubating/java/gadgets/src: main/java/org/apache/shindig/gadgets/spec/UserPref.java test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java

[vsiveton]

Author: vsiveton
Date: Sun Mar 22 23:34:58 2009
New Revision: 757277

URL: http://svn.apache.org/viewvc?rev=757277&view=rev
Log:
o merged r757174

Modified:
    
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
    
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java

Modified: 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java?rev=757277&r1=757276&r2=757277&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
 Sun Mar 22 23:34:58 2009
@@ -150,11 +150,10 @@
     if (enumValues.isEmpty()) {
       buf.append("/>");
     } else {
-      buf.append('\n');
+      buf.append(">\n");
       for (Map.Entry<String, String> entry : enumValues.entrySet()) {
         buf.append("<EnumValue value=\"")
            .append(entry.getKey())
-           .append("\" value=\"")
            .append("\" display_value=\"")
            .append(entry.getValue())
            .append("\"/>\n");

Modified: 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java?rev=757277&r1=757276&r2=757277&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
 Sun Mar 22 23:34:58 2009
@@ -100,4 +100,14 @@
       // OK
     }
   }
+
+  public void testToString() throws Exception {
+    String xml = "<UserPref name=\"name\" 
display_name=\"__MSG_display_name__\" "
+        + "default_value=\"__MSG_default_value__\" required=\"false\" "
+        + "datatype=\"enum\">"
+        + "<EnumValue value=\"0\" display_value=\"__MSG_dv__\"/>"
+        + "</UserPref>";
+    UserPref userPref = new UserPref(XmlUtil.parse(xml));
+    assertEquals(xml, userPref.toString().replaceAll("\n", ""));
+  }
 }