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/05/24 00:31:48 UTC
[23/29] incubator-geode git commit: Converting dunits to junit 4
using dunits_to_junit4.sh
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
index bc901f4..4f33afe 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import static com.gemstone.gemfire.cache.query.Utils.*;
import java.util.Collection;
@@ -38,10 +47,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.VM;
+@Category(DistributedTest.class)
public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCase {
- public PRBasicIndexCreationDUnitTest(String name) {
- super(name);
+ public PRBasicIndexCreationDUnitTest() {
+ super();
}
public void setCacheInVMsUsingXML(String xmlFile, VM... vms) {
@@ -75,6 +85,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
*
* @throws Exception if an exception is generated
*/
+ @Test
public void testPRBasicIndexCreate() throws Exception
{
Host host = Host.getHost(0);
@@ -121,6 +132,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
* Tests creation of multiple index creation on a partitioned region system.
* @throws Exception if any excpetion are generated
*/
+ @Test
public void testPRMultiIndexCreation() throws Exception
{
Host host = Host.getHost(0);
@@ -163,6 +175,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
*
* @throws Exception if any exception are generated
*/
+ @Test
public void testPRMultiIndexCreationAndGetIndex() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -240,6 +253,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Creats partitioned index from an xml discription.
*/
+ @Test
public void testCreatePartitionedIndexThroughXML() throws Exception
{
IgnoredException ie = IgnoredException.addIgnoredException(IndexNameConflictException.class.getName());
@@ -284,6 +298,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
* in the sytem.
*
*/
+ @Test
public void testCreatePartitionedRegionThroughXMLAndAPI()
{
Host host = Host.getHost(0);
@@ -331,6 +346,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
* serialQueryEntry.conf hydra test before putting the data in the partitioned
* region.
*/
+ @Test
public void testCreatePartitionedIndexWithNoAliasBeforePuts () throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -363,6 +379,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
* Test creating index on partitioned region like created in test
* serialQueryEntry.conf but after putting some data in.
*/
+ @Test
public void testCreatePartitionedIndexWithNoAliasAfterPuts () throws Exception {
Host host = Host.getHost(0);
@@ -397,6 +414,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Test index usage with query on a partitioned region with bucket indexes.
*/
+ @Test
public void testPartitionedIndexUsageWithPRQuery () throws Exception {
Host host = Host.getHost(0);
@@ -442,6 +460,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
* Test index usage with query on a partitioned region with bucket indexes.
* @throws Throwable
*/
+ @Test
public void testPartitionedIndexCreationDuringPersistentRecovery() throws Throwable {
Host host = Host.getHost(0);
@@ -494,6 +513,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
* Test for bug 37089 where if there is an index on one attribute
* (CompiledComparision) of the where clause query produces wrong results.
*/
+ @Test
public void testPartitionedQueryWithIndexOnIdBug37089 () throws Exception {
Host host = Host.getHost(0);
@@ -534,6 +554,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Creats partitioned index on keys and values of a bucket regions.
*/
+ @Test
public void testCreatePartitionedIndexWithKeysValuesAndFunction() throws Exception
{
@@ -576,6 +597,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
/**
* Bug Fix 37201, creating index from a data accessor.
*/
+ @Test
public void testCreateIndexFromAccessor() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -617,6 +639,7 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
* accessor VM.
*/
+ @Test
public void testCreateIndexAndAddAnAccessor() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -656,7 +679,8 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
*
* @throws Exception
*/
- public void testIndexQueryingWithOrderBy() throws Exception
+ @Test
+ public void testIndexQueryingWithOrderBy() throws Exception
{
int dataSize = 10;
int step = 2;
@@ -754,7 +778,8 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
*
* @throws Exception
*/
- public void testIndexQueryingWithOrderAndVerify() throws Exception
+ @Test
+ public void testIndexQueryingWithOrderAndVerify() throws Exception
{
int dataSize = 10;
int step = 2;
@@ -842,7 +867,8 @@ public class PRBasicIndexCreationDUnitTest extends PartitionedRegionDUnitTestCas
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****");
}
-public void testIndexQueryingWithOrderByLimit() throws Exception
+ @Test
+ public void testIndexQueryingWithOrderByLimit() throws Exception
{
int dataSize = 10;
int step = 2;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java
index ecfbfae..20041bd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDeadlockDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import static com.gemstone.gemfire.cache.query.Utils.createPortfoliosAndPositions;
import java.io.File;
@@ -36,6 +45,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
/**
*
*/
+@Category(DistributedTest.class)
public class PRBasicIndexCreationDeadlockDUnitTest extends
PartitionedRegionDUnitTestCase
@@ -46,8 +56,8 @@ public class PRBasicIndexCreationDeadlockDUnitTest extends
* @param name
*/
- public PRBasicIndexCreationDeadlockDUnitTest(String name) {
- super(name);
+ public PRBasicIndexCreationDeadlockDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
for (VM vm : vms) {
@@ -74,6 +84,7 @@ public class PRBasicIndexCreationDeadlockDUnitTest extends
public static volatile boolean hook_vm1, hook_vm2;
//Dummy test method to be removed when test is fixed
+ @Test
public void testIndexCreationMessageDiskRecoveryDeadLock() {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
index fcc5c49..c83626e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import static com.gemstone.gemfire.cache.query.Utils.*;
import java.util.ArrayList;
@@ -34,10 +43,11 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+@Category(DistributedTest.class)
public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTestCase {
- public PRBasicMultiIndexCreationDUnitTest(String name) {
- super(name);
+ public PRBasicMultiIndexCreationDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -61,6 +71,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
*
* @throws Exception if an exception is generated
*/
+ @Test
public void testPRBasicIndexCreate() throws Exception
{
Host host = Host.getHost(0);
@@ -123,6 +134,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
*
* @throws Exception if any exception are generated
*/
+ @Test
public void testPRMultiIndexCreationAndGetIndex() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -209,6 +221,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
* in the system.
*
*/
+ @Test
public void testCreatePartitionedRegionThroughXMLAndAPI()
{
Host host = Host.getHost(0);
@@ -264,6 +277,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
* serialQueryEntry.conf hydra test before putting the data in the partitioned
* region.
*/
+ @Test
public void testCreatePartitionedIndexWithNoAliasBeforePuts () throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -311,6 +325,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
* Test creating index on partitioned region like created in test
* serialQueryEntry.conf but after putting some data in.
*/
+ @Test
public void testCreatePartitionedIndexWithNoAliasAfterPuts () throws Exception {
Host host = Host.getHost(0);
@@ -355,6 +370,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* Test index usage with query on a partitioned region with bucket indexes.
*/
+ @Test
public void testPartitionedIndexUsageWithPRQuery () throws Exception {
Host host = Host.getHost(0);
@@ -406,6 +422,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
* Test index usage with query on a partitioned region with bucket indexes.
* @throws Throwable
*/
+ @Test
public void testPartitionedIndexCreationDuringPersistentRecovery() throws Throwable {
Host host = Host.getHost(0);
@@ -465,6 +482,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
* Test for bug 37089 where if there is an index on one attribute
* (CompiledComparision) of the where clause query produces wrong results.
*/
+ @Test
public void testPartitionedQueryWithIndexOnIdBug37089 () throws Exception {
Host host = Host.getHost(0);
@@ -511,6 +529,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* Creats partitioned index on keys and values of a bucket regions.
*/
+ @Test
public void testCreatePartitionedIndexWithKeysValuesAndFunction() throws Exception
{
@@ -561,6 +580,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
/**
* Bug Fix 37201, creating index from a data accessor.
*/
+ @Test
public void testCreateIndexFromAccessor() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -604,6 +624,7 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
* accessor VM.
*/
+ @Test
public void testCreateIndexAndAddAnAccessor() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -646,7 +667,8 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
*
* @throws Exception
*/
- public void testIndexQueryingWithOrderBy() throws Exception
+ @Test
+ public void testIndexQueryingWithOrderBy() throws Exception
{
int dataSize = 10;
int step = 2;
@@ -747,7 +769,8 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
*
* @throws Exception
*/
- public void testIndexQueryingWithOrderAndVerify() throws Exception
+ @Test
+ public void testIndexQueryingWithOrderAndVerify() throws Exception
{
int dataSize = 10;
int step = 2;
@@ -838,7 +861,8 @@ public class PRBasicMultiIndexCreationDUnitTest extends PartitionedRegionDUnitTe
"PRQueryDUnitTest#testPRDAckCreationAndQuerying : *Querying PR's with DACK Test ENDED*****");
}
-public void testIndexQueryingWithOrderByLimit() throws Exception
+ @Test
+ public void testIndexQueryingWithOrderByLimit() throws Exception
{
int step = 2;
int totalDataSize = 90;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java
index bbe3c90..0d8f48a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicQueryDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import static com.gemstone.gemfire.cache.query.Utils.*;
import com.gemstone.gemfire.cache.Cache;
@@ -38,6 +47,7 @@ import com.gemstone.gemfire.test.dunit.VM;
* firing a simple query and validating the ResultSet size and Contents.
*
*/
+@Category(DistributedTest.class)
public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
{
@@ -47,8 +57,8 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @param name
*/
- public PRBasicQueryDUnitTest(String name) {
- super(name);
+ public PRBasicQueryDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -74,6 +84,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a query on accessor VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRBasicQuerying() throws Exception
{
Host host = Host.getHost(0);
@@ -142,6 +153,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
"PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED");
}
+ @Test
public void testPRCountStarQuery() throws Exception
{
Host host = Host.getHost(0);
@@ -221,6 +233,7 @@ public class PRBasicQueryDUnitTest extends PartitionedRegionDUnitTestCase
"PRQBasicQueryDUnitTest#testPRCountStarQuery: Querying PR's Test ENDED");
}
+ @Test
public void testPROrderBy() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
index bdbaeb3..a280008 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import static com.gemstone.gemfire.cache.query.Utils.createPortfolioData;
import com.gemstone.gemfire.cache.query.data.PortfolioData;
@@ -28,6 +37,7 @@ import com.gemstone.gemfire.test.dunit.VM;
* Basic funtional test for removing index from a partitioned region system.
*
*/
+@Category(DistributedTest.class)
public class PRBasicRemoveIndexDUnitTest extends PartitionedRegionDUnitTestCase
{
/**
@@ -35,7 +45,7 @@ public class PRBasicRemoveIndexDUnitTest extends PartitionedRegionDUnitTestCase
* @param name
*/
public PRBasicRemoveIndexDUnitTest (String name) {
- super(name);
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -68,6 +78,7 @@ public class PRBasicRemoveIndexDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
* if the test fails
*/
+ @Test
public void testPRBasicIndexRemove() throws Exception
{
Host host = Host.getHost(0);
@@ -112,6 +123,7 @@ public class PRBasicRemoveIndexDUnitTest extends PartitionedRegionDUnitTestCase
/**
* Test removing single index on a pr.
*/
+ @Test
public void testPRBasicRemoveParticularIndex() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index f86b94e..b50b650 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import static com.gemstone.gemfire.cache.query.Utils.*;
import java.util.ArrayList;
@@ -64,6 +73,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
/**
*
*/
+@Category(DistributedTest.class)
public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase {
int totalNumBuckets = 100;
@@ -87,8 +97,8 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
/**
* @param name
*/
- public PRColocatedEquiJoinDUnitTest(String name) {
- super(name);
+ public PRColocatedEquiJoinDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
for (VM vm : vms) {
@@ -102,6 +112,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRLocalQuerying() throws Exception
{
Host host = Host.getHost(0);
@@ -180,6 +191,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
"PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED");
}
+ @Test
public void testNonColocatedPRLocalQuerying() throws Exception
{
IgnoredException.addIgnoredException("UnsupportedOperationException");
@@ -385,6 +397,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRLocalQueryingWithIndexes() throws Exception {
Host host = Host.getHost(0);
@@ -474,6 +487,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRLocalQueryingWithIndexOnOneRegion() throws Exception {
Host host = Host.getHost(0);
@@ -561,6 +575,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRRRLocalQuerying() throws Exception
{
Host host = Host.getHost(0);
@@ -645,6 +660,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRRRLocalQueryingWithIndexes() throws Exception {
Host host = Host.getHost(0);
@@ -734,6 +750,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRRRLocalQueryingWithIndexOnOnePRRegion() throws Exception {
Host host = Host.getHost(0);
@@ -820,6 +837,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testRRPRLocalQuerying() throws Exception
{
Host host = Host.getHost(0);
@@ -904,6 +922,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testRRPRLocalQueryingWithIndexes() throws Exception {
Host host = Host.getHost(0);
@@ -991,6 +1010,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testRRPRLocalQueryingWithIndexOnOnePRRegion() throws Exception {
Host host = Host.getHost(0);
@@ -1077,6 +1097,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRNonLocalQueryException() throws Exception {
Host host = Host.getHost(0);
@@ -1235,6 +1256,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
"PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED");
}
+ @Test
public void testPRRRLocalQueryingWithHetroIndexes() throws Exception {
Host host = Host.getHost(0);
@@ -1318,6 +1340,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
}
+ @Test
public void testRRPRLocalQueryingWithHetroIndexes() throws Exception {
Host host = Host.getHost(0);
@@ -1400,6 +1423,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
"PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED");
}
+ @Test
public void testPRRRCompactRangeAndNestedRangeIndexQuerying() throws Exception {
Host host = Host.getHost(0);
@@ -1482,6 +1506,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
"PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED");
}
+ @Test
public void testPRRRIndexQueryWithSameTypeIndexQueryResults() throws Exception {
Host host = Host.getHost(0);
@@ -1577,6 +1602,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
* 3. Fires a LOCAL query on one data store VM and verifies the result.
* @throws Exception
*/
+ @Test
public void testPRRRNonLocalQueryingWithNoRROnOneNode() throws Exception
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java
index 4fa2b5a..ed98c3e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRInvalidQueryDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
/**
* This tests creates partition regions across VM's executes Queries on PR's so
* that they generate various Exceptions
@@ -30,6 +39,7 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
+@Category(DistributedTest.class)
public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase
{
@@ -39,9 +49,9 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @param name
*/
- public PRInvalidQueryDUnitTest(String name) {
+ public PRInvalidQueryDUnitTest() {
- super(name);
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -70,6 +80,7 @@ public class PRInvalidQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
+ @Test
public void testPRDAckCreationAndQueryingWithInvalidQuery() throws Exception
{
LogWriterUtils.getLogWriter()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
index 97021f5..f76529f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
/**
* This test tests the PR query behaviour with respect to cache closure
* happening on one of the data stores. PR is configured with redundantCopies =
@@ -44,6 +53,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+@Category(DistributedTest.class)
public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase
{
@@ -53,9 +63,9 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase
* @param name
*/
- public PRQueryCacheCloseDUnitTest(String name) {
+ public PRQueryCacheCloseDUnitTest() {
- super(name);
+ super();
}
public void setCacheInVMs(VM... vms) {
for (VM vm : vms) {
@@ -89,6 +99,7 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase
* 6. then recreates the PR on the same VM <br>
* 7. Verfies the size , type , contents of both the resultSets Obtained <br>
*/
+ @Test
public void testPRWithCacheCloseInOneDatastoreWithDelay() throws Exception
{
@@ -222,6 +233,7 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase
* 6. then recreates the PR on the same VM <br>
* 7. Verfies the size , type , contents of both the resultSets Obtained <br>
*/
+ @Test
public void testPRWithCacheCloseInOneDatastoreWithoutDelay() throws Exception
{
LogWriterUtils.getLogWriter()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
index c5ec4b7..1135939 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
/**
* This tests creates partition regions across VM's and a local Region across
* one of the VM executes Queries both on Local Region & PR's & compare
@@ -53,6 +62,7 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
+@Category(DistributedTest.class)
public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
{
@@ -62,8 +72,8 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @param name
*/
- public PRQueryDUnitTest(String name) {
- super(name);
+ public PRQueryDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -100,6 +110,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
+ @Test
public void testPRDAckCreationAndQuerying() throws Exception
{
LogWriterUtils.getLogWriter()
@@ -184,6 +195,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
+ @Test
public void testPRDAckCreationAndQueryingFull() throws Exception
{
LogWriterUtils.getLogWriter()
@@ -270,6 +282,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
+ @Test
public void testPRDAckCreationAndQueryingWithConstants() throws Exception
{
LogWriterUtils.getLogWriter()
@@ -353,6 +366,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* the query loop
* @throws Exception
*/
+ @Test
public void testDataLossDuringQueryProcessor() throws Exception {
final String rName = getUniqueName();
Host host = Host.getHost(0);
@@ -431,6 +445,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
}
}
+ @Test
public void testQueryResultsFromMembers() throws Exception {
final String rName = getUniqueName();
Host host = Host.getHost(0);
@@ -536,6 +551,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
}
}
+ @Test
public void testQueryResultsFromMembersWithAccessor() throws Exception {
final String rName = getUniqueName();
Host host = Host.getHost(0);
@@ -650,6 +666,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* the query loop
* @throws Exception
*/
+ @Test
public void testSimulatedDataLossBeforeQueryProcessor() throws Exception
{
final String rName = getUniqueName();
@@ -733,6 +750,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
+ @Test
public void testPRAccessorCreationAndQuerying() throws Exception
{
LogWriterUtils.getLogWriter()
@@ -824,7 +842,8 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
- public void testPRDAckCreationAndQueryingWithOrderBy() throws Exception
+ @Test
+ public void testPRDAckCreationAndQueryingWithOrderBy() throws Exception
{
int dataSize = 10;
int step = 2;
@@ -911,7 +930,8 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
- public void testPRDAckCreationAndQueryingWithOrderByVerifyOrder() throws Exception
+ @Test
+ public void testPRDAckCreationAndQueryingWithOrderByVerifyOrder() throws Exception
{
int dataSize = 10;
int step = 2;
@@ -997,6 +1017,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
*
* @throws Exception
*/
+ @Test
public void testPRAccessorCreationAndQueryWithOrderBy() throws Exception
{
int dataSize = 10;
@@ -1081,6 +1102,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
"PRQueryDUnitTest#testPRAccessorCreationAndQuerying : Querying PR's Test ENDED*****");
}
+ @Test
public void testPRDAckCreationAndQueryingWithOrderByLimit() throws Exception
{
int dataSize = 10;
@@ -1169,6 +1191,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
* @throws Exception
*/
+ @Test
public void testPRAccessorCreationAndQueryingWithNoData() throws Exception
{
LogWriterUtils.getLogWriter()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
index c8975db..edc821a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
/**
* This test creates partition regions with one Accessor node & two Datastores
* Calls region.close() on one of the data stores while the query is being
@@ -42,6 +51,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
+@Category(DistributedTest.class)
public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
{
@@ -51,8 +61,8 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
* @param name
*/
- public PRQueryRegionCloseDUnitTest(String name) {
- super(name);
+ public PRQueryRegionCloseDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -88,6 +98,7 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
* 6. then recreates the PR on the same VM <br>
* 7. Verfies the size , type , contents of both the resultSets Obtained <br>
*/
+ @Test
public void testPRWithRegionCloseInOneDatastoreWithoutDelay()
throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
index 1892be9..41dcad7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
/**
* This test creates partition regions with one Accessor node & two Datastores
* Calls region.destroy() on one of the data stores while the query is being
@@ -42,6 +51,7 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
+@Category(DistributedTest.class)
public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestCase
{
@@ -51,9 +61,9 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
* @param name
*/
- public PRQueryRegionDestroyedDUnitTest(String name) {
+ public PRQueryRegionDestroyedDUnitTest() {
- super(name);
+ super();
}
public void setCacheInVMs(VM... vms) {
for (VM vm : vms) {
@@ -82,6 +92,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
* 6. then recreates the PR on the same VM <br>
* 7. Verfies the size , type , contents of both the resultSets Obtained <br>
*/
+ @Test
public void testPRWithRegionDestroyInOneDatastoreWithDelay()
throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
index 2fc1bc5..52896b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.cache.query.partitioned;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import static com.gemstone.gemfire.cache.query.Utils.createPortfolioData;
import java.util.LinkedList;
@@ -56,6 +65,7 @@ import com.gemstone.gemfire.test.dunit.VM;
* well as local querying.
*
*/
+@Category(DistributedTest.class)
public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitTestCase {
/**
@@ -64,8 +74,8 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
* @param name
*/
- public PRQueryRemoteNodeExceptionDUnitTest(String name) {
- super(name);
+ public PRQueryRemoteNodeExceptionDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -103,6 +113,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
* 6. then re-executes the query on one of the data-store node. <br>
* 7. Verifies the exception thrown is from local node not from remote node <br>
*/
+ @Test
public void testPRWithLocalAndRemoteException()
throws Exception {
@@ -234,6 +245,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
"PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED");
}
+ @Test
public void testRemoteException() throws Exception {
LogWriterUtils.getLogWriter()
@@ -365,6 +377,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
"PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED");
}
+ @Test
public void testCacheCloseExceptionFromLocalAndRemote() throws Exception {
LogWriterUtils.getLogWriter()
@@ -498,6 +511,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
"PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED");
}
+ @Test
public void testCacheCloseExceptionFromLocalAndRemote2() throws Exception {
LogWriterUtils.getLogWriter()
@@ -641,6 +655,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
"PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED");
}
+ @Test
public void testForceReattemptExceptionFromLocal() throws Exception {
LogWriterUtils.getLogWriter()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
index 5b123f2..0e2b4cd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.snapshot;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -35,7 +44,8 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
-public class ParallelSnapshotDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ParallelSnapshotDUnitTest extends JUnit4CacheTestCase {
static byte[] ffff = new byte[] { 0xf, 0xf, 0xf, 0xf };
static byte[] eeee = new byte[] { 0xe, 0xe, 0xe, 0xe };
@@ -61,15 +71,17 @@ public class ParallelSnapshotDUnitTest extends CacheTestCase {
}
}
- public ParallelSnapshotDUnitTest(String name) {
- super(name);
+ public ParallelSnapshotDUnitTest() {
+ super();
}
+ @Test
public void testExportImport() throws Exception {
doExport(false);
doImport(false);
}
+ @Test
public void testExportImportErrors() throws Exception {
try {
doExport(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
index eae745a..4a75094 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.snapshot;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.File;
import com.examples.snapshot.MyPdxSerializer;
@@ -31,13 +40,15 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
-public class SnapshotByteArrayDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class SnapshotByteArrayDUnitTest extends JUnit4CacheTestCase {
private final File snap = new File("snapshot-ops");
- public SnapshotByteArrayDUnitTest(String name) {
- super(name);
+ public SnapshotByteArrayDUnitTest() {
+ super();
}
+ @Test
public void testImportByteArray() throws Exception {
SerializableCallable load = new SerializableCallable() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
index 06bfecc..d9b041a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.snapshot;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.File;
import java.io.FilenameFilter;
import java.util.HashMap;
@@ -39,11 +48,13 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
-public class SnapshotDUnitTest extends CacheTestCase {
- public SnapshotDUnitTest(String name) {
- super(name);
+@Category(DistributedTest.class)
+public class SnapshotDUnitTest extends JUnit4CacheTestCase {
+ public SnapshotDUnitTest() {
+ super();
}
+ @Test
public void testExportAndImport() throws Exception {
File dir = new File(getDiskDirs()[0], "snap");
dir.mkdir();
@@ -108,6 +119,7 @@ public class SnapshotDUnitTest extends CacheTestCase {
}
}
+ @Test
public void testCacheExportFilterException() throws Exception {
SnapshotFilter<Object, Object> oops = new SnapshotFilter<Object, Object>() {
@Override
@@ -132,6 +144,7 @@ public class SnapshotDUnitTest extends CacheTestCase {
assertTrue(caughtException);
}
+ @Test
public void testCacheImportFilterException() throws Exception {
SnapshotFilter<Object, Object> oops = new SnapshotFilter<Object, Object>() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
index c5b0e55..ec75ba1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.snapshot;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.File;
import java.io.FilenameFilter;
import java.util.HashMap;
@@ -34,11 +43,13 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
-public class SnapshotPerformanceDUnitTest extends CacheTestCase {
- public SnapshotPerformanceDUnitTest(String name) {
- super(name);
+@Category(DistributedTest.class)
+public class SnapshotPerformanceDUnitTest extends JUnit4CacheTestCase {
+ public SnapshotPerformanceDUnitTest() {
+ super();
}
+ @Test
public void testPerformance() throws Exception {
int iterations = 5;
int dataCount = 10000;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
index 94ac2f6..ea90c14 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheListener;
@@ -37,7 +46,8 @@ import com.gemstone.gemfire.test.dunit.VM;
*
* @since 5.0
*/
-public class Bug34387DUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class Bug34387DUnitTest extends JUnit4CacheTestCase {
// private transient Region r;
// private transient DistributedMember otherId;
@@ -45,8 +55,8 @@ public class Bug34387DUnitTest extends CacheTestCase {
static volatile boolean callbackFailure;
- public Bug34387DUnitTest(String name) {
- super(name);
+ public Bug34387DUnitTest() {
+ super();
}
protected static void callbackAssertEquals(String message, Object expected,
@@ -115,6 +125,7 @@ public class Bug34387DUnitTest extends CacheTestCase {
/**
* test create followed by localDestroy
*/
+ @Test
public void testCreateAndLD() throws CacheException {
initOtherId();
AttributesFactory af = new AttributesFactory();
@@ -144,6 +155,7 @@ public class Bug34387DUnitTest extends CacheTestCase {
/**
* test create followed by localInvalidate
*/
+ @Test
public void testCreateAndLI() throws CacheException {
initOtherId();
AttributesFactory af = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
index b754905..2a902b5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -41,10 +50,11 @@ import com.gemstone.gemfire.test.dunit.VM;
*
* @since 5.0
*/
-public class Bug34948DUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class Bug34948DUnitTest extends JUnit4CacheTestCase {
- public Bug34948DUnitTest(String name) {
- super(name);
+ public Bug34948DUnitTest() {
+ super();
}
////////////////////// Test Methods //////////////////////
@@ -98,6 +108,7 @@ public class Bug34948DUnitTest extends CacheTestCase {
* Make sure that value is only deserialized in cache whose application
* asks for the value.
*/
+ @Test
public void testBug34948() throws CacheException {
final AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
index e90227a..ecf5625 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheException;
@@ -43,7 +52,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
*
* @since 5.0
*/
-public class Bug35214DUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class Bug35214DUnitTest extends JUnit4CacheTestCase {
protected volatile int expirationCount = 0;
@@ -51,8 +61,8 @@ public class Bug35214DUnitTest extends CacheTestCase {
protected static volatile boolean callbackFailure;
- public Bug35214DUnitTest(String name) {
- super(name);
+ public Bug35214DUnitTest() {
+ super();
}
private VM getOtherVm() {
@@ -148,6 +158,7 @@ public class Bug35214DUnitTest extends CacheTestCase {
/**
* make sure entries do not expire during a GII
*/
+ @Test
public void testNoEntryExpireDuringGII() throws Exception {
initOtherVm();
AsyncInvocation updater = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
index 1c4b95d..d00fbc6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -40,10 +49,11 @@ import com.gemstone.gemfire.test.dunit.VM;
*
* @since 5.0
*/
-public class Bug38013DUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class Bug38013DUnitTest extends JUnit4CacheTestCase {
- public Bug38013DUnitTest(String name) {
- super(name);
+ public Bug38013DUnitTest() {
+ super();
}
////////////////////// Test Methods //////////////////////
@@ -100,6 +110,7 @@ public class Bug38013DUnitTest extends CacheTestCase {
* Make sure that value is only deserialized in cache whose application
* asks for the value.
*/
+ @Test
public void testBug38013() throws CacheException {
final AttributesFactory factory = new AttributesFactory();
PartitionAttributesFactory paf = new PartitionAttributesFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
index 0705dd9..15e008b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -32,10 +41,11 @@ import com.gemstone.gemfire.cache.RegionAttributes;
*
* @since 3.0
*/
-public class CacheCloseDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CacheCloseDUnitTest extends JUnit4CacheTestCase {
- public CacheCloseDUnitTest(String name) {
- super(name);
+ public CacheCloseDUnitTest() {
+ super();
}
private RegionAttributes createAtts(List callbacks) {
@@ -72,6 +82,7 @@ public class CacheCloseDUnitTest extends CacheTestCase {
////////////////////// Test Methods //////////////////////
+ @Test
public void testCallbacksClosed() throws CacheException {
{
List callbacks = new ArrayList();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
index 92e5bdf..697b760 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheListener;
@@ -39,8 +48,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
public abstract class CacheListenerTestCase
extends CacheLoaderTestCase {
- public CacheListenerTestCase(String name) {
- super(name);
+ public CacheListenerTestCase() {
+ super();
}
/////////////////////// Test Methods ///////////////////////
@@ -49,6 +58,7 @@ public abstract class CacheListenerTestCase
* Tests that the <code>CacheListener</code> is called after an entry
* is {@linkplain CacheListener#afterCreate created}.
*/
+ @Test
public void testCacheListenerAfterCreate() throws CacheException {
String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -102,6 +112,7 @@ public abstract class CacheListenerTestCase
* Tests that the <code>CacheListener</code> is called after an entry
* is {@linkplain CacheListener#afterUpdate updated}.
*/
+ @Test
public void testCacheListenerAfterUpdate() throws CacheException {
String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -168,6 +179,7 @@ public abstract class CacheListenerTestCase
* Tests that the <code>CacheListener</code> is called after an
* entry is {@linkplain CacheListener#afterDestroy destroyed}.
*/
+ @Test
public void testCacheListenerAfterDestroy() throws CacheException {
String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -212,6 +224,7 @@ public abstract class CacheListenerTestCase
* Tests that the <code>CacheListener</code> is called after an
* entry is {@linkplain CacheListener#afterInvalidate invalidated}.
*/
+ @Test
public void testCacheListenerAfterInvalidate() throws CacheException {
String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -258,6 +271,7 @@ public abstract class CacheListenerTestCase
assertFalse(listener.wasInvoked());
}
+ @Test
public void testCacheListenerAfterInvalidateWithForce() throws CacheException {
AbstractRegionMap.FORCE_INVALIDATE_EVENT = true;
try {
@@ -321,6 +335,7 @@ public abstract class CacheListenerTestCase
* @see CacheListener#afterRegionDestroy
* @see CacheListener#close
*/
+ @Test
public void testCacheListenerAfterRegionDestroy()
throws CacheException,InterruptedException {
@@ -381,6 +396,7 @@ public abstract class CacheListenerTestCase
* @see CacheListener#afterRegionInvalidate
* @see CacheListener#close
*/
+ @Test
public void testCacheListenerAfterRegionInvalidate()
throws CacheException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
index 21e7a7e..90a129c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheLoader;
@@ -40,12 +49,13 @@ import com.gemstone.gemfire.test.dunit.Wait;
public abstract class CacheLoaderTestCase
extends CacheWriterTestCase {
- public CacheLoaderTestCase(String name) {
- super(name);
+ public CacheLoaderTestCase() {
+ super();
}
/////////////////////// Test Methods ///////////////////////
+ @Test
public void testCacheLoader() throws CacheException {
final String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -183,6 +193,7 @@ public abstract class CacheLoaderTestCase
* Tests what happens when a {@link CacheLoader} returns
* <code>null</code> from its {@link CacheLoader#load load} method.
*/
+ @Test
public void testCacheLoaderNull() throws CacheException {
TestCacheLoader loader = new TestCacheLoader() {
public Object load2(LoaderHelper helper)
@@ -208,6 +219,7 @@ public abstract class CacheLoaderTestCase
* Tests that a <code>CacheWriter</code> gets invoked on a
* <code>load</code>.
*/
+ @Test
public void testCacheWriterOnLoad() throws CacheException {
final String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -269,6 +281,7 @@ public abstract class CacheLoaderTestCase
* Tests that a <code>CacheListener</code> gets invoked on a
* <code>load</code>.
*/
+ @Test
public void testCacheListenerOnLoad()
throws CacheException, InterruptedException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
index 3a96728..d9320e6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
@@ -37,10 +46,11 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
*
* @since 6.5
*/
-public class CacheLogRollDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CacheLogRollDUnitTest extends JUnit4CacheTestCase {
- public CacheLogRollDUnitTest(String name) {
- super(name);
+ public CacheLogRollDUnitTest() {
+ super();
}
////////////////////// Test Methods //////////////////////
@@ -219,6 +229,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
}
}
+ @Test
public void testDiskSpace() throws Exception {
Properties props = new Properties();
String baseLogName = "diskarito";
@@ -238,6 +249,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-674: possible disk pollution, file size sensitive
+ @Test
public void testSimpleStartRestartWithRolling() throws Exception {
Properties props = new Properties();
String baseLogName = "restarto";
@@ -298,6 +310,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-677: possible disk pollution, file size sensitive
+ @Test
public void testStartWithRollingThenRestartWithRolling() throws Exception {
Properties props = new Properties();
String baseLogName = "biscuits";
@@ -374,6 +387,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-676: possible disk pollution, file size sensitive
+ @Test
public void testLogFileLayoutAndRolling() throws Exception {
String baseLogName = "tacos";
Properties props = new Properties();
@@ -408,6 +422,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-675: possible disk pollution, file size sensitive
+ @Test
public void testSecurityLogFileLayoutAndRolling() throws Exception {
String baseLogName = "securitytacos";
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
index 56f0261..0e75939 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
@@ -22,6 +22,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Properties;
import java.util.Set;
@@ -42,7 +51,8 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.VM;
-public class CacheMapTxnDUnitTest extends DistributedTestCase{
+@Category(DistributedTest.class)
+public class CacheMapTxnDUnitTest extends JUnit4DistributedTestCase{
protected static Cache cache;
protected static Properties props = new Properties();
@@ -52,8 +62,8 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
protected static CacheTransactionManager cacheTxnMgr;
/** Creates a new instance of CacheMapTxnDUnitTest */
- public CacheMapTxnDUnitTest(String name) {
- super(name);
+ public CacheMapTxnDUnitTest() {
+ super();
}
@Override
@@ -82,7 +92,7 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
try{
// props.setProperty("mcast-port", "1234");
// ds = DistributedSystem.connect(props);
- ds = (new CacheMapTxnDUnitTest("temp")).getSystem(props);
+ ds = (new CacheMapTxnDUnitTest()).getSystem(props);
cache = CacheFactory.create(ds);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -104,21 +114,24 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
}
}
- public void testCommitTxn() {
+ @Test
+ public void testCommitTxn() {
//this is to test single VM region transactions
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> CacheMapTxnDUnitTest.commitTxn());
}//end of testCommitTxn
- public void testRollbackTxn() {
+ @Test
+ public void testRollbackTxn() {
//this is to test single VM region transactions
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> CacheMapTxnDUnitTest.rollbackTxn());
}//end of testRollbackTxn
- public void testRollbackTxnClear() {
+ @Test
+ public void testRollbackTxnClear() {
//this is to test single VM region transactions
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -143,7 +156,8 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
}
}//end of testRollbackTxnClear
- public void testMiscMethods() throws Throwable{
+ @Test
+ public void testMiscMethods() throws Throwable{
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
index 1efae19..25056a1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import java.util.Properties;
@@ -37,16 +46,18 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-public class CacheRegionsReliablityStatsCheckDUnitTest extends CacheTestCase {
- public CacheRegionsReliablityStatsCheckDUnitTest(String name) {
- super(name);
+@Category(DistributedTest.class)
+public class CacheRegionsReliablityStatsCheckDUnitTest extends JUnit4CacheTestCase {
+ public CacheRegionsReliablityStatsCheckDUnitTest() {
+ super();
}
/**The tests check to see if all the reliablity stats are working
* fine and asserts their values to constants.
*
* */
- public void testRegionsReliablityStats() throws Exception, RegionExistsException{
+ @Test
+ public void testRegionsReliablityStats() throws Exception, RegionExistsException{
final String rr1 = "roleA";
final String regionNoAccess = "regionNoAccess";
final String regionLimitedAccess = "regionLimitedAccess";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
index 18bb79f..3b57fde 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheStatistics;
@@ -36,10 +45,11 @@ import com.gemstone.gemfire.test.dunit.Wait;
*
* @since 3.0
*/
-public class CacheStatisticsDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CacheStatisticsDUnitTest extends JUnit4CacheTestCase {
- public CacheStatisticsDUnitTest(String name) {
- super(name);
+ public CacheStatisticsDUnitTest() {
+ super();
}
//////// Helper Methods
@@ -71,6 +81,7 @@ public class CacheStatisticsDUnitTest extends CacheTestCase {
* {@link CacheStatistics#getMissCount miss count} are updated
* properly for a local region and its entries.
*/
+ @Test
public void testHitMissCount() throws CacheException {
String name = this.getUniqueName();
Object key = "KEY"; // value exists
@@ -182,6 +193,7 @@ public class CacheStatisticsDUnitTest extends CacheTestCase {
* and its entries. It also validates that the last modification
* and last access times are propagated to parent regions.
*/
+ @Test
public void testTimeStats() throws CacheException, InterruptedException
{
final long ESTAT_RES = 100; // the resolution, in ms, of entry stats
@@ -325,6 +337,7 @@ public class CacheStatisticsDUnitTest extends CacheTestCase {
* time}. It also validates that distributed operations do not
* affect the hit and miss counts in remote caches.
*/
+ @Test
public void testDistributedStats() {
final String name = this.getUniqueName();
final Object key = "KEY";
@@ -483,6 +496,7 @@ public class CacheStatisticsDUnitTest extends CacheTestCase {
* Tests that an attempt to get statistics when they are disabled
* results in a {@link StatisticsDisabledException}.
*/
+ @Test
public void testDisabledStatistics() throws CacheException {
String name = this.getUniqueName();
Object key = "KEY";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
index 8af2089..670f9ca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.*;
//import com.gemstone.gemfire.cache.util.*;
//import java.util.*;
@@ -32,8 +41,8 @@ import com.gemstone.gemfire.cache.*;
public abstract class CacheWriterTestCase
extends RegionAttributesTestCase {
- public CacheWriterTestCase(String name) {
- super(name);
+ public CacheWriterTestCase() {
+ super();
}
/////////////////////// Test Methods ///////////////////////
@@ -42,6 +51,7 @@ public abstract class CacheWriterTestCase
* Tests that the <code>CacheWriter</code> is called before an entry
* is {@linkplain CacheWriter#beforeCreate created}.
*/
+ @Test
public void testCacheWriterBeforeCreate() throws CacheException {
String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -130,6 +140,7 @@ public abstract class CacheWriterTestCase
* Tests that the <code>CacheWriter</code> is called before an entry
* is {@linkplain CacheWriter#beforeUpdate updated}.
*/
+ @Test
public void testCacheWriterBeforeUpdate() throws CacheException {
String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -238,6 +249,7 @@ public abstract class CacheWriterTestCase
* Tests that the <code>CacheWriter</code> is called before an entry
* is {@linkplain CacheWriter#beforeDestroy destroyed}.
*/
+ @Test
public void testCacheWriterBeforeDestroy() throws CacheException {
String name = this.getUniqueName();
final Object key = this.getUniqueName();
@@ -311,6 +323,7 @@ public abstract class CacheWriterTestCase
* @see CacheWriter#beforeRegionDestroy
* @see CacheWriter#close
*/
+ @Test
public void testCacheWriterBeforeRegionDestroy()
throws CacheException {
@@ -392,6 +405,7 @@ public abstract class CacheWriterTestCase
* Tests that a <code>CacheWriter</code> is <I>not</I> invoked on a
* {@linkplain Region#localDestroyRegion local destroy}.
*/
+ @Test
public void testCacheWriterLocalDestroy() throws CacheException {
final String name = this.getUniqueName();
@@ -410,6 +424,7 @@ public abstract class CacheWriterTestCase
* Tests that a {@link CacheWriter} throwing a {@link
* CacheWriterException} aborts the operation.
*/
+ @Test
public void testCacheWriterExceptionAborts() throws CacheException {
final String name = this.getUniqueName();
final String exception = "EXCEPTION";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
index 5b16a81..fcd37b1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache30;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.MirrorType;
import com.gemstone.gemfire.cache.Scope;
@@ -31,12 +40,13 @@ import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
*
* @since 4.0
*/
+@Category(DistributedTest.class)
public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
//////// Constructors
- public CacheXml40DUnitTest(String name) {
- super(name);
+ public CacheXml40DUnitTest() {
+ super();
}
//////// Helper methods
@@ -52,6 +62,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
*
* @since 4.0
*/
+ @Test
public void testServer() {
CacheCreation cache = new CacheCreation();
cache.setIsServer(true);
@@ -65,6 +76,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
*
* @since 4.0
*/
+ @Test
public void testBridgeServers() {
CacheCreation cache = new CacheCreation();
@@ -90,6 +102,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
/**
* Tests the is-lock-grantor attribute in xml.
*/
+ @Test
public void testIsLockGrantorAttribute() throws CacheException {
CacheCreation cache = new CacheCreation();
@@ -110,6 +123,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
*
* @since 4.0
*/
+ @Test
public void testTransactionListener() {
CacheCreation cache = new CacheCreation();
CacheTransactionManagerCreation txMgrCreation = new CacheTransactionManagerCreation();
@@ -123,6 +137,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
*
* @since 4.0
*/
+ @Test
public void testCacheTransactionManager() {
CacheCreation cache = new CacheCreation();
CacheTransactionManagerCreation txMgrCreation = new CacheTransactionManagerCreation();
@@ -136,6 +151,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
*
* @since 4.1
*/
+ @Test
public void testConstrainedValues() throws CacheException {
CacheCreation cache = new CacheCreation();
RegionAttributesCreation attrs = new RegionAttributesCreation(cache);