You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/01 18:08:21 UTC
[1/2] incubator-geode git commit: Specify getDiskDirs() and
getUniqueName() for disk dirs and disk store name
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-837 3cd19bde6 -> 51c2417a4
Specify getDiskDirs() and getUniqueName() for disk dirs and disk store name
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/59de4b86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/59de4b86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/59de4b86
Branch: refs/heads/feature/GEODE-837
Commit: 59de4b866d5818b31e7659859e97b0aae1f5d4db
Parents: 3cd19bd
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Jun 1 11:06:49 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed Jun 1 11:06:49 2016 -0700
----------------------------------------------------------------------
.../DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java | 7 ++-----
.../cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java | 4 ++--
.../DiskDistributedNoAckSyncOverflowRegionDUnitTest.java | 8 ++------
3 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59de4b86/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
index 7100a76..8e12961 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
@@ -51,14 +51,11 @@ public class DiskDistributedNoAckAsyncOverflowRegionDUnitTest extends DiskDistri
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_NO_ACK);
- File[] diskDirs = new File[1];
- diskDirs[0] = new File("diskRegionDirs/" + OSProcess.getId());
- diskDirs[0].mkdirs();
factory.setDiskStoreName(getCache().createDiskStoreFactory()
- .setDiskDirs(diskDirs)
+ .setDiskDirs(getDiskDirs())
.setTimeInterval(1000)
.setQueueSize(0)
- .create("DiskDistributedNoAckAsyncOverflowRegionDUnitTest")
+ .create(getUniqueName())
.getName());
factory.setEvictionAttributes(EvictionAttributes
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59de4b86/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
index 9b9d1b2..2bd2caa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
@@ -45,10 +45,10 @@ public class DiskDistributedNoAckAsyncRegionDUnitTest extends DiskDistributedNoA
diskDirs[0] = new File("diskRegionDirs/" + OSProcess.getId());
diskDirs[0].mkdirs();
factory.setDiskStoreName(getCache().createDiskStoreFactory()
- .setDiskDirs(diskDirs)
+ .setDiskDirs(getDiskDirs())
.setTimeInterval(1000)
.setQueueSize(0)
- .create("DiskDistributedNoAckAsyncRegionDUnitTest")
+ .create(getUniqueName())
.getName());
factory.setDiskSynchronous(false);
factory.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59de4b86/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
index 40ed127..75d4f20 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
@@ -41,13 +41,9 @@ public class DiskDistributedNoAckSyncOverflowRegionDUnitTest extends DiskDistrib
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_NO_ACK);
- File[] diskDirs = new File[1];
- diskDirs[0] = new File("diskRegionDirs/" + OSProcess.getId());
- diskDirs[0].mkdirs();
-
factory.setDiskStoreName(getCache().createDiskStoreFactory()
- .setDiskDirs(diskDirs)
- .create("DiskDistributedNoAckSyncOverflowRegionDUnitTest")
+ .setDiskDirs(getDiskDirs())
+ .create(getUniqueName())
.getName());
factory.setEvictionAttributes(EvictionAttributes
[2/2] incubator-geode git commit: Annotate case methods with
BeforeClass and AfterClass
Posted by kl...@apache.org.
Annotate case methods with BeforeClass and AfterClass
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/51c2417a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/51c2417a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/51c2417a
Branch: refs/heads/feature/GEODE-837
Commit: 51c2417a464f0741b71d8abfd6f91d4c8381c56a
Parents: 59de4b8
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Jun 1 11:07:26 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed Jun 1 11:07:26 2016 -0700
----------------------------------------------------------------------
.../internal/cache/PartitionedRegionDUnitTestCase.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51c2417a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
index e51cf20..f6627f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal.cache;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -111,12 +113,15 @@ public class PartitionedRegionDUnitTestCase extends JUnit4CacheTestCase
protected void preTearDownPartitionedRegionDUnitTest() throws Exception {
}
-
+
+ @BeforeClass
public static void caseSetUp() {
DUnitLauncher.launchIfNeeded();
// this makes sure we don't have any connection left over from previous tests
disconnectAllFromDS();
}
+
+ @AfterClass
public static void caseTearDown() {
// this makes sure we don't leave anything for the next tests
disconnectAllFromDS();