Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 35749 invoked from network); 23 Feb 2011 20:41:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Feb 2011 20:41:35 -0000 Received: (qmail 29705 invoked by uid 500); 23 Feb 2011 20:41:35 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 29674 invoked by uid 500); 23 Feb 2011 20:41:35 -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 29667 invoked by uid 99); 23 Feb 2011 20:41:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Feb 2011 20:41:35 +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; Wed, 23 Feb 2011 20:41:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9CFA02388A40; Wed, 23 Feb 2011 20:41:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1073938 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne: CDOMany2OneTest.java unit/jira/CAY_901Test.java Date: Wed, 23 Feb 2011 20:41:14 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110223204114.9CFA02388A40@eris.apache.org> Author: aadamchik Date: Wed Feb 23 20:41:14 2011 New Revision: 1073938 URL: http://svn.apache.org/viewvc?rev=1073938&view=rev Log: test cleanup merging tests into a single class Removed: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java?rev=1073938&r1=1073937&r2=1073938&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java Wed Feb 23 20:41:14 2011 @@ -20,11 +20,14 @@ package org.apache.cayenne; import java.util.List; +import java.util.Map; import org.apache.cayenne.configuration.server.ServerRuntime; import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.Expression; import org.apache.cayenne.exp.ExpressionFactory; +import org.apache.cayenne.query.CapsStrategy; +import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; @@ -84,6 +87,38 @@ public class CDOMany2OneTest extends Ser } + public void testMultipleToOneDeletion() throws Exception { + + // was a problem per CAY-901 + + Painting p = context.newObject(Painting.class); + p.setPaintingTitle("P1"); + + Artist a = context.newObject(Artist.class); + a.setArtistName("A1"); + + Gallery g = context.newObject(Gallery.class); + g.setGalleryName("G1"); + + p.setToArtist(a); + p.setToGallery(g); + context.commitChanges(); + + p.setToArtist(null); + p.setToGallery(null); + + context.commitChanges(); + + SQLTemplate q = new SQLTemplate(Painting.class, "SELECT * from PAINTING"); + q.setColumnNamesCapitalization(CapsStrategy.UPPER); + q.setFetchingDataRows(true); + + Map row = (Map) Cayenne.objectForQuery(context, q); + assertEquals("P1", row.get("PAINTING_TITLE")); + assertEquals(null, row.get("ARTIST_ID")); + assertEquals(null, row.get("GALLERY_ID")); + } + public void testReadRO1() throws Exception { createArtistWithPaintingDataSet();