harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r431899 - in /incubator/harmony/enhanced/classlib/trunk/modules/jndi/src: main/java/javax/naming/CompoundName.java test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java
Date Wed, 16 Aug 2006 13:46:59 GMT
Author: pyang
Date: Wed Aug 16 06:46:59 2006
New Revision: 431899

URL: http://svn.apache.org/viewvc?rev=431899&view=rev
Log:
Fix toString() bug when CompoundName is constructed right_to_left

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/CompoundName.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/CompoundName.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/CompoundName.java?rev=431899&r1=431898&r2=431899&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/CompoundName.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/CompoundName.java
Wed Aug 16 06:46:59 2006
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.Vector;
@@ -883,64 +884,20 @@
      */
     public String toString() {
         StringBuffer sb = new StringBuffer();
-        Enumeration enums = elem.elements();
         String begin = NULL_STRING.equals(beginQuoteString) ? beginQuoteString2
                 : beginQuoteString;
         String end = NULL_STRING.equals(endQuoteString) ? endQuoteString2
                 : endQuoteString;
         String separator = NULL_STRING.equals(separatorString) ? separatorString2
                 : separatorString;
-        while (enums.hasMoreElements()) {
-            String elemString = (String) enums.nextElement();
-            if (0 == elemString.length()) {
-                // if empty element, append a separator and continue
-                sb.append(separator);
-                continue;
+        if(RIGHT_TO_LEFT.equals(direction)){
+            for (int i = elem.size() - 1; i >= 0; i--) {
+                addElement(sb, i, separator, begin, end);
             }
-            int pos = sb.length();
-            sb.append(elemString);
-
-            if (!NULL_STRING.equals(begin) && !NULL_STRING.equals(end)
-                    && !NULL_STRING.equals(separator)
-                    && (0 <= elemString.indexOf(separator))) {
-                // if contains separator string, quoted it
-                sb.insert(pos, begin);
-                pos += begin.length();
-                // if quoted, then every endquote char must be escaped
-                for (int i = 0, j = 0; 0 <= (j = elemString.indexOf(end, i)); i = j
-                        + end.length()) {
-                    sb.insert(pos + j, escapeString);
-                    pos += escapeString.length();
-                }
-                sb.append(end);
-            } else {
-                if (startsWithFromPos(elemString, 0, beginQuoteString)
-                        || startsWithFromPos(elemString, 0, beginQuoteString2)) {
-                    //if not quoted and start with begin quote string, escape it
-                    sb.insert(pos, escapeString);
-                    pos += escapeString.length();
-                }
-                //if not quoted, escape all separator string and all escape string
-                for (int i = 0; i < elemString.length();) {
-                    if (startsWithFromPos(elemString, i, separatorString)) {
-                        sb.insert(pos + i, escapeString);
-                        pos += escapeString.length();
-                        i += separatorString.length();
-                    } else if (startsWithFromPos(elemString, i,
-                            separatorString2)) {
-                        sb.insert(pos + i, escapeString);
-                        pos += escapeString.length();
-                        i += separatorString2.length();
-                    } else if (startsWithFromPos(elemString, i, escapeString)) {
-                        sb.insert(pos + i, escapeString);
-                        pos += escapeString.length();
-                        i += escapeString.length();
-                    } else {
-                        i++;
-                    }
-                }
+        }else{
+            for (int i = 0; i < elem.size(); i++) {
+                addElement(sb, i, separator, begin, end);
             }
-            sb.append(separator);
         }
         if (size() * separator.length() < sb.length()) {
             //if the name contains non-empty element, delete the last separator char, which
is abundant
@@ -949,29 +906,86 @@
         return sb.toString();
     }
 
+    private void addElement(StringBuffer sb, int index, String separator, String begin, String
end) {
+        String elemString = elem.get(index);
+        if (0 == elemString.length()) {
+            // if empty element, append a separator and continue
+            sb.append(separator);
+            return;
+        }
+        int pos = sb.length();
+        sb.append(elemString);
+        if (!NULL_STRING.equals(begin) && !NULL_STRING.equals(end)
+                && !NULL_STRING.equals(separator)
+                && (0 <= elemString.indexOf(separator))) {
+            // if contains separator string, quoted it
+            sb.insert(pos, begin);
+            pos += begin.length();
+            // if quoted, then every endquote char must be escaped
+            for (int i = 0, j = 0; 0 <= (j = elemString.indexOf(end, i)); i = j
+                    + end.length()) {
+                sb.insert(pos + j, escapeString);
+                pos += escapeString.length();
+            }
+            sb.append(end);
+        } else {
+            if (startsWithFromPos(elemString, 0, beginQuoteString)
+                    || startsWithFromPos(elemString, 0, beginQuoteString2)) {
+                // if not quoted and start with begin quote string, escape it
+                sb.insert(pos, escapeString);
+                pos += escapeString.length();
+            }
+            // if not quoted, escape all separator string and all escape string
+            for (int i = 0; i < elemString.length();) {
+                if (startsWithFromPos(elemString, i, separatorString)) {
+                    sb.insert(pos + i, escapeString);
+                    pos += escapeString.length();
+                    i += separatorString.length();
+                } else if (startsWithFromPos(elemString, i, separatorString2)) {
+                    sb.insert(pos + i, escapeString);
+                    pos += escapeString.length();
+                    i += separatorString2.length();
+                } else if (startsWithFromPos(elemString, i, escapeString)) {
+                    sb.insert(pos + i, escapeString);
+                    pos += escapeString.length();
+                    i += escapeString.length();
+                } else {
+                    i++;
+                }
+            }
+        }
+        sb.append(separator);
+    }
+
     /**
-     * Check if the supplied object <code>o</code> is equal to this 
+     * Check if the supplied object <code>o</code> is equal to this
      * <code>CompoundName</code>.
      * <p>
-     * The supplied <code>Object o</code> may be null but that will cause false

-     * to be returned.</p>
+     * The supplied <code>Object o</code> may be null but that will cause
+     * false to be returned.
+     * </p>
      * <p>
-     * The supplied <code>Object o</code> may be something other than a 
-     * <code>CompoundName</code> but that will cause false to be returned.</p>
+     * The supplied <code>Object o</code> may be something other than a
+     * <code>CompoundName</code> but that will cause false to be returned.
+     * </p>
      * <p>
-     * To be equal the supplied <code>CompoundName</code> must have the same

-     * number of elements and each element must match the corresponding element 
-     * of this <code>CompoundName</code>. The properties jndi.syntax.ignorecase

-     * and jndi.syntax.trimblanks need to be considered if they have been set.</p>
+     * To be equal the supplied <code>CompoundName</code> must have the same
+     * number of elements and each element must match the corresponding element
+     * of this <code>CompoundName</code>. The properties
+     * jndi.syntax.ignorecase and jndi.syntax.trimblanks need to be considered
+     * if they have been set.
+     * </p>
      * <p>
-     * The properties associated with the <code>CompoundName</code> must be taken

-     * into account but do not have to match. For example "home/jenningm-abc/.profile" 
-     * with a direction of left to right is equal to ".profile/jenningm-abc/home" with 
-     * a direction of right to left. </p>
+     * The properties associated with the <code>CompoundName</code> must be
+     * taken into account but do not have to match. For example
+     * "home/jenningm-abc/.profile" with a direction of left to right is equal
+     * to ".profile/jenningm-abc/home" with a direction of right to left.
+     * </p>
      * 
-     * @param o				the object to be compared
-     * @return 				true if supplied object <code>o</code> is equals to 
-     * 						this <code>CompoundName</code>, false otherwise
+     * @param o
+     *            the object to be compared
+     * @return true if supplied object <code>o</code> is equals to this
+     *         <code>CompoundName</code>, false otherwise
      */
     public boolean equals(Object o) {
         if (!(o instanceof CompoundName)) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java?rev=431899&r1=431898&r2=431899&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompoundNameTest.java
Wed Aug 16 06:46:59 2006
@@ -1515,7 +1515,7 @@
 		name = new CompoundName(" A / B / c ", props);
 		assertEquals(294, name.hashCode());
 	}
-
+    
 	public void testToString() throws InvalidNameException {
 		log.setMethod("testToString()");
 
@@ -1528,7 +1528,6 @@
 		testToString("/a/b/c", "/a/b/c");
 
 		testToString("a/\\/b/c", "a/</b>/c");
-		testToString("a/\\b/c", "a/\\b/c");
 		testToString("a/b\\", "fail");
 
 		testToString("a/<b/>/c", "a/<b/>/c");
@@ -1546,6 +1545,12 @@
 		testToString("a/'/b\\a\\'b'/c", "a/</b\\a'b>/c");
 
 	}
+    
+    public void testToStringRightToLeft() throws Exception{
+        
+        CompoundName name = new CompoundName("a/b/c", props);
+        assertEquals("a/b/c", name.toString());
+    }
 
 	private void testBehavior(String str, Properties p) {
 		try {
@@ -1560,14 +1565,18 @@
 			throws InvalidNameException {
 		CompoundName name = null;
 		try {
+            props.put("jndi.syntax.direction", "left_to_right");
 			name = new CompoundName(str, props);
 			if ("fail".equals(expected)) {
 				fail("fail.equals()" + expected);
 			}
-			assertEquals(new CompoundName(name.toString(), props), name);
-			// assertEquals(
-			// new CompoundName(name.toString(), props).toString(),
-			// expected);
+            assertEquals(expected, name.toString());
+            props.put("jndi.syntax.direction", "right_to_left");
+            name = new CompoundName(str, props);
+            if ("fail".equals(expected)) {
+                fail("fail.equals()" + expected);
+            }
+            assertEquals(expected, name.toString());
 		} catch (Exception e) {
 			if (!"fail".equals(expected)) {
 				fail(str + "," + expected + "," + e.getMessage());



Mime
View raw message