Repository: cayenne Updated Branches: refs/heads/STABLE-3.1 6ca077ec3 -> 4bb78bdf7
vain attempt to improve 3.1 tests stability Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4bb78bdf Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4bb78bdf Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4bb78bdf Branch: refs/heads/STABLE-3.1 Commit: 4bb78bdf7ce5610dfebf0bfbf55fb168029c3961 Parents: 6ca077e Author: aadamchik <[email protected]> Authored: Sat Apr 9 12:09:39 2016 +0300 Committer: aadamchik <[email protected]> Committed: Sat Apr 9 13:40:21 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/cayenne/CDOMany2OneTest.java | 3 ++- .../java/org/apache/cayenne/CDOOne2ManyTest.java | 4 ++-- .../org/apache/cayenne/CayenneDOTestBase.java | 4 +++- .../cayenne/access/DataContextDelegateTest.java | 3 ++- .../access/DataContextEJBQLFetchJoinTest.java | 3 ++- .../DataContextEJBQLGroupByHavingTest.java | 3 ++- .../access/DataContextEJBQLJoinsTest.java | 3 ++- .../access/DataContextJoinAliasesTest.java | 6 +++++- .../access/DataContextLocalObjectTest.java | 3 ++- .../access/DataContextPerformQueryAPITest.java | 5 +++-- .../cayenne/access/DataContextPrefetchTest.java | 5 ++--- .../access/DataContextSharedCacheTest.java | 3 ++- .../cayenne/access/DataDomainCallbacksTest.java | 19 ++++++++++--------- .../apache/cayenne/access/JointPrefetchTest.java | 5 +++++ 14 files changed, 44 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java index 71fcb86..5fb7dab 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOMany2OneTest.java @@ -57,8 +57,9 @@ public class CDOMany2OneTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java index 3c1f3bb..8c33446 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CDOOne2ManyTest.java @@ -54,14 +54,14 @@ public class CDOOne2ManyTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("GALLERY"); dbHelper.deleteAll("EXHIBIT"); + dbHelper.deleteAll("GALLERY"); tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java index 38dded3..f3f1e22 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneDOTestBase.java @@ -49,9 +49,11 @@ public abstract class CayenneDOTestBase extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); + dbHelper.deleteAll("ARTIST_EXHIBIT"); + dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); dbHelper.deleteAll("EXHIBIT"); dbHelper.deleteAll("GALLERY"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java index 62852c2..7b658c2 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDelegateTest.java @@ -48,8 +48,9 @@ public class DataContextDelegateTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java index e9d2093..7a66d48 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java @@ -61,8 +61,9 @@ public class DataContextEJBQLFetchJoinTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java index b1a3901..0a1cce3 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java @@ -51,8 +51,9 @@ public class DataContextEJBQLGroupByHavingTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java index 42a8d9d..a49dcae 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsTest.java @@ -49,8 +49,9 @@ public class DataContextEJBQLJoinsTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java index a65427a..d25d6d1 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesTest.java @@ -49,10 +49,14 @@ public class DataContextJoinAliasesTest extends ServerCase { @Override public 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"); dbHelper.deleteAll("EXHIBIT"); dbHelper.deleteAll("GALLERY"); - dbHelper.deleteAll("ARTIST"); tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextLocalObjectTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextLocalObjectTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextLocalObjectTest.java index 8fcf89c..812bf0a 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextLocalObjectTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextLocalObjectTest.java @@ -54,8 +54,9 @@ public class DataContextLocalObjectTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java index 0e4bb35..ae4e9c1 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPITest.java @@ -62,13 +62,14 @@ public class DataContextPerformQueryAPITest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("GALLERY"); dbHelper.deleteAll("EXHIBIT"); + dbHelper.deleteAll("GALLERY"); tArtist = new TableHelper(dbHelper, "ARTIST"); tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java index 40f2059..84be7da 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java @@ -74,12 +74,11 @@ public class DataContextPrefetchTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTGROUP"); - dbHelper.deleteAll("ARTIST"); dbHelper.deleteAll("EXHIBIT"); dbHelper.deleteAll("GALLERY"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java index aadd152..d0711b3 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSharedCacheTest.java @@ -65,8 +65,9 @@ public class DataContextSharedCacheTest extends ServerCase { @Override protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); + dbHelper.deleteAll("PAINTING_INFO"); dbHelper.deleteAll("PAINTING"); + dbHelper.deleteAll("PAINTING1"); dbHelper.deleteAll("ARTIST_EXHIBIT"); dbHelper.deleteAll("ARTIST_GROUP"); dbHelper.deleteAll("ARTIST"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java index bf156c7..4ee91be 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java @@ -50,15 +50,16 @@ public class DataDomainCallbacksTest extends ServerCase { private DBHelper dbHelper; @Override - protected void setUpAfterInjection() throws Exception { - dbHelper.deleteAll("PAINTING_INFO"); - dbHelper.deleteAll("PAINTING"); - dbHelper.deleteAll("ARTIST_EXHIBIT"); - dbHelper.deleteAll("ARTIST_GROUP"); - dbHelper.deleteAll("ARTIST"); - dbHelper.deleteAll("EXHIBIT"); - dbHelper.deleteAll("GALLERY"); - } + 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"); + dbHelper.deleteAll("EXHIBIT"); + dbHelper.deleteAll("GALLERY"); + } public void testPostLoad() throws Exception { LifecycleCallbackRegistry registry = resolver.getCallbackRegistry(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bb78bdf/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java ---------------------------------------------------------------------- diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java index 8cba755..901f1b2 100644 --- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java +++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/JointPrefetchTest.java @@ -77,8 +77,13 @@ public class JointPrefetchTest extends ServerCase { @Override 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"); + dbHelper.deleteAll("EXHIBIT"); dbHelper.deleteAll("GALLERY"); tArtist = new TableHelper(dbHelper, "ARTIST");
