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 866BC3107 for ; Mon, 2 May 2011 19:12:29 +0000 (UTC) Received: (qmail 39969 invoked by uid 500); 2 May 2011 19:12:29 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 39940 invoked by uid 500); 2 May 2011 19:12:29 -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 39933 invoked by uid 99); 2 May 2011 19:12:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 19:12:29 +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; Mon, 02 May 2011 19:12:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F08D523889C5; Mon, 2 May 2011 19:12:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098746 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java Date: Mon, 02 May 2011 19:12:07 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110502191207.F08D523889C5@eris.apache.org> Author: aadamchik Date: Mon May 2 19:12:07 2011 New Revision: 1098746 URL: http://svn.apache.org/viewvc?rev=1098746&view=rev Log: CAY-1562 CayenneCase unit tests conversion patches by Dzmitry Kazimirchyk: CompoundPkChangeTest Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java?rev=1098746&r1=1098745&r2=1098746&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CompoundPkChangeTest.java Mon May 2 19:12:07 2011 @@ -19,11 +19,15 @@ package org.apache.cayenne; import org.apache.cayenne.access.DataContext; +import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.ObjectIdQuery; +import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.testdo.testmap.CompoundPkTestEntity; -import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.unit.di.server.ServerCase; +import org.apache.cayenne.unit.di.server.UseServerRuntime; -public class CompoundPkChangeTest extends CayenneCase { +@UseServerRuntime(ServerCase.TESTMAP_PROJECT) +public class CompoundPkChangeTest extends ServerCase { private static final String key1v1 = "-key1-v1-"; private static final String key2v1 = "-key2-v1-"; @@ -32,14 +36,19 @@ public class CompoundPkChangeTest extend private static final String key1v3 = "-key1-v3-"; private static final String key2v3 = "-key2-v3-"; + @Inject + private DataContext context; + + @Inject + private DBHelper dbHelper; + @Override - protected void setUp() throws Exception { - super.setUp(); - deleteTestData(); + protected void setUpAfterInjection() throws Exception { + dbHelper.deleteAll("COMPOUND_FK_TEST"); + dbHelper.deleteAll("COMPOUND_PK_TEST"); } public void testCompoundPkChangeSingleElement() throws Exception { - DataContext context = createDataContext(); CompoundPkTestEntity object = context.newObject(CompoundPkTestEntity.class); CompoundPkTestEntity refreshedObject = null; @@ -58,9 +67,7 @@ public class CompoundPkChangeTest extend object.getObjectId(), false, ObjectIdQuery.CACHE_REFRESH); - refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery( - context, - refetch); + refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery(context, refetch); assertEquals(object.getObjectId(), refreshedObject.getObjectId()); object.setKey2(key2v2); @@ -75,9 +82,8 @@ public class CompoundPkChangeTest extend object.getObjectId(), false, ObjectIdQuery.CACHE_REFRESH); - refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery( - context, - refetch1); + refreshedObject = (CompoundPkTestEntity) Cayenne + .objectForQuery(context, refetch1); assertEquals(object.getObjectId(), refreshedObject.getObjectId()); object.setKey2(key2v3); @@ -92,14 +98,12 @@ public class CompoundPkChangeTest extend object.getObjectId(), false, ObjectIdQuery.CACHE_REFRESH); - refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery( - context, - refetch2); + refreshedObject = (CompoundPkTestEntity) Cayenne + .objectForQuery(context, refetch2); assertEquals(object.getObjectId(), refreshedObject.getObjectId()); } public void testCompoundPkChangeAllElements() throws Exception { - DataContext context = createDataContext(); CompoundPkTestEntity object = context.newObject(CompoundPkTestEntity.class); CompoundPkTestEntity refreshedObject = null; @@ -118,9 +122,7 @@ public class CompoundPkChangeTest extend object.getObjectId(), false, ObjectIdQuery.CACHE_REFRESH); - refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery( - context, - refetch); + refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery(context, refetch); assertEquals(object.getObjectId(), refreshedObject.getObjectId()); object.setKey1(key1v2); @@ -136,9 +138,8 @@ public class CompoundPkChangeTest extend object.getObjectId(), false, ObjectIdQuery.CACHE_REFRESH); - refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery( - context, - refetch1); + refreshedObject = (CompoundPkTestEntity) Cayenne + .objectForQuery(context, refetch1); assertEquals(object.getObjectId(), refreshedObject.getObjectId()); object.setKey1(key1v3); @@ -154,9 +155,8 @@ public class CompoundPkChangeTest extend object.getObjectId(), false, ObjectIdQuery.CACHE_REFRESH); - refreshedObject = (CompoundPkTestEntity) Cayenne.objectForQuery( - context, - refetch2); + refreshedObject = (CompoundPkTestEntity) Cayenne + .objectForQuery(context, refetch2); assertEquals(object.getObjectId(), refreshedObject.getObjectId()); } }