Return-Path: 
 <commits-return-8305-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 48252 invoked from network); 8 Jul 2009 14:44:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 8 Jul 2009 14:44:29 -0000
Received: (qmail 25177 invoked by uid 500); 8 Jul 2009 14:44:39 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 25134 invoked by uid 500); 8 Jul 2009 14:44:38 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 25125 invoked by uid 99); 8 Jul 2009 14:44:38 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2009 14:44:38 +0000
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; Wed, 08 Jul 2009 14:44:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 90FAC2388877; Wed,  8 Jul 2009 14:44:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r792168 - in /jackrabbit/trunk: jackrabbit-core/pom.xml
 jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeReadMethodsTest.java
 jackrabbit-spi2jcr/pom.xml
Date: Wed, 08 Jul 2009 14:44:16 -0000
To: commits@jackrabbit.apache.org
From: reschke@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090708144416.90FAC2388877@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: reschke
Date: Wed Jul  8 14:44:16 2009
New Revision: 792168

URL: http://svn.apache.org/viewvc?rev=792168&view=rev
Log:
JCR-2060: fix tests that used a pattern where only a glob was allowed

Modified:
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeReadMethodsTest.java
    jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=792168&r1=792167&r2=792168&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Wed Jul  8 14:44:16 2009
@@ -91,7 +91,6 @@
               <name>known.issues</name>
               <value>
                 org.apache.jackrabbit.core.xml.DocumentViewTest#testMultiValue
-                org.apache.jackrabbit.test.api.NodeReadMethodsTest#testGetPropertiesNamePatternArray
                 org.apache.jackrabbit.test.api.version.ActivitiesTest#testActivitiesPath
                 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testPropertyDefinitionTemplate
               </value>

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeReadMethodsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeReadMethodsTest.java?rev=792168&r1=792167&r2=792168&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeReadMethodsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeReadMethodsTest.java Wed Jul  8 14:44:16 2009
@@ -501,31 +501,6 @@
                 numExpected2,
                 getSize(nodes2));
 
-
-        // test pattern "nodeName|nodeName"
-        String pattern3 = firstNode.getName() + "|" + firstNode.getName();
-        String assertString3 = "node.getNodes(\"" + pattern3 + "\"): ";
-        // test if the names of the found nodes are matching the pattern
-        NodeIterator nodes3 = node.getNodes(pattern3);
-        while (nodes3.hasNext()) {
-            Node n = nodes3.nextNode();
-            assertEquals(assertString2 + "name comparison failed: ",
-                    firstNode.getName(),
-                    n.getName());
-        }
-        // test if the number of found nodes is correct
-        int numExpected3 = 0;
-        for (int i = 0; i < allNodes.size(); i++) {
-            Node n = (Node) allNodes.get(i);
-            if (n.getName().equals(firstNode.getName())) {
-                numExpected3++;
-            }
-        }
-        assertEquals(assertString3 + "number of nodes found: ",
-                numExpected3,
-                getSize(nodes3));
-
-
         // test pattern "nodeName", "nodeName"
         String pattern4 = firstNode.getName() + "," + firstNode.getName();
         String assertString4 = "node.getNodes(\"" + pattern4 + "\"): ";
@@ -801,30 +776,7 @@
                 numExpected2,
                 getSize(properties2));
 
-
         // test: getProperties("propertyName|propertyName")
-        String pattern3 = firstProperty.getName() + "|" + firstProperty.getName();
-        String assertString3 = "node.getProperties(\"" + pattern3 + "\"): ";
-        // test if the names of the found properties are matching the pattern
-        PropertyIterator properties3 = node.getProperties(new String[] { pattern3 });
-        while (properties3.hasNext()) {
-            Property p = properties3.nextProperty();
-            assertEquals(assertString2 + "name comparison failed: ",
-                    firstProperty.getName(),
-                    p.getName());
-        }
-        // test if the number of found properties is correct
-        int numExpected3 = 0;
-        for (int i = 0; i < allProperties.size(); i++) {
-            Property p = (Property) allProperties.get(i);
-            if (p.getName().equals(firstProperty.getName())) {
-                numExpected3++;
-            }
-        }
-        assertEquals(assertString3 + "number of properties found: ",
-                numExpected3,
-                getSize(properties3));
-
         // test: getProperties("propertyName", "propertyName")
         String pattern4 = firstProperty.getName() + "," + firstProperty.getName();
         String assertString4 = "node.getProperties(\"" + pattern4 + "\"): ";

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml?rev=792168&r1=792167&r2=792168&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml Wed Jul  8 14:44:16 2009
@@ -71,7 +71,6 @@
                 org.apache.jackrabbit.jcr2spi.name.NamespaceRegistryTest#testRegisteredNamespaceVisibility
                 org.apache.jackrabbit.test.api.ShareableNodeTest
                 org.apache.jackrabbit.test.api.version.simple
-                org.apache.jackrabbit.test.api.NodeReadMethodsTest#testGetPropertiesNamePatternArray
                 org.apache.jackrabbit.test.api.version.ActivitiesTest
                 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testPropertyDefinitionTemplate
               </value>