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 12419C72B for ; Fri, 27 Apr 2012 19:12:07 +0000 (UTC) Received: (qmail 60960 invoked by uid 500); 27 Apr 2012 19:12:07 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 60941 invoked by uid 500); 27 Apr 2012 19:12:07 -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 60933 invoked by uid 99); 27 Apr 2012 19:12:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2012 19:12:07 +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, 27 Apr 2012 19:12:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0602F238897A for ; Fri, 27 Apr 2012 19:11:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1331548 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchTest.java Date: Fri, 27 Apr 2012 19:11:42 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120427191143.0602F238897A@eris.apache.org> Author: aadamchik Date: Fri Apr 27 19:11:42 2012 New Revision: 1331548 URL: http://svn.apache.org/viewvc?rev=1331548&view=rev Log: CAY-1699 Tests for disjoint by id don't work on MySQL patch by Andrei Veprev Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchTest.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchTest.java?rev=1331548&r1=1331547&r2=1331548&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchTest.java Fri Apr 27 19:11:42 2012 @@ -78,26 +78,26 @@ public class DataContextDisjointByIdPref } private void createThreeBagsWithPlentyOfBoxesDataSet() throws Exception { - tBag.insert(1, null); - tBag.insert(2, null); - tBag.insert(3, null); - - tBox.insert(1, 1, null); - tBox.insert(2, 1, null); - tBox.insert(3, 1, null); - tBox.insert(4, 1, null); - tBox.insert(5, 1, null); - - tBox.insert(6, 2, null); - tBox.insert(7, 2, null); - - tBox.insert(8, 3, null); - tBox.insert(9, 3, null); - tBox.insert(10, 3, null); + tBag.insert(1, "bag1"); + tBag.insert(2, "bag2"); + tBag.insert(3, "bag3"); + + tBox.insert(1, 1, "box1"); + tBox.insert(2, 1, "box2"); + tBox.insert(3, 1, "box3"); + tBox.insert(4, 1, "box4"); + tBox.insert(5, 1, "box5"); + + tBox.insert(6, 2, "box6"); + tBox.insert(7, 2, "box7"); + + tBox.insert(8, 3, "box8"); + tBox.insert(9, 3, "box9"); + tBox.insert(10, 3, "box10"); } private void createBagWithTwoBoxesAndPlentyOfBallsDataSet() throws Exception { - tBag.insert(1, null); + tBag.insert(1, "bag1"); tBox.insert(1, 1, "big"); tBoxInfo.insert(1, 1, "red"); tBox.insert(2, 1, "small"); @@ -240,7 +240,7 @@ public class DataContextDisjointByIdPref assertEquals(PersistenceState.COMMITTED, b.getPersistenceState()); volumes.add(b.getThingVolume()); } - assertEquals(Arrays.asList(10, 20, 30, 40, 20, 40), volumes); + assertTrue(volumes.containsAll(Arrays.asList(10, 20, 30, 40, 20, 40))); } }); } @@ -268,7 +268,7 @@ public class DataContextDisjointByIdPref assertEquals(PersistenceState.COMMITTED, t.getPersistenceState()); volumes.add(t.getVolume()); } - assertEquals(Arrays.asList(10, 20, 20, 30, 40, 40), volumes); + assertTrue(volumes.containsAll(Arrays.asList(10, 20, 20, 30, 40, 40))); } }); } @@ -311,7 +311,7 @@ public class DataContextDisjointByIdPref assertEquals(PersistenceState.COMMITTED, t.getPersistenceState()); volumes.add(t.getVolume()); } - assertEquals(Arrays.asList(10, 20), volumes); + assertTrue(volumes.containsAll(Arrays.asList(10, 20))); } }); } @@ -382,7 +382,7 @@ public class DataContextDisjointByIdPref assertEquals(PersistenceState.COMMITTED, ball.getPersistenceState()); volumes.add(ball.getThingVolume()); } - assertEquals(Arrays.asList(10, 20), volumes); + assertTrue(volumes.containsAll(Arrays.asList(10, 20))); } }); }