Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 1682 invoked from network); 26 Sep 2008 11:31:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Sep 2008 11:31:47 -0000 Received: (qmail 75317 invoked by uid 500); 26 Sep 2008 11:31:45 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 75217 invoked by uid 500); 26 Sep 2008 11:31:45 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 75208 invoked by uid 99); 26 Sep 2008 11:31:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Sep 2008 04:31:45 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Sep 2008 11:30:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2BA042388988; Fri, 26 Sep 2008 04:31:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r699281 - in /harmony/enhanced/classlib/trunk/modules/jndi/src: main/java/javax/naming/ test/java/org/apache/harmony/jndi/tests/javax/naming/ Date: Fri, 26 Sep 2008 11:31:25 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080926113126.2BA042388988@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Fri Sep 26 04:31:25 2008 New Revision: 699281 URL: http://svn.apache.org/viewvc?rev=699281&view=rev Log: Apply modified version of patch for HARMONY-5990 ([classlib][jndi] - the return string of Reference.toString() should be same with RI) Added: harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java (with props) Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/RefAddr.java harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Reference.java harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ReferenceTest.java Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/RefAddr.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/RefAddr.java?rev=699281&r1=699280&r2=699281&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/RefAddr.java (original) +++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/RefAddr.java Fri Sep 26 04:31:25 2008 @@ -114,11 +114,7 @@ @SuppressWarnings("nls") @Override public String toString() { - return "The type of the address is: " - + this.addrType - + "\nThe content of the address is: " - + (null == this.getContent() ? "null" : this.getContent() - .toString()) + "\n"; + return "Type: " + addrType + "\nContent: " + getContent() + "\n"; } } Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Reference.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Reference.java?rev=699281&r1=699280&r2=699281&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Reference.java (original) +++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Reference.java Fri Sep 26 04:31:25 2008 @@ -337,16 +337,18 @@ * * @return the string representation of this object */ + @SuppressWarnings("nls") @Override public String toString() { - String s = "Reference class name: " + this.className; //$NON-NLS-1$ - Enumeration e = this.addrs.elements(); + StringBuilder s = new StringBuilder("Reference Class Name: "); + s.append(className); + s.append("\n"); - s += "\nReference addresses:"; //$NON-NLS-1$ + Enumeration e = this.addrs.elements(); while (e.hasMoreElements()) { - s += "\n\t" + e.nextElement(); //$NON-NLS-1$ + s.append(e.nextElement()); } - return s + "\n"; //$NON-NLS-1$ + return s.toString(); } } Added: harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java?rev=699281&view=auto ============================================================================== --- harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java (added) +++ harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java Fri Sep 26 04:31:25 2008 @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.harmony.jndi.tests.javax.naming; + +import javax.naming.RefAddr; + +import junit.framework.TestCase; + +public class RefAddrTest extends TestCase { + public static class MockRefAddr extends RefAddr { + + private String contents; + + public MockRefAddr(String type, String address) { + super(type); + this.contents = address; + } + + @Override + public Object getContent() { + return contents; + } + + } + + public void testToString_Simple() { + MockRefAddr addr = new MockRefAddr("type", "contents"); + + assertNotNull(addr.toString()); + assertEquals("Type: " + addr.getType() + "\nContent: " + + addr.getContent() + "\n", addr.toString()); + } + + public void testToString_AddressNull() { + MockRefAddr addr = new MockRefAddr("type", null); + + assertNotNull(addr.toString()); + assertEquals("Type: " + addr.getType() + "\nContent: null\n", addr + .toString()); + } + + public void testToString_TypeNull() { + MockRefAddr addr = new MockRefAddr(null, "contents"); + + assertNotNull(addr.toString()); + assertEquals("Type: null\nContent: " + addr.getContent() + "\n", addr + .toString()); + } +} Propchange: harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ReferenceTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ReferenceTest.java?rev=699281&r1=699280&r2=699281&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ReferenceTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ReferenceTest.java Fri Sep 26 04:31:25 2008 @@ -500,7 +500,9 @@ * "\n", reference.toString()); */ assertNotNull(reference.toString()); - } + assertEquals("Reference Class Name: " + reference.getClassName() + "\n" + + addr0.toString() + addr1.toString(), reference.toString()); + } public void testToString_AddressNull() { String className = "java.lang.String"; @@ -510,7 +512,10 @@ * addresses:\n", reference.toString()); */ assertNotNull(reference.toString()); - } + assertEquals( + "Reference Class Name: " + reference.getClassName() + "\n", + reference.toString()); + } public void testClone_Simple() { String className = "java.lang.String";