From jdo-commits-return-1211-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Sun Jan 01 21:55:20 2006 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 39896 invoked from network); 1 Jan 2006 21:55:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Jan 2006 21:55:20 -0000 Received: (qmail 83939 invoked by uid 500); 1 Jan 2006 21:55:19 -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 83928 invoked by uid 99); 1 Jan 2006 21:55:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jan 2006 13:55:19 -0800 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; Sun, 01 Jan 2006 13:55:18 -0800 Received: (qmail 39788 invoked by uid 65534); 1 Jan 2006 21:54:58 -0000 Message-ID: <20060101215458.39787.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r360562 - /db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Date: Sun, 01 Jan 2006 21:54:58 -0000 To: jdo-commits@db.apache.org From: clr@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: clr Date: Sun Jan 1 13:54:56 2006 New Revision: 360562 URL: http://svn.apache.org/viewcvs?rev=360562&view=rev Log: JDO-248 changed Map query to use id and last name instead of phoneNumbers Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java?rev=360562&r1=360561&r2=360562&view=diff ============================================================================== --- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java (original) +++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java Sun Jan 1 13:54:56 2006 @@ -122,7 +122,7 @@ // Map new QueryElementHolder( /*UNIQUE*/ null, - /*RESULT*/ "phoneNumbers", + /*RESULT*/ "personid AS id, lastname AS name", /*INTO*/ Map.class, /*FROM*/ FullTimeEmployee.class, /*EXCLUDE*/ null, @@ -320,15 +320,15 @@ // Two dimensional arrays to be converted to maps // in the expected result. - private static Object[][] phoneNumbers1 = - {{"home", "1111"}, - {"work", "123456-1"}}; - private static Object[][] phoneNumbers2 = - {{"home", "2222"}, - {"work", "123456-2"}}; - private static Object[][] phoneNumbers5 = - {{"home", "3363"}, - {"work", "126456-3"}}; + private static Object[][] emp1Map = + {{"id", new Long(1)}, + {"name", "emp1Last"}}; + private static Object[][] emp2Map = + {{"id", new Long(2)}, + {"name", "emp2Last"}}; + private static Object[][] emp5Map = + {{"id", new Long(5)}, + {"name", "emp5Last"}}; private static Object[][] publicPutMethod1 = {{"personid", new Long(1)}, {"lastname", "emp1Last"}}; private static Object[][] publicPutMethod2 = @@ -355,9 +355,9 @@ CompanyModelReader.stringToUtilDate("15/Aug/1998")}), // Map Arrays.asList(new Object[]{ - ConversionHelper.arrayToMap(phoneNumbers1), - ConversionHelper.arrayToMap(phoneNumbers2), - ConversionHelper.arrayToMap(phoneNumbers5)}), + ConversionHelper.arrayToMap(emp1Map), + ConversionHelper.arrayToMap(emp2Map), + ConversionHelper.arrayToMap(emp5Map)}), // user defined result class Arrays.asList(new Object[]{ new LongString(1, "emp1Last"),