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:49 UTC
[24/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/dunit/CompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
index 611c461..44ffde9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -15,6 +15,15 @@
* limitations under the License.
*/
package com.gemstone.gemfire.cache.query.dunit;
+
+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;
@@ -36,13 +45,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
-public class CompactRangeIndexDUnitTest extends DistributedTestCase{
+@Category(DistributedTest.class)
+public class CompactRangeIndexDUnitTest extends JUnit4DistributedTestCase{
QueryTestUtils utils;
VM vm0;
- public CompactRangeIndexDUnitTest(String name) {
- super(name);
+ public CompactRangeIndexDUnitTest() {
+ super();
}
@Override
@@ -65,6 +75,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
/*
* Tests that the message component of the exception is not null
*/
+ @Test
public void testIndexInvalidDueToExpressionOnPartitionedRegion() throws Exception {
Host host = Host.getHost(0);
utils.createPartitionRegion("examplePartitionedRegion", Portfolio.class, vm0);
@@ -84,6 +95,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
}
+ @Test
public void testCompactRangeIndexForIndexElemArray() throws Exception{
doPut(200);// around 66 entries for a key in the index (< 100 so does not create a ConcurrentHashSet)
doQuery();
@@ -94,6 +106,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
Thread.sleep(5000);
}
+ @Test
public void testCompactRangeIndexForConcurrentHashSet() throws Exception{
doPut(333); //111 entries for a key in the index (> 100 so creates a ConcurrentHashSet)
doQuery();
@@ -103,6 +116,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
doQuery();
}
+ @Test
public void testNoSuchElemException() throws Exception{
setHook();
doPutSync(300);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
index b005463..c213558 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.cache.query.dunit;
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 org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
@@ -39,10 +48,11 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
*
*/
@Category(DistributedTest.class)
+@Category(DistributedTest.class)
public class GroupByPartitionedQueryDUnitTest extends GroupByDUnitImpl {
- public GroupByPartitionedQueryDUnitTest(String name) {
- super(name);
+ public GroupByPartitionedQueryDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
index b9ff7cb..ac8c5da 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/GroupByQueryDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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.Iterator;
import org.junit.experimental.categories.Category;
@@ -47,12 +56,14 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
*
*/
@Category(DistributedTest.class)
-public class GroupByQueryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class GroupByQueryDUnitTest extends JUnit4CacheTestCase {
- public GroupByQueryDUnitTest(String name) {
- super(name);
+ public GroupByQueryDUnitTest() {
+ super();
}
+ @Test
public void testConvertibleGroupByNoIndex() throws Exception {
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
index 95a2580..070707a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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 com.gemstone.gemfire.cache.CacheException;
@@ -30,13 +39,14 @@ import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-public class HashIndexDUnitTest extends DistributedTestCase{
+@Category(DistributedTest.class)
+public class HashIndexDUnitTest extends JUnit4DistributedTestCase{
QueryTestUtils utils;
VM vm0;
- public HashIndexDUnitTest(String name) {
- super(name);
+ public HashIndexDUnitTest() {
+ super();
}
@Override
@@ -57,6 +67,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
}
+ @Test
public void testHashIndexForIndexElemArray() throws Exception{
doPut(200);// around 66 entries for a key in the index (< 100 so does not create a ConcurrentHashSet)
doQuery();
@@ -67,6 +78,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
Thread.sleep(5000);
}
+ @Test
public void testHashIndexForConcurrentHashSet() throws Exception{
doPut(333); //111 entries for a key in the index (> 100 so creates a ConcurrentHashSet)
doQuery();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
index 05f3ba1..0dbe297 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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.Cache;
import com.gemstone.gemfire.cache.query.Index;
import com.gemstone.gemfire.cache.query.IndexExistsException;
@@ -28,14 +37,15 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
+public abstract class NonDistinctOrderByDUnitImpl extends JUnit4CacheTestCase {
- public NonDistinctOrderByDUnitImpl(String name) {
- super(name);
+ public NonDistinctOrderByDUnitImpl() {
+ super();
}
protected abstract NonDistinctOrderByTestImplementation createTestInstance();
+ @Test
public void testOrderByWithIndexResultDefaultProjection() throws Exception {
Host host = Host.getHost(0);
final VM vm0 = host.getVM(0);
@@ -48,6 +58,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testOrderByWithIndexResultWithProjection() throws Exception {
Host host = Host.getHost(0);
final VM vm0 = host.getVM(0);
@@ -60,6 +71,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testMultiColOrderByWithIndexResultDefaultProjection()
throws Exception {
Host host = Host.getHost(0);
@@ -73,6 +85,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testMultiColOrderByWithIndexResultWithProjection()
throws Exception {
Host host = Host.getHost(0);
@@ -86,6 +99,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testMultiColOrderByWithMultiIndexResultDefaultProjection()
throws Exception {
Host host = Host.getHost(0);
@@ -99,6 +113,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testMultiColOrderByWithMultiIndexResultProjection()
throws Exception {
Host host = Host.getHost(0);
@@ -112,6 +127,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testLimitNotAppliedIfOrderByNotUsingIndex() throws Exception {
Host host = Host.getHost(0);
final VM vm0 = host.getVM(0);
@@ -124,6 +140,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testOrderByWithNullValues() throws Exception {
Host host = Host.getHost(0);
final VM vm0 = host.getVM(0);
@@ -136,6 +153,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testOrderByWithNullValuesUseIndex() throws Exception {
Host host = Host.getHost(0);
final VM vm0 = host.getVM(0);
@@ -148,6 +166,7 @@ public abstract class NonDistinctOrderByDUnitImpl extends CacheTestCase {
this.closeCache(vm0, vm1, vm2, vm3);
}
+ @Test
public void testOrderByForUndefined() throws Exception {
Host host = Host.getHost(0);
final 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/dunit/NonDistinctOrderByPartitionedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
index 619a29b..9a80caf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
@@ -17,6 +17,15 @@
package com.gemstone.gemfire.cache.query.dunit;
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 org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
@@ -40,11 +49,12 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
*
*/
@Category(DistributedTest.class)
+@Category(DistributedTest.class)
public class NonDistinctOrderByPartitionedDUnitTest extends
NonDistinctOrderByDUnitImpl {
- public NonDistinctOrderByPartitionedDUnitTest(String name) {
- super(name);
+ public NonDistinctOrderByPartitionedDUnitTest() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index 3e746e7..db1c7e3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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.util.HashMap;
import java.util.Map;
@@ -42,10 +51,11 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.util.test.TestUtil;
@Category(DistributedTest.class)
-public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionCompactRangeIndexDUnitTest extends JUnit4DistributedTestCase {
- public PartitionedRegionCompactRangeIndexDUnitTest(String name) {
- super(name);
+ public PartitionedRegionCompactRangeIndexDUnitTest() {
+ super();
}
private Properties getSystemProperties(String cacheXML) {
@@ -71,6 +81,7 @@ public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTest
}
@Test
+ @Test
public void testGIIUpdateWithIndexDoesNotDuplicateEntryInIndexWhenAlreadyRecoveredFromPersistence() 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/dunit/PdxStringQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
index 0498a79..efa63fb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -15,6 +15,15 @@
* limitations under the License.
*/
package com.gemstone.gemfire.cache.query.dunit;
+
+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.IOException;
import java.util.HashMap;
@@ -72,11 +81,12 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-public class PdxStringQueryDUnitTest extends CacheTestCase{
+@Category(DistributedTest.class)
+public class PdxStringQueryDUnitTest extends JUnit4CacheTestCase{
private static int bridgeServerPort;
- public PdxStringQueryDUnitTest(String name) {
- super(name);
+ public PdxStringQueryDUnitTest() {
+ super();
}
private final String rootRegionName = "root";
@@ -117,6 +127,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
"SELECT distinct pos.secIdIndexed FROM " + regName + " p, p.positions.values pos WHERE p.ID > 1 order by pos.secIdIndexed limit 5",//12
};
+ @Test
public void testReplicatedRegionNoIndex() throws CacheException {
final Host host = Host.getHost(0);
VM server0 = host.getVM(0);
@@ -375,6 +386,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
this.closeClient(server0);
}
+ @Test
public void testRepliacatedRegionCompactRangeIndex() throws CacheException {
final Host host = Host.getHost(0);
VM server0 = host.getVM(0);
@@ -589,6 +601,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
this.closeClient(server0);
}
+ @Test
public void testReplicatedRegionRangeIndex() throws CacheException {
final Host host = Host.getHost(0);
VM server0 = host.getVM(0);
@@ -793,6 +806,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
this.closeClient(server0);
}
+ @Test
public void testPartitionRegionNoIndex() throws CacheException {
final Host host = Host.getHost(0);
VM server0 = host.getVM(0);
@@ -1058,6 +1072,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
this.closeClient(server0);
}
+ @Test
public void testPartitionRegionCompactRangeIndex() throws CacheException {
final Host host = Host.getHost(0);
VM server0 = host.getVM(0);
@@ -1285,6 +1300,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
this.closeClient(server0);
}
+ @Test
public void testPartitionRegionRangeIndex() throws CacheException {
final Host host = Host.getHost(0);
VM server0 = host.getVM(0);
@@ -1512,6 +1528,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
this.closeClient(server0);
}
+ @Test
public void testNullPdxString() throws CacheException {
final Host host = Host.getHost(0);
VM server0 = host.getVM(0);
@@ -1794,6 +1811,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
*
* @throws CacheException
*/
+ @Test
public void testPRQueryForDuplicates() throws CacheException {
final String regionName = "exampleRegion";
final Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 475ad49..5513585 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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 org.junit.experimental.categories.Category;
@@ -57,7 +66,8 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
* This tests the data inconsistency during update on an index and querying the
* same UNLOCKED index.
*/
-public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
private static final int cnt = 0;
@@ -88,8 +98,8 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
/**
* @param name
*/
- public QueryDataInconsistencyDUnitTest(String name) {
- super(name);
+ public QueryDataInconsistencyDUnitTest() {
+ super();
}
@Override
@@ -104,6 +114,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
server = host.getVM(0);
}
+ @Test
public void testCompactRangeIndex() {
// Create caches
Properties props = new Properties();
@@ -199,6 +210,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
ThreadUtils.join(putThread, 200);
}
+ @Test
public void testRangeIndex() {
// Create caches
Properties props = new Properties();
@@ -294,6 +306,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-925: time sensitive, async actions, short timeouts
+ @Test
public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch() { // TODO: fix misspelling
// Create caches
Properties props = new Properties();
@@ -384,6 +397,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
ThreadUtils.join(putThread, 200); // GEODE-925 occurs here and this is very short join 200 millis
}
+ @Test
public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch2() {
// Create caches
Properties props = new Properties();
@@ -475,7 +489,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
public static void createProxyRegions() {
- new QueryDataInconsistencyDUnitTest("temp").createProxyRegs();
+ new QueryDataInconsistencyDUnitTest().createProxyRegs();
}
private void createProxyRegs() {
@@ -488,7 +502,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
public static void createNewPR() {
- new QueryDataInconsistencyDUnitTest("temp").createPR();
+ new QueryDataInconsistencyDUnitTest().createPR();
}
public void createPR() {
PartitionResolver testKeyBasedResolver = new QueryAPITestPartitionResolver();
@@ -504,7 +518,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
public static void createCacheClientWithoutRegion(String host, Integer port1) {
- new QueryDataInconsistencyDUnitTest("temp").createCacheClientWithoutReg(
+ new QueryDataInconsistencyDUnitTest().createCacheClientWithoutReg(
host, port1);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 6e4ed11..309f381 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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.util.ArrayList;
import java.util.Collection;
@@ -75,7 +84,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.util.test.TestUtil;
-public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase {
static private final String WAIT_PROPERTY = "QueryIndexBuckets.maxWaitTime";
@@ -129,8 +139,8 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
private String persistentOverFlowRegName = "PersistentOverflowPortfolios";
/** Creates a new instance of QueryIndexUsingXMLDUnitTest */
- public QueryIndexUsingXMLDUnitTest(String name) {
- super(name);
+ public QueryIndexUsingXMLDUnitTest() {
+ super();
}
@Override
@@ -150,6 +160,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creates partitioned index from an xml description.
*/
+ @Test
public void testCreateIndexThroughXML() throws Exception
{
@@ -217,6 +228,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creates partitioned index from an xml description.
*/
+ @Test
public void testCreateIndexWhileDoingGII() throws Exception
{
@@ -272,6 +284,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creates partitioned index from an xml description.
*/
+ @Test
public void testReplicatedRegionCreateIndexWhileDoingGII() throws Exception
{
@@ -320,6 +333,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creates persistent partitioned index from an xml description.
*/
+ @Test
public void testPersistentPRRegionCreateIndexWhileDoingGII() throws Exception
{
@@ -385,6 +399,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creates partitioned index from an xml description.
*/
+ @Test
public void testCreateIndexWhileDoingGIIWithEmptyPRRegion() throws Exception
{
@@ -422,6 +437,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creats partitioned index from an xml discription.
*/
+ @Test
public void testCreateAsyncIndexWhileDoingGII() throws Exception
{
@@ -468,6 +484,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creates indexes and compares the results between index and non-index results.
*/
+ @Test
public void testCreateIndexWhileDoingGIIAndCompareQueryResults() throws Exception
{
@@ -531,6 +548,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
/**
* Creates async partitioned index from an xml description.
*/
+ @Test
public void testCreateAsyncIndexWhileDoingGIIAndQuery() throws Exception
{
@@ -625,6 +643,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
vm1.invoke(close());
}
+ @Test
public void testIndexCreationForReplicatedPersistentOverFlowRegionOnRestart() throws Exception
{
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index cf55579..5287dcd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
@@ -42,14 +51,16 @@ import org.junit.Ignore;
*
*
*/
-public class QueryParamsAuthorizationDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class QueryParamsAuthorizationDUnitTest extends JUnit4CacheTestCase {
private final String regName = "exampleRegion";
- public QueryParamsAuthorizationDUnitTest(String name) {
- super(name);
+ public QueryParamsAuthorizationDUnitTest() {
+ super();
}
+ @Test
public void testNothing() {
// remove when Bug #51079 is fixed
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 1d60010..2505bbc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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.util.ArrayList;
@@ -74,7 +83,8 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
* (routing keys) to run the query on subset of buckets "locally". If query
* includes buckets
*/
-public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
private static final int cnt = 0;
@@ -130,8 +140,8 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
/**
* @param name
*/
- public QueryUsingFunctionContextDUnitTest(String name) {
- super(name);
+ public QueryUsingFunctionContextDUnitTest() {
+ super();
}
@Override
@@ -161,6 +171,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
/**
* Test on Replicated Region.
*/
+ @Test
public void testQueriesWithFilterKeysOnReplicatedRegion() {
IgnoredException.addIgnoredException("IllegalArgumentException");
@@ -197,6 +208,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
/**
* Test on PR on one server only using filter.
*/
+ @Test
public void testQueriesWithFilterKeysOnPRLocal() {
client.invoke(new CacheSerializableRunnable("Test query on client and server") {
@@ -211,7 +223,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
TestServerQueryFunction func = new TestServerQueryFunction("LDS Server function-1");
function = new TestQueryFunction("queryFunction-1");
- QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest("test");
+ QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest();
ArrayList queryResults2 = test.runQueryOnClientUsingFunc(function, PartitionedRegionName1, filter, queries[i]);
if (queryResults2 == null)
fail(queries[i] +"result is null from client function");
@@ -230,6 +242,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
+ @Test
public void testInvalidQueries() {
IgnoredException.addIgnoredException("Syntax error");
@@ -242,7 +255,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
String query = "select * from / " + repRegionName + " where ID>=0";
TestServerQueryFunction func = new TestServerQueryFunction("LDS Server function-1");
function = new TestQueryFunction("queryFunction-1");
- QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest("test");
+ QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest();
try {
test.runQueryOnClientUsingFunc(function, repRegionName, filter, query);
fail("Query execution should have failed.");
@@ -253,7 +266,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
query = "select * from / " + PartitionedRegionName1 + " where ID>=0";
func = new TestServerQueryFunction("LDS Server function-1");
function = new TestQueryFunction("queryFunction-1");
- test = new QueryUsingFunctionContextDUnitTest("test");
+ test = new QueryUsingFunctionContextDUnitTest();
try {
test.runQueryOnClientUsingFunc(function, PartitionedRegionName1, filter, query);
fail("Query execution should have failed.");
@@ -268,6 +281,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
/**
*
*/
+ @Test
public void testQueriesWithFilterKeysOnPRLocalAndRemote() {
client.invoke(new CacheSerializableRunnable("Test query on client and server") {
@@ -282,7 +296,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
for (int i=0; i< queries.length; i++) {
Object[][] r = new Object[1][2];
- QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest("test");
+ QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest();
ArrayList queryResults2 = test.runQueryOnClientUsingFunc(function, PartitionedRegionName1, filter, queries[i]);
if (queryResults2 == null)
fail(queries[i] +"result is null from client function");
@@ -303,7 +317,8 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
/**
*
*/
- public void testQueriesWithFilterKeysOnPRLocalAndRemoteWithBucketDestroy() {
+ @Test
+ public void testQueriesWithFilterKeysOnPRLocalAndRemoteWithBucketDestroy() {
// Set Query Observer in cache on server1
server1.invoke(new CacheSerializableRunnable("Set QueryObserver in cache on server1") {
@@ -342,7 +357,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
for (int i=0; i< queries.length; i++) {
- QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest("test");
+ QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest();
ArrayList queryResults2 = test.runQueryOnClientUsingFunc(function, PartitionedRegionName1, filter, queries[i]);
// The Partition Region has 20 buckets with 100 values and key i goes in bucket j=(i%20)
@@ -366,6 +381,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
/**
*
*/
+ @Test
public void testQueriesWithFilterKeysOnPRWithBucketDestroy() {
IgnoredException.addIgnoredException("QueryInvocationTargetException");
Object[][] r = new Object[queries.length][2];
@@ -436,6 +452,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-575: ignores lots of exceptions, non-thread-safe test hooks
+ @Test
public void testQueriesWithFilterKeysOnPRWithRebalancing() {
IgnoredException.addIgnoredException("QueryInvocationTargetException");
IgnoredException.addIgnoredException("java.net.SocketException");
@@ -515,7 +532,8 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
- public void testNonColocatedRegionQueries() {
+ @Test
+ public void testNonColocatedRegionQueries() {
IgnoredException.addIgnoredException("UnsupportedOperationException");
client.invoke(new CacheSerializableRunnable("Test query on non-colocated regions on server") {
@Override
@@ -525,7 +543,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
for (int i=0; i< nonColocatedQueries.length; i++) {
function = new TestQueryFunction("queryFunction-1");
- QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest("test");
+ QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest();
try {
ArrayList queryResults2 = test.runQueryOnClientUsingFunc(function, PartitionedRegionName1, filter, nonColocatedQueries[i]);
fail("Function call did not fail for query with function context");
@@ -540,7 +558,8 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
- public void testJoinQueryPRWithMultipleIndexes(){
+ @Test
+ public void testJoinQueryPRWithMultipleIndexes(){
server1.invoke(new CacheSerializableRunnable("Test query with indexes") {
@@ -549,7 +568,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
Set filter = getFilter(0, 1);
function = new TestQueryFunction("queryFunction-2");
Object[][] r = new Object[2][2];
- QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest("test");
+ QueryUsingFunctionContextDUnitTest test = new QueryUsingFunctionContextDUnitTest();
int j = 0;
for (int i=3; i< 5; i++) {
ArrayList queryResults2 = test.runQueryOnClientUsingFunc(function, PartitionedRegionName1, filter, queries[i]);
@@ -744,7 +763,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
public static void createProxyRegions() {
- new QueryUsingFunctionContextDUnitTest("temp").createProxyRegs();
+ new QueryUsingFunctionContextDUnitTest().createProxyRegs();
}
private void createProxyRegs() {
@@ -766,7 +785,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
public static void createLocalRegion() {
- new QueryUsingFunctionContextDUnitTest("temp").createLocalReg();
+ new QueryUsingFunctionContextDUnitTest().createLocalReg();
}
public void createLocalReg() {
cache = CacheFactory.getAnyInstance();
@@ -774,7 +793,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
public static void createReplicatedRegion() {
- new QueryUsingFunctionContextDUnitTest("temp").createRR();
+ new QueryUsingFunctionContextDUnitTest().createRR();
}
public void createRR() {
cache = CacheFactory.getAnyInstance();
@@ -782,7 +801,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
public static void createColocatedPR() {
- new QueryUsingFunctionContextDUnitTest("temp").createColoPR();
+ new QueryUsingFunctionContextDUnitTest().createColoPR();
}
public void createColoPR() {
PartitionResolver testKeyBasedResolver = new QueryAPITestPartitionResolver();
@@ -837,7 +856,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
public static void createCacheClientWithoutRegion(String host, Integer port1, Integer port2, Integer port3) {
- new QueryUsingFunctionContextDUnitTest("temp").createCacheClientWithoutReg(host, port1, port2, port3);
+ new QueryUsingFunctionContextDUnitTest().createCacheClientWithoutReg(host, port1, port2, port3);
}
private void createCacheClientWithoutReg(String host, Integer port1, Integer port2, Integer port3) {
this.disconnectFromDS();
@@ -853,7 +872,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
* received from client function execution.
*/
public static ArrayList runQueryOnServerLocalDataSet(String query, Set filter) {
- return new QueryUsingFunctionContextDUnitTest("temp").runQueryOnServerLDS(query, filter);
+ return new QueryUsingFunctionContextDUnitTest().runQueryOnServerLDS(query, filter);
}
protected ArrayList runQueryOnServerLDS(String queryStr, Set filter) {
@@ -880,7 +899,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
* Run query on server to compare the results received from client function execution.
*/
public static ArrayList runQueryOnServerRegion(String query) {
- return new QueryUsingFunctionContextDUnitTest("temp").runQueryOnServerReg(query);
+ return new QueryUsingFunctionContextDUnitTest().runQueryOnServerReg(query);
}
protected ArrayList runQueryOnServerReg(String queryStr) {
@@ -904,7 +923,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
* @return ArrayList of results
*/
public static ArrayList runQueryOnClientUsingFunction(Function function, String regionName, Set filter, String query) {
- return new QueryUsingFunctionContextDUnitTest("temp").runQueryOnClientUsingFunc(function, regionName, filter, query);
+ return new QueryUsingFunctionContextDUnitTest().runQueryOnClientUsingFunc(function, regionName, filter, query);
}
private ArrayList runQueryOnClientUsingFunc(Function func, String regionName, Set filter, String query) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index c8ae1de..bce6201 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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.DataSerializable;
import com.gemstone.gemfire.DataSerializer;
import com.gemstone.gemfire.cache.*;
@@ -52,7 +61,8 @@ import java.util.concurrent.TimeUnit;
*
* @since 5.0.1
*/
-public class QueryUsingPoolDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
/**
* The port on which the bridge server was started in this VM
@@ -78,8 +88,8 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Creates a new <code>GemFireMemberStatusDUnitTest</code>
*/
- public QueryUsingPoolDUnitTest(String name) {
- super(name);
+ public QueryUsingPoolDUnitTest() {
+ super();
}
//////// Test Methods
@@ -130,6 +140,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests remote import query execution.
*/
+ @Test
public void testRemoteImportQueries() throws CacheException {
final String name = this.getName();
@@ -248,6 +259,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests remote struct query execution.
*/
+ @Test
public void testRemoteStructQueries() throws CacheException {
final String name = this.getName();
@@ -370,6 +382,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests remote full region query execution.
*/
+ @Test
public void testRemoteFullRegionQueries() throws CacheException {
final String name = this.getName();
@@ -539,6 +552,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests client-server query using parameters (compiled queries).
*/
+ @Test
public void testClientServerQueriesWithParams() throws CacheException {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -647,6 +661,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests client-server query using parameters (compiled queries).
*/
+ @Test
public void testMulitipleClientServerQueriesWithParams() throws CacheException {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -762,6 +777,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests client-server compiled query register and cleanup.
*/
+ @Test
public void testClientServerCompiledQueryRegisterAndCleanup() throws CacheException {
final String name = this.getName();
@@ -820,6 +836,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests client-server compiled query register and cleanup.
*/
+ @Test
public void testClientServerCompiledQueryTimeBasedCleanup() throws CacheException {
final String name = this.getName();
@@ -903,6 +920,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
* It creates the client connections without the subscription
* enabled. This doesn't create any client proxy on the server.
*/
+ @Test
public void testClientServerCompiledQueryCleanup() throws CacheException {
final String name = this.getName();
@@ -996,6 +1014,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
* Tests client-server query using parameters (compiled queries).
*/
@Category(FlakyTest.class) // GEODE-1146: time senstiive, thread sleeps, uses zero port for servers (good!), async actions, AsyncInvocation orphans
+ @Test
public void testBindParamsWithMulitipleClients() throws CacheException {
final Host host = Host.getHost(0);
@@ -1118,6 +1137,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests remote join query execution.
*/
+ @Test
public void testRemoteJoinRegionQueries() throws CacheException {
final String name = this.getName();
@@ -1202,6 +1222,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
* Tests remote query execution using a BridgeClient as the CacheWriter
* and CacheLoader.
*/
+ @Test
public void testRemoteBridgeClientQueries() throws CacheException {
final String name = this.getName();
@@ -1295,6 +1316,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
* @throws Exception
*/
+ @Test
public void testBug36969() throws Exception {
final String name = this.getName();
final String rootRegionName = "root";
@@ -1366,6 +1388,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
/**
* Tests remote full region query execution.
*/
+ @Test
public void testRemoteSortQueriesUsingIndex() throws CacheException {
final String name = this.getName();
final String rootRegionName = "root";
@@ -1498,6 +1521,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
vm0.invoke("Stop CacheServer", () -> stopBridgeServer(getCache()));
}
+ @Test
public void testUnSupportedOps() throws Exception {
final String name = this.getName();
final String rootRegionName = "root";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 9b8ae0c..0d033b7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
+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;
@@ -61,13 +70,14 @@ import org.junit.experimental.categories.Category;
*
* @since 5.0.1
*/
-public class RemoteQueryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
private static int bridgeServerPort;
- public RemoteQueryDUnitTest(String name) {
- super(name);
+ public RemoteQueryDUnitTest() {
+ super();
}
//////// Test Methods
@@ -85,6 +95,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
/**
* Tests remote predicate query execution.
*/
+ @Test
public void testRemotePredicateQueries() throws CacheException {
final String name = this.getName();
@@ -228,6 +239,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
/**
* Tests remote import query execution.
*/
+ @Test
public void testRemoteImportQueries() throws CacheException {
final String name = this.getName();
@@ -356,6 +368,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
/**
* Tests remote struct query execution.
*/
+ @Test
public void testRemoteStructQueries() throws CacheException {
final String name = this.getName();
@@ -676,6 +689,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
/**
* Tests remote full region query execution.
*/
+ @Test
public void testRemoteFullRegionQueries() throws CacheException {
final String name = this.getName();
@@ -841,6 +855,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
/**
* Tests remote join query execution.
*/
+ @Test
public void testRemoteJoinRegionQueries() throws CacheException {
final String name = this.getName();
@@ -942,6 +957,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
* and CacheLoader.
*/
@Category(FlakyTest.class) // GEODE-490: random port
+ @Test
public void testRemoteBridgeClientQueries() throws CacheException {
final String name = this.getName();
@@ -1101,7 +1117,8 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
* @throws Exception
*/
- public void testBug36434() throws Exception
+ @Test
+ public void testBug36434() throws Exception
{
final String name = this.getName();
final Host host = Host.getHost(0);
@@ -1205,7 +1222,8 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
* @throws Exception
*/
- public void testBug36969() throws Exception
+ @Test
+ public void testBug36969() throws Exception
{
final String name = this.getName();
final Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index 4dc2890..1d044a6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.IOException;
import com.gemstone.gemfire.cache.AttributesFactory;
@@ -55,7 +64,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
/**
*
*/
-public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTestCase {
String name;
@@ -72,13 +82,14 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase
/**
* @param name
*/
- public ConcurrentIndexInitOnOverflowRegionDUnitTest(String name) {
- super(name);
+ public ConcurrentIndexInitOnOverflowRegionDUnitTest() {
+ super();
}
/**
*
*/
+ @Test
public void testAsyncIndexInitDuringEntryDestroyAndQueryOnRR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -187,6 +198,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase
/**
*
*/
+ @Test
public void testAsyncIndexInitDuringEntryPutUsingClientOnRR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -338,6 +350,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase
* This tests if index updates are blocked while region.clear() is
* called and indexes are being reinitialized.
*/
+ @Test
public void testIndexUpdateWithRegionClear() {
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
index 466483d..f537d8b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.Collection;
import java.util.Set;
@@ -56,6 +65,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
*
*
*/
+@Category(DistributedTest.class)
public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends
CacheTestCase {
@@ -66,13 +76,14 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends
/**
* @param name
*/
- public ConcurrentIndexOperationsOnOverflowRegionDUnitTest(String name) {
- super(name);
+ public ConcurrentIndexOperationsOnOverflowRegionDUnitTest() {
+ super();
}
/**
*
*/
+ @Test
public void testAsyncIndexInitDuringEntryDestroyAndQueryOnRR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -175,6 +186,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends
/**
*
*/
+ @Test
public void testAsyncIndexInitDuringEntryDestroyAndQueryOnPR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -277,6 +289,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends
/**
*
*/
+ @Test
public void testAsyncIndexInitDuringEntryDestroyAndQueryOnPersistentRR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -382,6 +395,7 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends
/**
*
*/
+ @Test
public void testAsyncIndexInitDuringEntryDestroyAndQueryOnPersistentPR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -487,7 +501,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends
/**
*
*/
- public void testAsyncIndexInitDuringEntryDestroyAndQueryOnNonOverflowRR() {
+ @Test
+ public void testAsyncIndexInitDuringEntryDestroyAndQueryOnNonOverflowRR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
hooked = false;
@@ -580,7 +595,8 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends
/**
*
*/
- public void testAsyncIndexInitDuringEntryDestroyAndQueryOnOnNonOverflowPR() {
+ @Test
+ public void testAsyncIndexInitDuringEntryDestroyAndQueryOnOnNonOverflowPR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
hooked = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 6a49628..62faa56 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.Collection;
import org.junit.experimental.categories.Category;
@@ -64,7 +73,8 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
* During validation all region operations are paused for a while. Validation
* happens multiple time during one test run on a fixed time interval.
*/
-public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends JUnit4DistributedTestCase {
PRQueryDUnitHelper helper = new PRQueryDUnitHelper();
private static String regionName = "Portfolios";
@@ -112,8 +122,8 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Dis
/**
* @param name
*/
- public ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest(String name) {
- super(name);
+ public ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest() {
+ super();
}
@Override
@@ -155,6 +165,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Dis
}
// Tests on Local/Replicated Region
+ @Test
public void testCompactRangeIndex() {
// Create a Local Region.
Host host = Host.getHost(0);
@@ -201,6 +212,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Dis
}
@Category(FlakyTest.class) // GEODE-431: time sensitive, uses PRQueryDUnitHelper whcih eats exceptions, async actions, uses Random
+ @Test
public void testRangeIndex() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -229,6 +241,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Dis
}
// Tests on Partition Region
+ @Test
public void testCompactRangeIndexOnPR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -292,6 +305,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends Dis
}
+ @Test
public void testRangeIndexOnPR() {
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/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index 7aa3307..1006234 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.Collection;
@@ -61,6 +70,7 @@ import com.gemstone.gemfire.test.dunit.ThreadUtils;
*
*
*/
+@Category(DistributedTest.class)
public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
DistributedTestCase {
@@ -85,8 +95,8 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
/**
* @param name
*/
- public ConcurrentIndexUpdateWithoutWLDUnitTest(String name) {
- super(name);
+ public ConcurrentIndexUpdateWithoutWLDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
@@ -132,6 +142,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
}
}
// Tests on Local/Replicated Region
+ @Test
public void testCompactRangeIndex() {
// Create a Local Region.
Host host = Host.getHost(0);
@@ -161,6 +172,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
}
+ @Test
public void testMultiIndexCreation() {
// Create a Local Region.
Host host = Host.getHost(0);
@@ -217,6 +229,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
};
}
+ @Test
public void testRangeIndex() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -245,6 +258,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
}
// Tests on Partition Region
+ @Test
public void testCompactRangeIndexOnPR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -307,6 +321,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
vm3.invoke(getCacheSerializableRunnableForIndexValidation(regionName, indexName));
}
+ @Test
public void testRangeIndexOnPR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -368,6 +383,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
vm3.invoke(getCacheSerializableRunnableForIndexValidation(regionName, rindexName));
}
+ @Test
public void testMultiIndexOnPR() {
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/internal/index/CopyOnReadIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index 18c73dc..65355d8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.HashMap;
import java.util.Iterator;
import java.util.Properties;
@@ -53,14 +62,15 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
-public class CopyOnReadIndexDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CopyOnReadIndexDUnitTest extends JUnit4CacheTestCase {
VM vm0;
VM vm1;
VM vm2;
- public CopyOnReadIndexDUnitTest(String name) {
- super(name);
+ public CopyOnReadIndexDUnitTest() {
+ super();
}
@Override
@@ -83,6 +93,7 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
}
//test different queries against partitioned region
+ @Test
public void testPRQueryOnLocalNode() throws Exception {
QueryTestUtils utils = new QueryTestUtils();
configureServers();
@@ -100,6 +111,7 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
}
//tests different queries with a transaction for replicated region
+ @Test
public void testTransactionsOnReplicatedRegion() throws Exception {
QueryTestUtils utils = new QueryTestUtils();
configureServers();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/EquijoinDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/EquijoinDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/EquijoinDUnitTest.java
index 5718fce..3595019 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/EquijoinDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/EquijoinDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.Serializable;
import java.text.ParseException;
import java.util.HashMap;
@@ -48,6 +57,7 @@ import com.gemstone.gemfire.cache.query.functional.StructSetOrResultsSet;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
+@Category(DistributedTest.class)
public class EquijoinDUnitTest extends TestCase {
QueryService qs;
Region region1, region2, region3, region4;
@@ -84,6 +94,7 @@ public class EquijoinDUnitTest extends TestCase {
}
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinOneToOneMapping() throws Exception {
createRegions();
@@ -103,6 +114,7 @@ public class EquijoinDUnitTest extends TestCase {
}
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinOneToOneMappingWithAdditionalJoins() throws Exception {
createRegions();
try {
@@ -134,6 +146,7 @@ public class EquijoinDUnitTest extends TestCase {
* We do not want to test this with Primary Key on the many side or else only 1 result will be returned
*/
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinOneToManyMapping() throws Exception {
createRegions();
@@ -157,6 +170,7 @@ public class EquijoinDUnitTest extends TestCase {
}
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinMultipleFiltersOnSameRegionOnSameIteratorMapping() throws Exception {
createRegions();
@@ -190,6 +204,7 @@ public class EquijoinDUnitTest extends TestCase {
}
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinWithRangeFilters() throws Exception {
createRegions();
@@ -212,6 +227,7 @@ public class EquijoinDUnitTest extends TestCase {
}
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinLimit() throws Exception {
//In this test we are hoping the index being used will properly use the limit while taking into consideration the filters of c.id and c.pkid
//This test is set up so that if the pkid index is used and limit applied, if id is not taken into consideration until later stages, it will lead to incorrect results (0)
@@ -245,6 +261,7 @@ public class EquijoinDUnitTest extends TestCase {
}
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinNestedQuery() throws Exception {
createRegions();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 02a6f07..4e4d76a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -19,6 +19,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.Collection;
import java.util.Map;
@@ -54,17 +63,19 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
*
*/
-public class IndexTrackingQueryObserverDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
private final int NUM_BKTS = 10;
private static final String queryStr = "select * from /portfolio where ID >= 0";
protected static final int TOTAL_OBJECTS = 1000;
public static final String INDEX_NAME = "keyIndex1";
- public IndexTrackingQueryObserverDUnitTest(String name) {
- super(name);
+ public IndexTrackingQueryObserverDUnitTest() {
+ super();
}
+ @Test
public void testNothing() {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
index 6e064f1..83e718d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.Arrays;
@@ -52,7 +61,8 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
* Then destroys and puts back entries in separated thread in the same region and runs
* query parallely and checks for UNDEFINED values in result set of the query.
*/
-public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class InitializeIndexEntryDestroyQueryDUnitTest extends JUnit4CacheTestCase {
PRQueryDUnitHelper PRQHelp = new PRQueryDUnitHelper();
@@ -70,14 +80,15 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase {
/**
* @param name
*/
- public InitializeIndexEntryDestroyQueryDUnitTest(String name) {
- super(name);
+ public InitializeIndexEntryDestroyQueryDUnitTest() {
+ super();
}
public void setCacheInVMs(VM... vms) {
for (VM vm : vms) {
vm.invoke(() -> PRQueryDUnitHelper.setCache(getCache()));
}
}
+ @Test
public void testAsyncIndexInitDuringEntryDestroyAndQuery() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -210,6 +221,7 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-1036: uses PRQueryDUnitHelper, time sensitive, async actions, overly long joins (16+ minutes), eats exceptions (fixed 1), thread sleeps
+ @Test
public void testAsyncIndexInitDuringEntryDestroyAndQueryOnPR() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -334,6 +346,7 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase {
}
}
+ @Test
public void testConcurrentRemoveIndexAndQueryOnPR() {
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/internal/index/MultiIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
index e18e720..f4e57be 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.Collection;
import java.util.List;
@@ -39,15 +48,17 @@ import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
-public class MultiIndexCreationDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class MultiIndexCreationDUnitTest extends JUnit4CacheTestCase {
private final String regionName = "MultiIndexCreationDUnitTest";
public static volatile boolean hooked = false;
- public MultiIndexCreationDUnitTest(String name) {
- super(name);
+ public MultiIndexCreationDUnitTest() {
+ super();
}
+ @Test
public void testConcurrentMultiIndexCreationAndQuery() throws Exception {
final Host host = Host.getHost(0);
final VM server1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedRegionEquijoinDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedRegionEquijoinDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedRegionEquijoinDUnitTest.java
index 3fa6848..951da21 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedRegionEquijoinDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedRegionEquijoinDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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 org.junit.Test;
@@ -36,6 +45,7 @@ import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
+@Category(DistributedTest.class)
public class PartitionedRegionEquijoinDUnitTest extends EquijoinDUnitTest {
@Override
@@ -52,6 +62,7 @@ public class PartitionedRegionEquijoinDUnitTest extends EquijoinDUnitTest {
}
@Test
+ @Test
public void testSingleFilterWithSingleEquijoinNestedQuery() throws Exception {
createRegions();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index 02e805b..c896cec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.query.internal.index;
+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.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -51,15 +60,16 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
*/
@Category(DistributedTest.class)
@Ignore("Test was disabled by renaming to DisabledTest")
-public class PutAllWithIndexPerfDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PutAllWithIndexPerfDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
private static int bridgeServerPort;
static long timeWithoutStructTypeIndex = 0;
static long timeWithStructTypeIndex = 0;
- public PutAllWithIndexPerfDUnitTest(String name) {
- super(name);
+ public PutAllWithIndexPerfDUnitTest() {
+ super();
}
@Override
@@ -72,6 +82,7 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase {
disconnectAllFromDS();
}
+ @Test
public void testPutAllWithIndexes() {
final String name = "testRegion";
final Host host = Host.getHost(0);