svn commit: r1087731 - in /incubator/wookie/trunk/parser/java: src-test/org/apache/wookie/w3c/test/FormattingUtilsTest.java src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java src/org/apache/wookie/w3c/util/FormattingUtils.java

[scottbw]

Author: scottbw
Date: Fri Apr  1 14:53:38 2011
New Revision: 1087731

URL: http://svn.apache.org/viewvc?rev=1087731&view=rev
Log:
Don't unnecessarily add BIDI tags to strings if they are all LTR or have no 
direction info (and updated tests)

Modified:
    
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/FormattingUtilsTest.java
    
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/FormattingUtils.java

Modified: 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/FormattingUtilsTest.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/FormattingUtilsTest.java?rev=1087731&r1=1087730&r2=1087731&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/FormattingUtilsTest.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/FormattingUtilsTest.java
 Fri Apr  1 14:53:38 2011
@@ -15,6 +15,7 @@ package org.apache.wookie.w3c.test;
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.wookie.w3c.impl.NameEntity;
 import org.apache.wookie.w3c.util.FormattingUtils;
 import org.junit.Test;
 
@@ -29,6 +30,14 @@ import org.junit.Test;
 public class FormattingUtilsTest {
        
        @Test
+       public void noDirectionFormatted(){
+               NameEntity name = new NameEntity();
+               name.setDir("ltr");
+               name.setName("Hello world");
+               assertEquals("Hello world", 
FormattingUtils.getFormattedWidgetName(name));
+       }
+       
+       @Test
        public void noDirection(){
                assertEquals("Hello World", FormattingUtils.getEncoded(null, 
"Hello World"));
        }

Modified: 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java?rev=1087731&r1=1087730&r2=1087731&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
 Fri Apr  1 14:53:38 2011
@@ -23,6 +23,14 @@ import org.junit.Test;
  * Tests localized content extraction features
  */
 public class LocalizedContentTest {
+       
+       @Test
+       public void nonLocalizedContent(){
+               Element test = new Element("test");
+               test.setText(" hello ");
+               assertEquals("hello", 
AbstractLocalizedEntity.getLocalizedTextContent(test));
+               assertEquals(5, 
AbstractLocalizedEntity.getLocalizedTextContent(test).length());
+       }
 
        @Test
        public void testLocalizedContent(){

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/FormattingUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/FormattingUtils.java?rev=1087731&r1=1087730&r2=1087731&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/FormattingUtils.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/FormattingUtils.java
 Fri Apr  1 14:53:38 2011
@@ -116,7 +116,7 @@ public class FormattingUtils {
        protected static String getFormatted(String dir, String value){
                
                // If the string has no embedded spans with dir attributes, and 
no set dir, just return the string
-               //if (dir == null && !value.contains("dir=")) return value;
+               if ((dir == null || dir.equals("ltr") )&& 
!value.contains("dir=")) return value;
                
                String mode = "embed";
                if (dir == null) dir = "ltr";