Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 56534 invoked from network); 29 Nov 2005 10:54:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Nov 2005 10:54:09 -0000 Received: (qmail 97658 invoked by uid 500); 29 Nov 2005 10:54:07 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 97647 invoked by uid 99); 29 Nov 2005 10:54:07 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 29 Nov 2005 02:54:07 -0800 Received: (qmail 56205 invoked by uid 65534); 29 Nov 2005 10:53:47 -0000 Message-ID: <20051129105347.56202.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349704 - /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Date: Tue, 29 Nov 2005 10:53:46 -0000 To: jdo-commits@db.apache.org From: brazil@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brazil Date: Tue Nov 29 02:53:43 2005 New Revision: 349704 URL: http://svn.apache.org/viewcvs?rev=349704&view=rev Log: JDO-224: Adapt ResultClassRequirements to new wording in spec concerning assertion A14.6.12-1. Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java?rev=349704&r1=349703&r2=349704&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Tue Nov 29 02:53:43 2005 @@ -161,6 +161,22 @@ /*WHERE*/ null, /*VARIABLES*/ null, /*PARAMETERS*/ null, + /*IMPORTS*/ "import org.apache.jdo.tck.query.result.classes.LongString;", + /*GROUP BY*/ null, + /*ORDER BY*/ null, + /*FROM*/ null, + /*TO*/ null), + + // constructor without constructor call + new QueryElementHolder( + /*UNIQUE*/ null, + /*RESULT*/ "personid, lastname", + /*INTO*/ LongString.class, + /*FROM*/ FullTimeEmployee.class, + /*EXCLUDE*/ null, + /*WHERE*/ null, + /*VARIABLES*/ null, + /*PARAMETERS*/ null, /*IMPORTS*/ null, /*GROUP BY*/ null, /*ORDER BY*/ null, @@ -205,22 +221,6 @@ * single string queries and as API queries. */ private static final QueryElementHolder[] INVALID_QUERIES = { - // TCK class, invalid property - new QueryElementHolder( - /*UNIQUE*/ null, - /*RESULT*/ "personid, lastname", - /*INTO*/ LongString.class, - /*FROM*/ FullTimeEmployee.class, - /*EXCLUDE*/ null, - /*WHERE*/ null, - /*VARIABLES*/ null, - /*PARAMETERS*/ null, - /*IMPORTS*/ null, - /*GROUP BY*/ null, - /*ORDER BY*/ null, - /*FROM*/ null, - /*TO*/ null), - // JDK class new QueryElementHolder( /*UNIQUE*/ null, @@ -279,7 +279,7 @@ /*WHERE*/ null, /*VARIABLES*/ null, /*PARAMETERS*/ null, - /*IMPORTS*/ null, + /*IMPORTS*/ "import org.apache.jdo.tck.query.result.classes.LongString;", /*GROUP BY*/ null, /*ORDER BY*/ null, /*FROM*/ null, @@ -368,6 +368,11 @@ new LongString(1, "emp1Last"), new LongString(2, "emp2Last"), new LongString(5, "emp5Last")}), + // constructor without constructor call + Arrays.asList(new Object[]{ + new LongString(1, "emp1Last"), + new LongString(2, "emp2Last"), + new LongString(5, "emp5Last")}), // public fields Arrays.asList(new Object[]{ new PublicLongField(1), @@ -429,17 +434,19 @@ public void testConstructor() { int index = 6; executeQuery(index); + index++; + executeQuery(index); } /** */ public void testFields() { - int index = 7; + int index = 8; executeQuery(index); } /** */ public void testPut() { - int index = 8; + int index = 9; executeQuery(index); }