From jackrabbit-commits-return-418-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org Tue Mar 01 13:25:59 2005 Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 3365 invoked from network); 1 Mar 2005 13:25:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 1 Mar 2005 13:25:59 -0000 Received: (qmail 59556 invoked by uid 500); 1 Mar 2005 13:25:58 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 59496 invoked by uid 500); 1 Mar 2005 13:25:58 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 59468 invoked by uid 99); 1 Mar 2005 13:25:58 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 01 Mar 2005 05:25:58 -0800 Received: (qmail 3340 invoked by uid 65534); 1 Mar 2005 13:25:56 -0000 Message-ID: <20050301132556.3336.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 01 Mar 2005 13:25:56 -0000 Subject: svn commit: r155774 - incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/NamespaceRemappingTest.java To: jackrabbit-cvs@incubator.apache.org From: mreutegg@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: mreutegg Date: Tue Mar 1 05:25:54 2005 New Revision: 155774 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155774 Log: Enhance NamespaceRemappingTest. Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/Name= spaceRemappingTest.java Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/NamespaceRemappingTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/NamespaceRemappingTest.java?view=3Ddiff&r1=3D155= 773&r2=3D155774 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/Name= spaceRemappingTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/Name= spaceRemappingTest.java Tue Mar 1 05:25:54 2005 @@ -22,6 +22,8 @@ import javax.jcr.NamespaceRegistry; import javax.jcr.RepositoryException; import javax.jcr.NamespaceException; +import javax.jcr.Property; +import javax.jcr.nodetype.NodeType; import java.util.Set; import java.util.HashSet; import java.util.Arrays; @@ -71,12 +73,25 @@ * returns the property with the correct primaryType value. */ public void testNamespaceRemapping() throws RepositoryException { + Property primaryTypeProp =3D session.getRootNode().getProperty(jcr= PrimaryType); + NodeType ntBaseType =3D session.getWorkspace().getNodeTypeManager(= )=2EgetNodeType(ntBase); + // find an unused prefix - String testPrefix =3D getUnusedPrefix(); + String jcrPrefix =3D getUnusedPrefix(); // remap jcr prefix - session.setNamespacePrefix(testPrefix, NS_JCR_URI); + session.setNamespacePrefix(jcrPrefix, NS_JCR_URI); + // find an unused prefix + String ntPrefix =3D getUnusedPrefix(); + // remap nt prefix + session.setNamespacePrefix(ntPrefix, NS_NT_URI); + + assertTrue("Unable to retrieve property with new namespace prefix.= ", + session.getRootNode().getProperty(jcrPrefix + ":primaryTyp= e").isSame(primaryTypeProp)); + + assertEquals("NodeType name does not use new namespace prefix.", + ntBaseType.getName(), ntPrefix + ":base"); =20 - String propval =3D session.getRootNode().getProperty(testPrefix + = ":primaryType").getString(); + String propval =3D session.getRootNode().getProperty(jcrPrefix + "= :primaryType").getString(); String primaryType =3D session.getRootNode().getPrimaryNodeType().= getName(); assertEquals("Remapping of jcr prefix failed", primaryType, propva= l); } @@ -165,7 +180,7 @@ */ private String getUnusedPrefix() throws RepositoryException { Set prefixes =3D new HashSet(); - prefixes.addAll(Arrays.asList(nsr.getPrefixes())); + prefixes.addAll(Arrays.asList(session.getNamespacePrefixes())); String prefix =3D "myapp"; int count =3D 0; while (prefixes.contains(prefix + count)) {