Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D60C7C5A3 for ; Fri, 4 May 2012 14:14:01 +0000 (UTC) Received: (qmail 18302 invoked by uid 500); 4 May 2012 14:14:01 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 18280 invoked by uid 500); 4 May 2012 14:14:01 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 18271 invoked by uid 500); 4 May 2012 14:14:01 -0000 Received: (qmail 18268 invoked by uid 99); 4 May 2012 14:14:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 14:14:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 04 May 2012 14:14:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 683572388B1B; Fri, 4 May 2012 14:13:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333975 - /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java Date: Fri, 04 May 2012 14:13:40 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120504141340.683572388B1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Fri May 4 14:13:39 2012 New Revision: 1333975 URL: http://svn.apache.org/viewvc?rev=1333975&view=rev Log: Fix bean test Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java?rev=1333975&r1=1333974&r2=1333975&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java Fri May 4 14:13:39 2012 @@ -29,11 +29,12 @@ import org.apache.torque.test.Author; import org.apache.torque.test.AuthorPeer; import org.apache.torque.test.Book; import org.apache.torque.test.BookPeer; -import org.apache.torque.util.Criteria; +import org.apache.torque.test.bean.AuthorBean; +import org.apache.torque.test.bean.BookBean; +import org.apache.torque.criteria.Criteria; /** - * Runtime tests to make sure that the code which is supplied - * in the documentation actually works ;-) + * Test generated bean classes. * * @author Thomas Fischer * @version $Id$ @@ -163,7 +164,7 @@ public class BeanTestConditional extends author == book.getAuthor()); AuthorBean authorBean = author.getBean(); - BookBean bookBean = (BookBean) authorBean.getBookBeans().get(0); + BookBean bookBean = authorBean.getBookBeans().get(0); assertTrue("authorBean from BookBean should be the same " + "object as authorBean", bookBean.getAuthorBean() == authorBean); @@ -227,7 +228,7 @@ public class BeanTestConditional extends author != book.getAuthor()); AuthorBean authorBean = author.getBean(); - BookBean bookBean = (BookBean) authorBean.getBookBeans().get(0); + BookBean bookBean = authorBean.getBookBeans().get(0); assertTrue("authorBean from BookBean should not be the same " + "object as authorBean", bookBean.getAuthorBean() != authorBean); @@ -262,11 +263,11 @@ public class BeanTestConditional extends public void testSaves() throws Exception { Criteria criteria = new Criteria(); - criteria.add(BookPeer.BOOK_ID, (Long) null, Criteria.NOT_EQUAL); + criteria.where(BookPeer.BOOK_ID, (Long) null, Criteria.NOT_EQUAL); BookPeer.doDelete(criteria); criteria = new Criteria(); - criteria.add(AuthorPeer.AUTHOR_ID, (Long) null, Criteria.NOT_EQUAL); + criteria.where(AuthorPeer.AUTHOR_ID, (Long) null, Criteria.NOT_EQUAL); AuthorPeer.doDelete(criteria); Author author = new Author(); @@ -310,8 +311,8 @@ public class BeanTestConditional extends author.save(); - List authorList = AuthorPeer.doSelect(new Criteria()); - Author readAuthor = (Author) authorList.get(0); + List authorList = AuthorPeer.doSelect(new Criteria()); + Author readAuthor = authorList.get(0); assertEquals("name from read Author is " + readAuthor.getName() +" but should be " + authorBean.getName(), readAuthor.getName(), @@ -331,7 +332,7 @@ public class BeanTestConditional extends book.setAuthor(author); book.save(); - List bookList = BookPeer.doSelect(new Criteria()); + List bookList = BookPeer.doSelect(new Criteria()); assertTrue("Ther should be one book in DB but there are " + bookList.size(), bookList.size() == 1); --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org