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 2018/03/07 18:22:25 UTC
[geode] branch develop updated: GEODE-4766: move
PRCustomPartitioningDUnitTest to internal.cache (#1542)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 922ab83 GEODE-4766: move PRCustomPartitioningDUnitTest to internal.cache (#1542)
922ab83 is described below
commit 922ab8363510fea117c14376d90de765d4d5c556
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Wed Mar 7 10:22:22 2018 -0800
GEODE-4766: move PRCustomPartitioningDUnitTest to internal.cache (#1542)
---
.../{execute => }/MonthBasedPartitionResolver.java | 2 +-
.../PRCustomPartitioningDUnitTest.java | 44 +++++++++++++---------
.../cache/{execute => }/SerializableMonth.java | 2 +-
3 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MonthBasedPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MonthBasedPartitionResolver.java
similarity index 97%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/MonthBasedPartitionResolver.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/MonthBasedPartitionResolver.java
index 4228b71..f083ef0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MonthBasedPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MonthBasedPartitionResolver.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.internal.cache.execute;
+package org.apache.geode.internal.cache;
import java.io.Serializable;
import java.util.Calendar;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRCustomPartitioningDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PRCustomPartitioningDUnitTest.java
similarity index 81%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRCustomPartitioningDUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/PRCustomPartitioningDUnitTest.java
index fc0ab5f..4cd5595 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRCustomPartitioningDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PRCustomPartitioningDUnitTest.java
@@ -12,11 +12,12 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.internal.cache.execute;
+package org.apache.geode.internal.cache;
import static org.apache.geode.test.dunit.Host.getHost;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -24,6 +25,8 @@ import java.util.List;
import java.util.Set;
import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -33,19 +36,15 @@ import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.internal.cache.EntryOperationImpl;
-import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionDataStore.BucketVisitor;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.CacheTestCase;
+import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.junit.categories.DistributedTest;
-/**
- * TODO: move to cache package
- */
@Category(DistributedTest.class)
@SuppressWarnings("serial")
-public class PRCustomPartitioningDUnitTest extends CacheTestCase {
+public class PRCustomPartitioningDUnitTest implements Serializable {
private static final int TOTAL_NUM_BUCKETS = 7;
@@ -61,6 +60,12 @@ public class PRCustomPartitioningDUnitTest extends CacheTestCase {
private VM datastoreVM2;
private VM accessorVM3;
+ @ClassRule
+ public static DistributedTestRule distributedTestRule = new DistributedTestRule();
+
+ @Rule
+ public CacheRule cacheRule = new CacheRule();
+
@Before
public void setUp() {
datastoreVM0 = getHost(0).getVM(0);
@@ -97,7 +102,7 @@ public class PRCustomPartitioningDUnitTest extends CacheTestCase {
private void doPutOperations(final String regionName, final int century,
final List<Date> listOfKeys) {
Calendar calendar = Calendar.getInstance();
- Region<Date, Integer> region = getCache().getRegion(regionName);
+ Region<Date, Integer> region = cacheRule.getCache().getRegion(regionName);
for (int month = 0; month <= 11; month++) {
int year = (int) (Math.random() * century);
int date = (int) (Math.random() * 30);
@@ -111,7 +116,8 @@ public class PRCustomPartitioningDUnitTest extends CacheTestCase {
}
private void verifyKeysInAccessor(final String regionName, final List<Date> listOfKeys) {
- PartitionedRegion partitionedRegion = (PartitionedRegion) getCache().getRegion(regionName);
+ PartitionedRegion partitionedRegion =
+ (PartitionedRegion) cacheRule.getCache().getRegion(regionName);
for (Object key : listOfKeys) {
assertThat(containsKeyInSomeBucket(partitionedRegion, (Date) key)).isTrue();
@@ -121,7 +127,8 @@ public class PRCustomPartitioningDUnitTest extends CacheTestCase {
}
private void verifyKeys(final String regionName, final List<Date> listOfKeys) {
- PartitionedRegion partitionedRegion = (PartitionedRegion) getCache().getRegion(regionName);
+ PartitionedRegion partitionedRegion =
+ (PartitionedRegion) cacheRule.getCache().getRegion(regionName);
for (Date key : listOfKeys) {
assertThat(containsKeyInSomeBucket(partitionedRegion, key)).isTrue();
@@ -132,9 +139,10 @@ public class PRCustomPartitioningDUnitTest extends CacheTestCase {
public void visit(Integer bucketId, Region region) {
Set<Object> bucketKeys = partitionedRegion.getBucketKeys(bucketId);
for (Object key : bucketKeys) {
- EntryOperation entryOperation =
+ EntryOperation<Date, Integer> entryOperation =
new EntryOperationImpl(partitionedRegion, null, key, null, null);
- PartitionResolver partitionResolver = partitionedRegion.getPartitionResolver();
+ PartitionResolver<Date, Integer> partitionResolver =
+ partitionedRegion.getPartitionResolver();
Object routingObject = partitionResolver.getRoutingObject(entryOperation);
int routingObjectHashCode = routingObject.hashCode() % TOTAL_NUM_BUCKETS;
assertThat(routingObjectHashCode).isEqualTo(bucketId);
@@ -144,25 +152,27 @@ public class PRCustomPartitioningDUnitTest extends CacheTestCase {
}
private void createPartitionedRegionWithPartitionResolver() {
- PartitionAttributesFactory paf = new PartitionAttributesFactory();
+ PartitionAttributesFactory<Date, Integer> paf = new PartitionAttributesFactory<>();
paf.setPartitionResolver(new MonthBasedPartitionResolver());
paf.setRedundantCopies(0);
paf.setTotalNumBuckets(TOTAL_NUM_BUCKETS);
- RegionFactory regionFactory = getCache().createRegionFactory(RegionShortcut.PARTITION);
+ RegionFactory<Date, Integer> regionFactory =
+ cacheRule.getOrCreateCache().createRegionFactory(RegionShortcut.PARTITION);
regionFactory.setPartitionAttributes(paf.create());
regionFactory.create(regionName);
}
private void createPartitionedRegionAccessorWithPartitionResolver() {
- PartitionAttributesFactory paf = new PartitionAttributesFactory();
+ PartitionAttributesFactory<Date, Integer> paf = new PartitionAttributesFactory<>();
paf.setLocalMaxMemory(0);
paf.setPartitionResolver(new MonthBasedPartitionResolver());
paf.setRedundantCopies(0);
paf.setTotalNumBuckets(TOTAL_NUM_BUCKETS);
- RegionFactory regionFactory = getCache().createRegionFactory(RegionShortcut.PARTITION);
+ RegionFactory<Date, Integer> regionFactory =
+ cacheRule.getOrCreateCache().createRegionFactory(RegionShortcut.PARTITION);
regionFactory.setPartitionAttributes(paf.create());
regionFactory.create(regionName);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SerializableMonth.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SerializableMonth.java
similarity index 96%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/SerializableMonth.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/SerializableMonth.java
index c0747d8..638c521 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SerializableMonth.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SerializableMonth.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.internal.cache.execute;
+package org.apache.geode.internal.cache;
import java.io.DataInput;
import java.io.DataOutput;
--
To stop receiving notification emails like this one, please contact
klund@apache.org.