Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 32673 invoked from network); 2 Nov 2007 15:50:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2007 15:50:38 -0000 Received: (qmail 25081 invoked by uid 500); 2 Nov 2007 15:50:26 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 25035 invoked by uid 500); 2 Nov 2007 15:50: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 25026 invoked by uid 99); 2 Nov 2007 15:50:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 08:50:26 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 15:50:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 05CED1A9832; Fri, 2 Nov 2007 08:50:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r591371 - in /jackrabbit/trunk/jackrabbit-core/src/test: java/org/apache/jackrabbit/core/integration/ java/org/apache/jackrabbit/core/query/ repository/repository/ resources/org/apache/jackrabbit/core/integration/ Date: Fri, 02 Nov 2007 15:50:14 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071102155015.05CED1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Fri Nov 2 08:50:12 2007 New Revision: 591371 URL: http://svn.apache.org/viewvc?rev=591371&view=rev Log: JCR-1203: Reorganize core test suite - Initialize test namespaces and node types using the proper APIs Added: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/integration/ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/integration/test-nodetypes.xml - copied, changed from r591253, jackrabbit/trunk/jackrabbit-core/src/test/repository/repository/nodetypes/custom_nodetypes.xml Removed: jackrabbit/trunk/jackrabbit-core/src/test/repository/repository/ Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/PrepareTestRepository.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/MixinTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/PrepareTestRepository.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/PrepareTestRepository.java?rev=591371&r1=591370&r2=591371&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/PrepareTestRepository.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/PrepareTestRepository.java Fri Nov 2 08:50:12 2007 @@ -18,6 +18,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Calendar; import javax.jcr.Node; @@ -27,6 +28,7 @@ import javax.jcr.Value; import javax.jcr.ValueFactory; +import org.apache.jackrabbit.api.JackrabbitNodeTypeManager; import org.apache.jackrabbit.test.AbstractJCRTest; /** @@ -40,6 +42,15 @@ public void testPrepareTestRepository() throws RepositoryException, IOException { + InputStream xml = getClass().getResourceAsStream("test-nodetypes.xml"); + try { + JackrabbitNodeTypeManager manager = (JackrabbitNodeTypeManager) + superuser.getWorkspace().getNodeTypeManager(); + manager.registerNodeTypes(xml, JackrabbitNodeTypeManager.TEXT_XML); + } finally { + xml.close(); + } + Node data = getOrAddNode(superuser.getRootNode(), "testdata"); addPropertyTestData(getOrAddNode(data, "property")); addQueryTestData(getOrAddNode(data, "query")); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/MixinTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/MixinTest.java?rev=591371&r1=591370&r2=591371&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/MixinTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/MixinTest.java Fri Nov 2 08:50:12 2007 @@ -16,8 +16,13 @@ */ package org.apache.jackrabbit.core.query; +import javax.jcr.NamespaceException; +import javax.jcr.NamespaceRegistry; import javax.jcr.RepositoryException; import javax.jcr.Node; + +import org.apache.jackrabbit.api.JackrabbitNodeTypeManager; + import java.io.ByteArrayInputStream; import java.util.Calendar; @@ -25,6 +30,21 @@ * Tests if mixin types are queried correctly when using element test: element() */ public class MixinTest extends AbstractQueryTest { + + protected void setUp() throws Exception { + super.setUp(); + + JackrabbitNodeTypeManager manager = (JackrabbitNodeTypeManager) + superuser.getWorkspace().getNodeTypeManager(); + if (!manager.hasNodeType("test:referenceable")) { + String cnd = + "\n" + + "[test:referenceable] > mix:referenceable mixin"; + manager.registerNodeTypes( + new ByteArrayInputStream(cnd.getBytes()), + JackrabbitNodeTypeManager.TEXT_X_JCR_CND); + } + } public void testBuiltInMixin() throws RepositoryException { // nt:resoure is referenceable by its node type definition Copied: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/integration/test-nodetypes.xml (from r591253, jackrabbit/trunk/jackrabbit-core/src/test/repository/repository/nodetypes/custom_nodetypes.xml) URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/integration/test-nodetypes.xml?p2=jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/integration/test-nodetypes.xml&p1=jackrabbit/trunk/jackrabbit-core/src/test/repository/repository/nodetypes/custom_nodetypes.xml&r1=591253&r2=591371&rev=591371&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/repository/repository/nodetypes/custom_nodetypes.xml (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/integration/test-nodetypes.xml Fri Nov 2 08:50:12 2007 @@ -242,16 +242,4 @@ - - - - - - - - - - mix:referenceable - -