Index: test/java/org/apache/jdo/tck/query/result/DistintCandidateInstances.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/DistintCandidateInstances.java	(Revision 348978)
+++ test/java/org/apache/jdo/tck/query/result/DistintCandidateInstances.java	(Arbeitskopie)
@@ -1,149 +0,0 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at 
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License.
- */
-
-package org.apache.jdo.tck.query.result;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.jdo.Query;
-
-import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.pc.company.CompanyModelReader;
-import org.apache.jdo.tck.pc.company.Employee;
-import org.apache.jdo.tck.pc.company.Person;
-import org.apache.jdo.tck.query.QueryElementHolder;
-import org.apache.jdo.tck.query.QueryTest;
-import org.apache.jdo.tck.util.BatchTestRunner;
-
-/**
- *<B>Title:</B> Disctinct Query.
- *<BR>
- *<B>Keywords:</B> query
- *<BR>
- *<B>Assertion ID:</B> A14.6.9-2.
- *<BR>
- *<B>Assertion Description: </B>
- * Queries against an extent always consider only distinct candidate instances,
- * regardless of whether distinct is specified. 
- * Queries against a collection might contain duplicate candidate instances; 
- * the distinct keyword removes duplicates from the candidate collection 
- * in this case.
- */
-public class DistintCandidateInstances extends QueryTest {
-
-    /** */
-    private static final String ASSERTION_FAILED = 
-        "Assertion A14.6.9-2 (DistintCandidateInstances) failed: ";
-    
-    /** 
-     * The array of valid queries which may be executed as 
-     * single string queries and as API queries.
-     */
-    private static final QueryElementHolder[] VALID_QUERIES = {
-        new QueryElementHolder(
-        /*UNIQUE*/      null,
-        /*RESULT*/      null,
-        /*INTO*/        null, 
-        /*FROM*/        Employee.class,
-        /*EXCLUDE*/     null,
-        /*WHERE*/       null,
-        /*VARIABLES*/   "Project project",
-        /*PARAMETERS*/  null,
-        /*IMPORTS*/     null,
-        /*GROUP BY*/    null,
-        /*ORDER BY*/    null,
-        /*FROM*/        null,
-        /*TO*/          null),
-        new QueryElementHolder(
-        /*UNIQUE*/      null,
-        /*RESULT*/      "DISTINCT",
-        /*INTO*/        null, 
-        /*FROM*/        Employee.class,
-        /*EXCLUDE*/     null,
-        /*WHERE*/       null,
-        /*VARIABLES*/   "Project project",
-        /*PARAMETERS*/  null,
-        /*IMPORTS*/     null,
-        /*GROUP BY*/    null,
-        /*ORDER BY*/    null,
-        /*FROM*/        null,
-        /*TO*/          null)
-    };
-    
-    /** 
-     * The expected results of valid queries.
-     */
-    private Object[] expectedResult = {
-        addAll(getCompanyModelInstancesAsList(new String[]{
-                "emp1", "emp2", "emp3", "emp4", "emp5"}),
-               getCompanyModelInstancesAsList(new String[]{
-                "emp1", "emp2", "emp3", "emp4", "emp5"})),
-        getCompanyModelInstancesAsList(new String[]{
-                "emp1", "emp2", "emp3", "emp4", "emp5"})
-    };
-            
-    /**
-     * The <code>main</code> is called when the class
-     * is directly executed from the command line.
-     * @param args The arguments passed to the program.
-     */
-    public static void main(String[] args) {
-        BatchTestRunner.run(DistintCandidateInstances.class);
-    }
-    
-    /** */
-    public void testExtentQueries() {
-        if (isUnconstrainedVariablesSupported()) {
-            for (int i = 0; i < VALID_QUERIES.length; i++) {
-                executeAPIQuery(ASSERTION_FAILED, VALID_QUERIES[i], 
-                        expectedResult[i]);
-                executeSingleStringQuery(ASSERTION_FAILED, VALID_QUERIES[i], 
-                        expectedResult[i]);
-            }
-        }
-    }
-     
-    /** */
-    public void testCollectionQueries() {
-        String singleStringQuery = "SELECT FROM " + Person.class.getName();
-        String singleStringDistinctQuery = 
-            "SELECT DISTNICT FROM " + Person.class.getName();
-        
-        Query query = getPM().newQuery();
-        query.setClass(Person.class);
-        query.setCandidates((Collection)expectedResult[0]);
-        executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery, 
-                false, null, expectedResult[0], true);
-        
-        query.setResult("DISTINCT");
-        executeJDOQuery(ASSERTION_FAILED, query, singleStringDistinctQuery, 
-                false, null, expectedResult[1], true);
-    }
-
-    /**
-     * @see JDO_Test#localSetUp()
-     */
-    protected void localSetUp() {
-        loadCompanyModel(getPM(), COMPANY_TESTDATA);
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
-    }
-    
-    private List addAll(List list1, List list2) {
-        list1.addAll(list2);
-        return list1;
-    }
-}
Index: test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java	(Revision 348978)
+++ test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java	(Arbeitskopie)
@@ -43,7 +43,7 @@
  * the distinct keyword removes duplicates from the candidate collection 
  * in this case.
  */
-public class DistintCandidateInstances extends QueryTest {
+public class DistinctCandidateInstances extends QueryTest {
 
     /** */
     private static final String ASSERTION_FAILED = 
@@ -102,7 +102,7 @@
      * @param args The arguments passed to the program.
      */
     public static void main(String[] args) {
-        BatchTestRunner.run(DistintCandidateInstances.class);
+        BatchTestRunner.run(DistinctCandidateInstances.class);
     }
     
     /** */
@@ -121,7 +121,7 @@
     public void testCollectionQueries() {
         String singleStringQuery = "SELECT FROM " + Person.class.getName();
         String singleStringDistinctQuery = 
-            "SELECT DISTNICT FROM " + Person.class.getName();
+            "SELECT DISTINCT FROM " + Person.class.getName();
         
         Query query = getPM().newQuery();
         query.setClass(Person.class);
Index: test/conf/alltests.conf
===================================================================
--- test/conf/alltests.conf	(Revision 348978)
+++ test/conf/alltests.conf	(Arbeitskopie)
@@ -379,7 +379,7 @@
 org.apache.jdo.tck.query.result.AggregateResult \
 org.apache.jdo.tck.query.result.DefaultResult \
 org.apache.jdo.tck.query.result.DefaultUnique \
-org.apache.jdo.tck.query.result.DistintCandidateInstances \
+org.apache.jdo.tck.query.result.DistinctCandidateInstances \
 org.apache.jdo.tck.query.result.DistinctQuery \
 org.apache.jdo.tck.query.result.Grouping \
 org.apache.jdo.tck.query.result.Having \