Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C0E9268B for ; Tue, 3 May 2011 11:15:39 +0000 (UTC) Received: (qmail 84656 invoked by uid 500); 3 May 2011 11:15:39 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 84625 invoked by uid 500); 3 May 2011 11:15:39 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 84618 invoked by uid 99); 3 May 2011 11:15:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 11:15:39 +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; Tue, 03 May 2011 11:15:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 80D4023889E2; Tue, 3 May 2011 11:15:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1099009 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOrderingTest.java Date: Tue, 03 May 2011 11:15:18 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110503111518.80D4023889E2@eris.apache.org> Author: aadamchik Date: Tue May 3 11:15:18 2011 New Revision: 1099009 URL: http://svn.apache.org/viewvc?rev=1099009&view=rev Log: CAY-1562 CayenneCase unit tests conversion patches by Dzmitry Kazimirchyk: DataContextOrderingTest Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOrderingTest.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOrderingTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOrderingTest.java?rev=1099009&r1=1099008&r2=1099009&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOrderingTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextOrderingTest.java Tue May 3 11:15:18 2011 @@ -22,26 +22,39 @@ import java.math.BigDecimal; import java.util.Calendar; import java.util.List; +import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.ExpressionFactory; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.query.SortOrder; +import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.testdo.testmap.Painting; -import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.unit.di.server.ServerCase; +import org.apache.cayenne.unit.di.server.UseServerRuntime; -public class DataContextOrderingTest extends CayenneCase { +@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +public class DataContextOrderingTest extends ServerCase { + + @Inject + private DataContext context; + + @Inject + private DBHelper dbHelper; @Override - protected void setUp() throws Exception { - super.setUp(); - deleteTestData(); + protected void setUpAfterInjection() throws Exception { + dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); + dbHelper.deleteAll("ARTIST_EXHIBIT"); + dbHelper.deleteAll("ARTIST_GROUP"); + dbHelper.deleteAll("ARTIST"); } public void testMultipleOrdering() throws Exception { Calendar c = Calendar.getInstance(); - DataContext context = createDataContext(); Artist a1 = context.newObject(Artist.class); a1.setArtistName("2"); a1.setDateOfBirth(c.getTime()); @@ -73,7 +86,6 @@ public class DataContextOrderingTest ext Calendar c = Calendar.getInstance(); - DataContext context = createDataContext(); Artist a1 = context.newObject(Artist.class); a1.setArtistName("2"); a1.setDateOfBirth(c.getTime());