Author: bcarothers Date: 2010-01-09 06:58:01 -0500 (Sat, 09 Jan 2010) New Revision: 1566 Removed: trunk/dna-jcr-tck/src/test/resources/repositoryForTckTests.xml Modified: trunk/dna-jcr-tck/pom.xml trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170LevelOneTckTest.java trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170OptionalSqlQueryTckTest.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrTckTest.java Log: DNA-639 JcrTckTest Missing Two Test Cases Applied patch that updates the tests in JcrTckTest (and comments them out as they don't pass yet) and cleans up dna-jcr-tck, which had some misclassified test cases and some out-of-date dependencies, Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrTckTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrTckTest.java 2010-01-08 17:31:57 UTC (rev 1565) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrTckTest.java 2010-01-09 11:58:01 UTC (rev 1566) @@ -174,7 +174,7 @@ addTestSuite(org.apache.jackrabbit.test.api.ExportDocViewTest.class); addTestSuite(org.apache.jackrabbit.test.api.RepositoryLoginTest.class); - // These might not all be level one tests + // addTestSuite(org.apache.jackrabbit.test.api.query.ElementTest.class); addTestSuite(org.apache.jackrabbit.test.api.query.XPathPosIndexTest.class); // addTestSuite(org.apache.jackrabbit.test.api.query.XPathDocOrderTest.class); addTestSuite(org.apache.jackrabbit.test.api.query.XPathOrderByTest.class); @@ -269,6 +269,7 @@ addTestSuite(SerializationTest.class); addTestSuite(ValueFactoryTest.class); + // addTestSuite(XPathQueryLevel2Test.class); } } Modified: trunk/dna-jcr-tck/pom.xml =================================================================== --- trunk/dna-jcr-tck/pom.xml 2010-01-08 17:31:57 UTC (rev 1565) +++ trunk/dna-jcr-tck/pom.xml 2010-01-09 11:58:01 UTC (rev 1566) @@ -18,44 +18,50 @@ defined in the dependencyManagement section of the parent pom. --> <dependencies> - <dependency> - <groupId>org.jboss.dna</groupId> - <artifactId>dna-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.dna</groupId> - <artifactId>dna-common</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.dna</groupId> - <artifactId>dna-graph</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.dna</groupId> - <artifactId>dna-graph</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.dna</groupId> - <artifactId>dna-repository</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.dna</groupId> - <artifactId>dna-jcr</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.dna</groupId> - <artifactId>dna-jcr</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> + <artifactId>dna-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> + <artifactId>dna-classloader-maven</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> + <artifactId>dna-repository</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> + <artifactId>dna-jcr</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> + <artifactId>dna-sequencer-ddl</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- + Testing (note the scope) + --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> + <artifactId>dna-common</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.dna</groupId> + <artifactId>dna-jcr</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <!-- Testing (note the scope) --> @@ -81,19 +87,14 @@ <artifactId>log4j</artifactId> <scope>test</scope> </dependency> + <!-- - Java Concurrency in Practice annotations - --> - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - </dependency> - <!-- Java Content Repository API --> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> + <scope>test</scope> </dependency> <!-- Apache JCR API unit tests (for any JCR implementation), which is a subset of the official TCK @@ -101,13 +102,11 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-tests</artifactId> + <scope>test</scope> </dependency> - <dependency> - <groupId>com.google.code.google-collections</groupId> - <artifactId>google-collect</artifactId> - <version>snapshot-20080530</version> - </dependency> - + <!-- + ID Trust (JAAS Dependency) + --> <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-idtrust</artifactId> @@ -115,27 +114,32 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi-bare</artifactId> - <version>2.0.2.SP6</version> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi-bare</artifactId> + <version>2.0.2.SP6</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx-bare</artifactId> - <version>2.0.2.SP6</version> - <exclusions> - <exclusion> - <groupId>apache-xalan</groupId> - <artifactId>xalan</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xalan</groupId> - <artifactId>serializer</artifactId> - </exclusion> - </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-bare</artifactId> + <version>2.0.2.SP6</version> <scope>test</scope> - </dependency> + <exclusions> + <exclusion> + <groupId>apache-xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xalan</groupId> + <artifactId>serializer</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170LevelOneTckTest.java =================================================================== --- trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170LevelOneTckTest.java 2010-01-08 17:31:57 UTC (rev 1565) +++ trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170LevelOneTckTest.java 2010-01-09 11:58:01 UTC (rev 1566) @@ -99,11 +99,6 @@ addTestSuite(org.apache.jackrabbit.test.api.query.XPathJcrPathTest.class); addTestSuite(org.apache.jackrabbit.test.api.query.ElementTest.class); - addTestSuite(org.apache.jackrabbit.test.api.query.OrderByDateTest.class); - addTestSuite(org.apache.jackrabbit.test.api.query.OrderByDoubleTest.class); - addTestSuite(org.apache.jackrabbit.test.api.query.OrderByLongTest.class); - addTestSuite(org.apache.jackrabbit.test.api.query.OrderByMultiTypeTest.class); - addTestSuite(org.apache.jackrabbit.test.api.query.OrderByStringTest.class); addTestSuite(org.apache.jackrabbit.test.api.query.QueryResultNodeIteratorTest.class); addTestSuite(org.apache.jackrabbit.test.api.query.XPathDocOrderTest.class); addTestSuite(org.apache.jackrabbit.test.api.query.XPathJcrPathTest.class); Modified: trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170OptionalSqlQueryTckTest.java =================================================================== --- trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170OptionalSqlQueryTckTest.java 2010-01-08 17:31:57 UTC (rev 1565) +++ trunk/dna-jcr-tck/src/test/java/org/jboss/dna/jcr/Jsr170OptionalSqlQueryTckTest.java 2010-01-09 11:58:01 UTC (rev 1566) @@ -65,6 +65,12 @@ protected OptionalSqlQueryFeatureTests() { super("JCR Optional Feature (JCR-SQL Query) Tests"); + addTestSuite(org.apache.jackrabbit.test.api.query.OrderByDateTest.class); + addTestSuite(org.apache.jackrabbit.test.api.query.OrderByDoubleTest.class); + addTestSuite(org.apache.jackrabbit.test.api.query.OrderByLongTest.class); + addTestSuite(org.apache.jackrabbit.test.api.query.OrderByMultiTypeTest.class); + addTestSuite(org.apache.jackrabbit.test.api.query.OrderByStringTest.class); + addTestSuite(SQLOrderByTest.class); addTestSuite(SQLQueryLevel2Test.class); addTestSuite(SQLJoinTest.class); Deleted: trunk/dna-jcr-tck/src/test/resources/repositoryForTckTests.xml =================================================================== --- trunk/dna-jcr-tck/src/test/resources/repositoryForTckTests.xml 2010-01-08 17:31:57 UTC (rev 1565) +++ trunk/dna-jcr-tck/src/test/resources/repositoryForTckTests.xml 2010-01-09 11:58:01 UTC (rev 1566) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ JBoss DNA (http://www.jboss.org/dna) - ~ - ~ See the COPYRIGHT.txt file distributed with this work for information - ~ regarding copyright ownership. Some portions may be licensed - ~ to Red Hat, Inc. under one or more contributor license agreements. - ~ See the AUTHORS.txt file in the distribution for a full listing of - ~ individual contributors. - ~ - ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA - ~ is licensed to you under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ JBoss DNA is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - ~ for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public License - ~ along with this distribution; if not, write to: - ~ Free Software Foundation, Inc. - ~ 51 Franklin Street, Fifth Floor - ~ Boston, MA 02110-1301 USA - --> -<testroot xmlns:jcr="http://www.jcp.org/jcr/1.0" - xmlns:nt="http://www.jcp.org/jcr/nt/1.0" - xmlns:dna="http://www.jboss.org/dna/1.0" - jcr:primaryType="nt:unstructured"> - <nt:unstructured jcr:name="node1" prop1="&lt;foo&amp;foo&gt;" > - <!-- - This stanza checks for the jcr:xmltext special case for export as per JCR 1.0.1 section 6.4.2.3 - --> - <nt:unstructured jcr:name="jcr:xmltext" jcr:xmlcharacters="This is my &quot;XML&quot; text!" /> - </nt:unstructured> - <nt:unstructured jcr:name="node2 has a multi-word name" multi-valued-property="bar baz blah"> - <!-- - This stanza checks that consecutive jcr:xmltext elements will be merged in the export as - per JCR 1.0.1 section 6.4.2.3 - --> - <nt:unstructured jcr:name="jcr:xmltext" jcr:xmlcharacters="This is my &quot;XML&quot; text!" /> - <nt:unstructured jcr:name="jcr:xmltext" jcr:xmlcharacters="This is my &quot;other&quot; text!" /> - </nt:unstructured> - <!-- - Test of unprintable character exports. - Cannot test \r character here on Windows as TCK XML Parser will replace it with \n and fail the comparison - --> - <nt:unstructured jcr:name="node3" multi-line-property="Line&#009;1&#010;Line 2"/> - - <!-- Helps test date property conversion, mandatory properties (jcr:content), and primary items --> - <!-- - <nt:folder jcr:name="hierarchyRoot" jcr:created="+2009-03-15T12:30:00.000Z"> - <nt:file jcr:name="testFile" jcr:created="+2009-03-15T13:30:00.000Z"> - <nt:unstructured jcr:name="jcr:content" /> - </nt:file> - </nt:folder> - --> -</testroot> \ No newline at end of file