Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECAB9102E4 for ; Fri, 28 Jun 2013 15:17:31 +0000 (UTC) Received: (qmail 2254 invoked by uid 500); 28 Jun 2013 15:17:31 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 2205 invoked by uid 500); 28 Jun 2013 15:17:26 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 2198 invoked by uid 99); 28 Jun 2013 15:17:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 15:17:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 28 Jun 2013 15:17:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 191342388847; Fri, 28 Jun 2013 15:16:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1497808 - in /jackrabbit/trunk/jackrabbit-core/src/test: java/org/apache/jackrabbit/core/nodetype/xml/ resources/org/apache/jackrabbit/core/nodetype/xml/ Date: Fri, 28 Jun 2013 15:16:57 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130628151658.191342388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Fri Jun 28 15:16:57 2013 New Revision: 1497808 URL: http://svn.apache.org/r1497808 Log: JCR-3616: unit tests should use valid namespace names Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_cnd_nodetypes.cnd jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java?rev=1497808&r1=1497807&r2=1497808&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java Fri Jun 28 15:16:57 2013 @@ -248,7 +248,7 @@ public class TestAll extends AbstractJCR /** Test for namespace registration on node type import. */ public void testImportXMLNodeTypes() throws Exception { try { - superuser.getNamespacePrefix("test-namespace2"); + superuser.getNamespacePrefix("http://ns.example.org/test-namespace2"); // Ignore test case, node type and namespace already registered } catch (NamespaceException e1) { // Namespace testns2 not yet registered @@ -258,7 +258,7 @@ public class TestAll extends AbstractJCR TestAll.class.getResourceAsStream(TEST_NS_XML_NODETYPES), JackrabbitNodeTypeManager.TEXT_XML); try { - superuser.getNamespacePrefix("test-namespace2"); + superuser.getNamespacePrefix("http://ns.example.org/test-namespace2"); } catch (NamespaceException e2) { fail("xml test2 namespace not registered"); } @@ -286,14 +286,14 @@ public class TestAll extends AbstractJCR /** Test for namespace registration on node type import. */ public void testImportCNDNodeTypes() throws Exception { try { - superuser.getNamespacePrefix("test-namespace3"); + superuser.getNamespacePrefix("http://ns.example.org/test-namespace3"); // Ignore test case, node type and namespace already registered } catch (NamespaceException e1) { Reader cnd = new InputStreamReader(TestAll.class.getResourceAsStream(TEST_NS_CND_NODETYPES)); CndImporter.registerNodeTypes(cnd, superuser); cnd.close(); try { - superuser.getNamespacePrefix("test-namespace3"); + superuser.getNamespacePrefix("http://ns.example.org/test-namespace3"); } catch (NamespaceException e2) { fail("cnd test3 namespace not registered"); } Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd?rev=1497808&r1=1497807&r2=1497808&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd Fri Jun 28 15:16:57 2013 @@ -15,8 +15,8 @@ * limitations under the License. */ - - + + [testns3:emptyNodeType] > nt:base Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml?rev=1497808&r1=1497807&r2=1497808&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml Fri Jun 28 15:16:57 2013 @@ -17,8 +17,8 @@ * limitations under the License. */ --> - + [testns6:sameNodeType] > nt:base Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml?rev=1497808&r1=1497807&r2=1497808&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_same_nt_name_xml_nodetypes.xml Fri Jun 28 15:16:57 2013 @@ -17,7 +17,7 @@ * limitations under the License. */ --> -