You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/17 12:19:29 UTC
[1/3] cayenne git commit: Prevent JGroups listeners to start in tests
Repository: cayenne
Updated Branches:
refs/heads/master fb4db81d2 -> 87609c1a1
Prevent JGroups listeners to start in tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/862818dc
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/862818dc
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/862818dc
Branch: refs/heads/master
Commit: 862818dcca219a02ec0bdb29a889ceeef69d8425
Parents: fb4db81
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Dec 16 10:05:33 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Dec 16 10:05:33 2016 +0300
----------------------------------------------------------------------
.../src/test/java/org/apache/cayenne/access/DataRowStoreIT.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/862818dc/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
index 8252348..96016e3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
@@ -64,7 +64,10 @@ public class DataRowStoreIT extends ServerCase {
@Before
public void createEventManager() {
- eventManager = new DefaultEventManager();
+ // we don't actually need any event manager here, as having it will start
+ // really heavy Event Bridge (jgroups bridge) inside DataRowStore and this behaviour
+ // is not anyhow tested here nor it affects existing tests.
+ eventManager = null;//new DefaultEventManager();
}
@Test
[2/3] cayenne git commit: Delete all usages of EventManager
Posted by aa...@apache.org.
Delete all usages of EventManager
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/82944a4f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/82944a4f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/82944a4f
Branch: refs/heads/master
Commit: 82944a4f9a45e6eb5e782c0430b6e9d9c4452646
Parents: 862818d
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Dec 16 10:28:15 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Dec 16 10:28:15 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/access/DataRowStoreIT.java | 34 ++++++--------------
1 file changed, 9 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/82944a4f/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
index 96016e3..54ce5a1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java
@@ -21,13 +21,11 @@ package org.apache.cayenne.access;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.event.DefaultEventManager;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import java.util.Collections;
@@ -39,22 +37,17 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+/**
+ * We pass null as EventManager parameter, as having it not null will start
+ * really heavy EventBridge (JavaGroupsBridge implementation) inside DataRowStore
+ * and this behaviour is not anyhow tested here nor it affects existing tests.
+ */
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class DataRowStoreIT extends ServerCase {
- private DefaultEventManager eventManager;
-
private DataRowStore cache;
@After
- public void cleanEventManager() {
- if(eventManager != null) {
- eventManager.shutdown();
- eventManager = null;
- }
- }
-
- @After
public void cleanDataStore() {
if(cache != null) {
cache.shutdown();
@@ -62,20 +55,12 @@ public class DataRowStoreIT extends ServerCase {
}
}
- @Before
- public void createEventManager() {
- // we don't actually need any event manager here, as having it will start
- // really heavy Event Bridge (jgroups bridge) inside DataRowStore and this behaviour
- // is not anyhow tested here nor it affects existing tests.
- eventManager = null;//new DefaultEventManager();
- }
-
@Test
public void testDefaultConstructor() {
cache = new DataRowStore(
"cacheXYZ",
Collections.EMPTY_MAP,
- eventManager);
+ null);
assertEquals("cacheXYZ", cache.getName());
assertNotNull(cache.getSnapshotEventSubject());
assertTrue(cache.getSnapshotEventSubject().getSubjectName().contains("cacheXYZ"));
@@ -89,11 +74,10 @@ public class DataRowStoreIT extends ServerCase {
Map<Object, Object> props = new HashMap<Object, Object>();
props.put(DataRowStore.REMOTE_NOTIFICATION_PROPERTY, String
.valueOf(!DataRowStore.REMOTE_NOTIFICATION_DEFAULT));
-
cache = new DataRowStore(
"cacheXYZ",
props,
- eventManager);
+ null);
assertEquals("cacheXYZ", cache.getName());
assertEquals(!DataRowStore.REMOTE_NOTIFICATION_DEFAULT, cache
.isNotifyingRemoteListeners());
@@ -104,7 +88,7 @@ public class DataRowStoreIT extends ServerCase {
cache = new DataRowStore(
"cacheXYZ",
Collections.EMPTY_MAP,
- eventManager);
+ null);
assertEquals(DataRowStore.REMOTE_NOTIFICATION_DEFAULT, cache
.isNotifyingRemoteListeners());
@@ -125,7 +109,7 @@ public class DataRowStoreIT extends ServerCase {
cache = new DataRowStore(
"cacheXYZ",
props,
- eventManager);
+ null);
assertEquals(2, cache.maximumSize());
assertEquals(0, cache.size());
[3/3] cayenne git commit: Merge branch '160' - should stabilize the
itests
Posted by aa...@apache.org.
Merge branch '160' - should stabilize the itests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/87609c1a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/87609c1a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/87609c1a
Branch: refs/heads/master
Commit: 87609c1a10cd4952dd66c01e94f52711b33eaf69
Parents: fb4db81 82944a4
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sat Dec 17 15:18:49 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sat Dec 17 15:18:49 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/access/DataRowStoreIT.java | 31 ++++++--------------
1 file changed, 9 insertions(+), 22 deletions(-)
----------------------------------------------------------------------