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 EEA48DFEE for ; Thu, 16 Aug 2012 12:24:30 +0000 (UTC) Received: (qmail 35730 invoked by uid 500); 16 Aug 2012 12:24:30 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 35627 invoked by uid 500); 16 Aug 2012 12:24:29 -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 35571 invoked by uid 500); 16 Aug 2012 12:24:27 -0000 Received: (qmail 35556 invoked by uid 99); 16 Aug 2012 12:24:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2012 12:24:27 +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; Thu, 16 Aug 2012 12:24:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9F716238890D; Thu, 16 Aug 2012 12:23:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1373799 - /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java Date: Thu, 16 Aug 2012 12:23:40 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120816122340.9F716238890D@eris.apache.org> Author: tfischer Date: Thu Aug 16 12:23:40 2012 New Revision: 1373799 URL: http://svn.apache.org/viewvc?rev=1373799&view=rev Log: TORQUE-220 only old style criteria uses guessing of table name for doDelete() Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java?rev=1373799&r1=1373798&r2=1373799&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java Thu Aug 16 12:23:40 2012 @@ -1,7 +1,7 @@ package org.apache.torque.util; import org.apache.torque.BaseDatabaseTestCase; -import org.apache.torque.criteria.Criteria; +import org.apache.torque.util.Criteria; import org.apache.torque.test.BookPeer; /** @@ -11,15 +11,15 @@ import org.apache.torque.test.BookPeer; */ public class BasePeerTest extends BaseDatabaseTestCase { - private CountHelper countHelper = new CountHelper(); + private final CountHelper countHelper = new CountHelper(); - public void OFFtestDeleteGuessTableNameFromCriterion() throws Exception + public void testDeleteGuessTableNameFromCriterion() throws Exception { // prepare cleanBookstore(); insertBookstoreData(); Criteria criteria = new Criteria(BookPeer.DATABASE_NAME); - criteria.where(BookPeer.TITLE, "Book 1 - Author 1"); + criteria.add(BookPeer.TITLE, "Book 1 - Author 1"); // execute int deleted = BasePeer.doDelete(criteria); @@ -28,7 +28,7 @@ public class BasePeerTest extends BaseDa assertEquals(1, deleted); assertEquals(99, countHelper.count(BookPeer.getTableMap())); criteria = new Criteria(); - criteria.where(BookPeer.TITLE, "Book 1 - Author 1"); + criteria.add(BookPeer.TITLE, "Book 1 - Author 1"); assertEquals(0, countHelper.count(criteria)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org